S42971778 # Matchd / Talentology - No Plan [Enhancement] #Relax the restriction…

S42971778 # Matchd / Talentology - No Plan [Enhancement] #Relax the restriction on Users being restricted to one Customer.

cmsWebApp/src/performa/form/ChangeCompanyFP.java

@@ -8,6 +8,7 @@ import oneit.logging.LoggingArea;
 import oneit.objstore.ObjectTransaction;
 import oneit.objstore.StorageException;
 import oneit.objstore.parser.BusinessObjectParser;
+import oneit.objstore.rdbms.filters.EqualsFilter;
 import oneit.servlets.forms.SubmissionDetails;
 import oneit.servlets.forms.SuccessfulResult;
 import oneit.servlets.process.ORMProcessState;
@@ -15,7 +16,10 @@ import oneit.servlets.process.SaveFP;
 import oneit.utils.BusinessException;
 import oneit.utils.MultiException;
 import performa.orm.Company;
+import performa.orm.CompanyUser;
+import performa.orm.CompanyUserHiringTeamLink;
 import performa.orm.HiringTeam;
+import performa.orm.types.RoleType;
 
 
 public class ChangeCompanyFP extends SaveFP
@@ -57,9 +61,21 @@ public class ChangeCompanyFP extends SaveFP
             company.setAddedByUser(hiringTeam.getAddedByUser());
             
             hiringTeam.setCompany(company);
-        
+            
             LogMgr.log(LOG, LogLevel.PROCESSING1, "Added new company : ", company);
         }
+        
+        CompanyUser                 addedByUser =   hiringTeam.getAddedByUser();
+        CompanyUserHiringTeamLink   link        =   addedByUser.pipelineCompanyUser().toHiringTeams(CompanyUserHiringTeamLink.SearchByAll().andHiringTeam(new EqualsFilter<>(hiringTeam))).val();
+
+        if(link == null)
+        {
+            link    =   CompanyUserHiringTeamLink.createCompanyUserHiringTeamLink(objTran);
+
+            link.setHiringTeam(hiringTeam);
+            link.setCompanyUser(addedByUser);
+            link.setRole(RoleType.OWNER);
+        }
 
         return super.processForm(process, submission, params);
     }

cmsWebApp/src/performa/form/SendUserInvitationFP.java

@@ -43,7 +43,7 @@ public class SendUserInvitationFP extends SaveFP
         {
             BusinessObjectParser.assertFieldCondition(inviteTeammate.getUserEmail() != null, inviteTeammate, InviteTeammateNPO.FIELD_UserEmail, "mandatory", exceptions, true, request);
             BusinessObjectParser.assertFieldCondition(StringUtils.isEmailAddress(inviteTeammate.getUserEmail()), inviteTeammate, InviteTeammateNPO.FIELD_UserEmail, "invalidEmail", exceptions, true, request);
-            BusinessObjectParser.assertFieldCondition(!Utils.userFoundInAnotherCompany(process.getTransaction(), inviteTeammate.getUserEmail() , company), inviteTeammate, InviteTeammateNPO.FIELD_UserEmail, "existsInOtherCompany", exceptions, true, request);
+//            BusinessObjectParser.assertFieldCondition(!Utils.userFoundInAnotherCompany(process.getTransaction(), inviteTeammate.getUserEmail() , company), inviteTeammate, InviteTeammateNPO.FIELD_UserEmail, "existsInOtherCompany", exceptions, true, request);
             BusinessObjectParser.assertFieldCondition(inviteTeammate.getRoleType() != null, inviteTeammate, InviteTeammateNPO.FIELD_RoleType, "mandatory", exceptions, true, request);
         }
         
