code cleanup

cmsWebApp/src/performa/form/SaveJobFP.java

@@ -32,17 +32,12 @@ public class SaveJobFP extends SaveFP
         Job                 job             =   request.getAttribute("Job") != null ? (Job) request.getAttribute("Job") : (Job) process.getAttribute("Job");
         JobStatus           status          =   (JobStatus) request.getAttribute("JobStatus");
         DraftLocation       draftLocation   =   (DraftLocation) request.getAttribute("DraftLocation");
-        SecUser             secUser         =   SecUser.getTXUser(process.getTransaction());
-        CompanyUser         companyUser     =   secUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
-        Company             company         =   companyUser.getCompany();
         HiringTeam          hiringTeam      =   job.getHiringTeam();
         HiringTeam          billingTeam     =   hiringTeam.getManageOwnBilling() ? hiringTeam : hiringTeam.getBilledByTeam();
         
         LogMgr.log(Job.LOG, LogLevel.PROCESSING1,"In SaveJobFP saving job : ", job );
         
-        Job oldJob  = (Job) job.getEarliestBackup();
-        
-        if(oldJob != null && oldJob.getJobStatus() == JobStatus.DRAFT && (job.getJobStatus() == JobStatus.OPEN || status == JobStatus.OPEN))
+        if(job.getJobStatus() == JobStatus.DRAFT && status != null && status == JobStatus.OPEN)
         {
             job.setApplyBy(DateDiff.add(DateDiff.getToday(), Calendar.DATE, 30));
             job.setOpenDate(new Date());
@@ -58,23 +53,14 @@ public class SaveJobFP extends SaveFP
             {
                 StripeUtils.recordUsage(billingTeam);
             }
-            
-            if(status == JobStatus.OPEN)
-            {
-//                if(hiringTeam.getSelectedPaymentPlan() != null)
-//                {
-//                    company.setPaymentPlan(company.getSelectedPaymentPlan());
-//                
-//                    LogMgr.log(Company.LOG, LogLevel.PROCESSING1,"Company payment plan updated.", job, company, company.getPaymentPlan());
-//                }
-                
-                job.setJobStatus(status);
 
-                LogMgr.log(Job.LOG, LogLevel.PROCESSING1,"Job status changed as Open. ", job );
-            }
+            LogMgr.log(Job.LOG, LogLevel.PROCESSING1,"Job status changed as Open. ", job );
         }
         
-        job.setJobStatus(status);
+        if(status != null)
+        {
+            job.setJobStatus(status);
+        }
         
         if(job.getJobStatus() == JobStatus.OPEN && job.getShortenedURL() == null)
         {
@@ -101,8 +87,8 @@ public class SaveJobFP extends SaveFP
         // restarting process as custom attributes needs to be updated to intercom
         completeProcessRestartAndRestoreAttribs(process, request);
         
-        secUser     =   SecUser.getTXUser(process.getTransaction());
-        companyUser =   secUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
+        SecUser     secUser     =   SecUser.getTXUser(process.getTransaction());
+        CompanyUser companyUser =   secUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
 
         // Update company in intercom
         if(companyUser.getCompany() != null)
@@ -120,8 +106,6 @@ public class SaveJobFP extends SaveFP
         Job                 job             =   process.getAttribute("Job") != null ? (Job) process.getAttribute("Job") : (Job) request.getAttribute("Job");
         Boolean             openJob         =   (Boolean) request.getAttribute("openJob");
         JobStatus           status          =   (JobStatus) request.getAttribute("JobStatus");
-        SecUser             loggedInUser    =   SecUser.getTXUser(process.getTransaction());
-        CompanyUser         companyUser     =   loggedInUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
         HiringTeam          hiringTeam      =   job.getHiringTeam();
         HiringTeam          billingTeam     =   hiringTeam.getManageOwnBilling() ? hiringTeam : hiringTeam.getBilledByTeam();
 
@@ -135,18 +119,10 @@ public class SaveJobFP extends SaveFP
             }
         }
         
-        //to select payment plan when job open
         if(status != null && status == JobStatus.OPEN)
         {
-//            BusinessObjectParser.assertFieldCondition(company.getSelectedPaymentPlan() != null || company.getPaymentPlan() != null, company, Company.SINGLEREFERENCE_PaymentPlan, "mandatory", exceptions, true, request);
-            
-//            if(company.getSelectedPaymentPlan() != null)
-//            {
-                BusinessObjectParser.assertFieldCondition(billingTeam.canCreateJob() , job, Job.FIELD_JobStatus, "insufficientCredit", exceptions, true, request);
-//            }
-        
+            BusinessObjectParser.assertFieldCondition(billingTeam.canCreateJob() , job, Job.FIELD_JobStatus, "insufficientCredit", exceptions, true, request);
             BusinessObjectParser.assertFieldCondition(billingTeam.getCardID() != null , billingTeam, HiringTeam.FIELD_CardID, "mandatoryCardDetails", exceptions, true, request);
-            
             BusinessObjectParser.assertFieldCondition(billingTeam.canCreateJob() , job, Job.FIELD_JobStatus, "insufficientCredit", exceptions, true, request);
         }