@@ -73,7 +73,7 @@ public class SendUserInvitationFP extends SaveFP
         {
             LogMgr.log(LOG, LogLevel.PROCESSING1, "Started to create new use", company);
 
-            SecUser secUser =   SecUser.searchNAME(objTran, inviteTeammate.getUserEmail());
+            SecUser secUser =   SecUser.searchNAME(objTran, inviteTeammate.getUserEmail().toLowerCase());
             
             if(secUser == null)
             {

cmsWebApp/src/performa/orm/Company.java

@@ -177,12 +177,6 @@ public class Company extends BaseCompany
         return pipelineCompany().toHiringTeams(filter).uniqueVals();
     }
     
-    public TimeZone getDefaultTimeZone()
-    {
-        return pipelineCompany().toHiringTeams().toTimeZone().val();
-    }
-    
-    
     @Override
     public FieldWriteability getObjectWriteability() 
     {

cmsWebApp/src/performa/orm/CompanyUser.xml

@@ -36,7 +36,7 @@
 
         </TABLE>
         
-        <SEARCH type="All"      paramFilter="oneit_sec_user_extension.object_id is not null"    >
+        <SEARCH type="All"      paramFilter="oneit_sec_user_extension.object_id is not null and oneit_sec_user_extension.object_type = 'CompanyUser'"    >
         </SEARCH>
         
         <SEARCH type="AllCompanyUsers"  paramFilter="oneit_sec_user_extension.object_id is not null">

cmsWebApp/src/performa/orm/CompanyUserPersistenceMgr.java

@@ -487,8 +487,8 @@ public class CompanyUserPersistenceMgr extends SecUserExtensionPersistenceMgr
                 String      tables = " ";
                 Set<String> joinTableSet = new HashSet<String>();
                 String      filter;
-                Object[]    searchParams; // paramFilter: oneit_sec_user_extension.object_id is not null
-                    String preFilter = "(oneit_sec_user_extension.object_id is not null)"
+                Object[]    searchParams; // paramFilter: oneit_sec_user_extension.object_id is not null and oneit_sec_user_extension.object_type = 'CompanyUser'
+                    String preFilter = "(oneit_sec_user_extension.object_id is not null and oneit_sec_user_extension.object_type = 'CompanyUser')"
                                      + "  ";
                     
                     

cmsWebApp/src/performa/orm/Job.java

@@ -481,9 +481,9 @@ public class Job extends BaseJob
         {
             title.append(getClient()).append(" - ");
         }
-        else if(getCreatedBy() != null && getCreatedBy().getCompany() != null)
+        else if(getHiringTeam() != null)
         {
-            title.append(getCreatedBy().getCompany()).append(" - ");
+            title.append(getHiringTeam()).append(" - ");
         }
         
         title.append(getJobTitle()).append(" ");

cmsWebApp/src/performa/orm/JobApplication.java

@@ -68,7 +68,7 @@ public class JobApplication extends BaseJobApplication
                     
                     if(template.getBusinessHoursOnly())
                     {
-                        TimeZone    jobTimeZone =   getJob().getHiringTeam().getCompany().getDefaultTimeZone();
+                        TimeZone    jobTimeZone =   getJob().getHiringTeam().getCompany().getTimeZone();
                         Calendar    cal         =   new GregorianCalendar();
                         
                         cal.setTime(scheduledDate);

cmsWebApp/webroot/extensions/adminportal/hiring_teams.jsp

@@ -14,7 +14,7 @@
     Company                 company         =   (Company) process.getAttribute("Company");
     CompanyUser             comUser         =   secUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
     UserSortOption          userSortOpt     =   (UserSortOption) process.getAttribute("UserSortOption");
-    Collection<CompanyUser> companyUsers    =   (Collection<CompanyUser>) process.getAttribute("CompanyUsers");
+    Collection<CompanyUser> companyUsers    =   comUser.pipelineCompanyUser().toHiringTeams().toHiringTeam().toUsers().toCompanyUser().uniqueVals();
     boolean                 readOnly        =   !comUser.isOwner();
     HiringTeam              selectedTeam    =   comUser.getActiveHiringTeam();
 
@@ -23,13 +23,8 @@
         company =   comUser.getCompany();
         process.setAttribute("Company", company);
     }
-        
-    if(companyUsers == null)
-    {
-        companyUsers    =   CollectionFilter.filter(company.getUsersSet(), CompanyUser.SearchByAll().andIsAccountVerified(new EqualsFilter<>(Boolean.TRUE)));
-        
-        process.setAttribute("CompanyUsers", companyUsers);
-    }
+    
+    process.setAttribute("CompanyUsers", companyUsers);
     
     if( request.getParameter("UserSortOption") != null)
     {

cmsWebApp/webroot/extensions/adminportal/manage_plan.jsp

@@ -10,10 +10,7 @@
     String          homePage        =   WebUtils.getArticleByShortCut(process.getTransaction(), WebUtils.ADMIN_HOME).getLink(request);
     SecUser         loggedInUser    =   SecUser.getTXUser(transaction);
     CompanyUser     companyUser     =   loggedInUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
-    Company         company         =   companyUser.getCompany();
     HiringTeam      hiringTeam      =   (HiringTeam) process.getAttribute("HiringTeam");
-
-    Debug.assertion(company != null , "Invalid company in admin portal my company");
     
     Debug.assertion(hiringTeam != null , "Invalid Hiring Team in admin portal manage plan");