intercom update when company details or user details changed.

fixed issue caused with code review changes (verification of company user accounts)

cmsWebApp/src/performa/form/SaveCompanyFP.java

@@ -11,6 +11,7 @@ import oneit.servlets.process.ORMProcessState;
 import oneit.servlets.process.SaveFP;
 import oneit.utils.BusinessException;
 import oneit.utils.CollectionUtils;
+import performa.intercom.utils.IntercomUtils;
 import performa.orm.Company;
 
 
@@ -31,6 +32,9 @@ public class SaveCompanyFP  extends SaveFP
             LogMgr.log(Company.LOG, LogLevel.PROCESSING1,"In SaveCompanyFP setting comany logo to null of company : ", company );
         }    
         
+        // Update company in intercom
+        IntercomUtils.updateCompany(company);
+        
         return super.processForm(process, submission, params);
     }
 }
\ No newline at end of file

cmsWebApp/src/performa/form/SaveUserDetailsFP.java

@@ -20,6 +20,8 @@ import oneit.utils.CollectionUtils;
 import oneit.utils.InitialisationException;
 import oneit.utils.MultiException;
 import oneit.utils.StringUtils;
+import performa.intercom.resources.User;
+import performa.intercom.utils.IntercomUtils;
 import performa.orm.CompanyUser;
 import performa.utils.Utils;
 
@@ -68,6 +70,8 @@ public class SaveUserDetailsFP extends SaveFP
                         Utils.sendEmailChangedMail(companyUser, request, emailer, SaveUserDetailsFP.class.getName());
                     }
                 }
+                
+                secUser.setEmail(secUser.getUserName());
             }
             else if (companyUser.isLoggedViaSocial() && !CollectionUtils.equals(oldSecUser.getEmail(), secUser.getEmail()))
             {
@@ -78,6 +82,15 @@ public class SaveUserDetailsFP extends SaveFP
                 
                 Utils.sendEmailChangedMail(companyUser, request, emailer, SaveUserDetailsFP.class.getName());
             }
+            
+            User    intercomUser    =   IntercomUtils.updateIntercomUser(secUser);
+            
+            if(intercomUser == null)
+            {
+                performa.intercom.resources.Company intercomCompany =   IntercomUtils.findOrCreateCompany(companyUser.getCompany());
+
+                IntercomUtils.createIntercomUser(secUser, "Hiring Team", intercomCompany);
+            }
         }
         
         return super.processForm(process, submission, params);

cmsWebApp/src/performa/form/SendCompanyUserInvitesFP.java

@@ -36,14 +36,17 @@ public class SendCompanyUserInvitesFP extends SaveFP
     {
         HttpServletRequest  request     =   submission.getRequest();
         Company             company     =   (Company) process.getAttribute("Company");
+        CompanyUser         companyUser =   (CompanyUser) request.getAttribute("CompanyUser");
         
+        if(companyUser != null && companyUser == company.getAddedByUser())
+        {
             for(CompanyUser cUser : company.getUsersSet())
             {
                 if(!CollectionUtils.equals(cUser, company.getAddedByUser()))
                 {
                     SecUser secUser =   cUser.getUser();
 
-                BusinessObjectParser.assertFieldCondition(secUser.getEmail()!=null, secUser, SecUser.FIELD_Email, "mandatory", exceptions, true, request);
+                    BusinessObjectParser.assertFieldCondition(secUser.getEmail()!= null, secUser, SecUser.FIELD_Email, "mandatory", exceptions, true, request);
                     
                     BusinessObjectParser.assertFieldCondition(!Utils.isCompanyUserEmailFound(process.getTransaction(), secUser.getEmail()), secUser, SecUser.FIELD_Email, "emailExists", exceptions, true, request);
                 }
@@ -53,6 +56,7 @@ public class SendCompanyUserInvitesFP extends SaveFP
             {
                 BusinessObjectParser.assertFieldCondition(company.getCompanyName()!=null, company, Company.FIELD_CompanyName, "mandatory", exceptions, true, request);
             }
+        }
         
         super.validate(process, submission, exceptions, params);
     }
@@ -64,7 +68,7 @@ public class SendCompanyUserInvitesFP extends SaveFP
         HttpServletRequest  request         =   submission.getRequest();
         ObjectTransaction   objTran         =   process.getTransaction();
         Company             company         =   (Company) process.getAttribute("Company");
-        CompanyUser         companyUser     =   company.getAddedByUser();
+        CompanyUser         companyUser     =   (CompanyUser) request.getAttribute("CompanyUser");
         SecUser             secUser         =   companyUser.getUser();
         Boolean             socialLogin     =   CollectionUtils.equals(process.getAttribute("socialLogin"), Boolean.TRUE);
         
@@ -86,7 +90,8 @@ public class SendCompanyUserInvitesFP extends SaveFP
         
         LogMgr.log(LOG, LogLevel.PROCESSING1, "Verifing Company User finished", companyUser, secUser);
         
-        
+        if(companyUser == company.getAddedByUser())
+        {
             //process user invitations
             for(CompanyUser cUser : company.getUsersSet())
             {
@@ -107,10 +112,11 @@ public class SendCompanyUserInvitesFP extends SaveFP
                     LogMgr.log(LOG, LogLevel.PROCESSING1, "End of sending invitation email.", cUser);
                 }
             }
+        }
         
         // Create company and the first user of it in intercom
         
-        performa.intercom.resources.Company intercomCompany =   IntercomUtils.createIntercomCompany(company);
+        performa.intercom.resources.Company intercomCompany =   IntercomUtils.findOrCreateCompany(company);
         
         IntercomUtils.createIntercomUser(secUser, "Hiring Team", intercomCompany);
         

cmsWebApp/src/performa/intercom/utils/IntercomUtils.java

@@ -28,7 +28,7 @@ public class IntercomUtils
             User    user = new User();
                                 
             user.setUserId(secUser.getIdentification());
-            user.setEmail(secUser.getUserName());
+            user.setEmail(secUser.getEmail());
             user.setName(secUser.getName());
             user.addCustomAttribute(CustomAttribute.newStringAttribute("role", role));    
             
@@ -48,6 +48,48 @@ public class IntercomUtils
     }
     
     
+    public static User findUserByID(SecUser secUser)
+    {
+        try
+        { 
+            Map<String, String> map = new HashMap<>();
+
+            map.put("user_id", secUser.getIdentification());
+
+            return User.find(map);
+        }
+        catch (Exception e)
+        {
+            LogMgr.log(LoggingArea.ALL, LogLevel.PROCESSING1, e, "Error while fetching a user by id from intercom");
+            
+            return null;
+        }
+    }
+    
+    
+    public static User updateIntercomUser(SecUser secUser)
+    {
+        try
+        {        
+            User user   =   findUserByID(secUser);
+            
+            if(user != null)
+            {
+                user.setEmail(secUser.getEmail());
+                user.setName(secUser.getName());
+                User.update(user);
+            }
+            
+            return user;
+        }
+        catch (Exception e)
+        {
+            LogMgr.log(LoggingArea.ALL, LogLevel.PROCESSING1, e, "Error while updating a user in intercom");
+            return null;
+        }
+    }
+    
+    
     public static Company createIntercomCompany(performa.orm.Company company)
     {
         try
@@ -76,20 +118,50 @@ public class IntercomUtils
 
             map.put("company_id", company.getID().toString());
 
-            Company intercomCompany =   Company.find(map);
+            return Company.find(map);
+        }
+        catch (Exception e)
+        {
+            LogMgr.log(LoggingArea.ALL, LogLevel.PROCESSING1, e, "Error while fetching a company by id from intercom");
+            
+            return null;
+        }
+    }
+    
+    
+    public static void updateCompany(performa.orm.Company company)
+    {
+        try
+        { 
+            Company intercomCompany =   findCompanyByID(company);
         
             if(intercomCompany == null)
             {
-                intercomCompany =   createIntercomCompany(company);
+                createIntercomCompany(company);
+            }
+            else
+            {
+                intercomCompany.setName(company.getCompanyName());
+                Company.update(intercomCompany);
             }
-            
-            return intercomCompany;
         }   
         catch (Exception e)
         {
-            LogMgr.log(LoggingArea.ALL, LogLevel.PROCESSING1, e, "Error while fetching a company by id from intercom");
+            LogMgr.log(LoggingArea.ALL, LogLevel.PROCESSING1, e, "Error while updating company in intercom");
             
-            return null;
         }
     }
+    
+    
+    public static Company findOrCreateCompany(performa.orm.Company company)
+    {
+        Company intercomCompany =   findCompanyByID(company);
+
+        if(intercomCompany == null)
+        {
+            intercomCompany =   createIntercomCompany(company);
+        }
+
+        return intercomCompany;
+    }
 }

cmsWebApp/webroot/extensions/adminportal/invite_users.jsp

@@ -78,6 +78,7 @@
             <div class="main-sc-section text-center company-profile-btn">
                 <oneit:button   value="Send invites & proceed"  name="sendCompanyUserInvites"   cssClass="btn btn-primary box-btn"
                                 requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
+                                                                    .mapEntry("CompanyUser", companyUser)
                                                                     .mapEntry("procParams", CollectionUtils.mapEntry("socialLogin", socialLogin).mapEntry("Company", company).toMap())
                                                                     .toMap() %>"/>
             </div>

cmsWebApp/webroot/extensions/adminportal/verify_company.jsp

@@ -8,6 +8,7 @@
 <oneit:dynIncluded>
 <%
     String      nextPage    =   WebUtils.getSamePageInRenderMode(request, "CompanyProfile");
+    String      homePage    =   WebUtils.getArticleByShortCut(process.getTransaction(), WebUtils.ADMIN_HOME).getLink(request);
     CompanyUser companyUser =   (CompanyUser) process.getAttribute("CompanyUser");
     SecUser     secUser     =   null;
     Boolean     socialLogin =   Boolean.FALSE;
@@ -49,6 +50,8 @@
         }
     }
     
+    process.setAttribute("Company", companyUser.getCompany());
+
     Debug.assertion(companyUser != null, "Invalid CompanyUser in admin portal");
 %>
     <script type="text/javascript">
@@ -108,12 +111,27 @@
                     </div>
             <%
                 }
-            %>
 
+                if(companyUser.getCompany().getAddedByUser() == companyUser)
+                {
+            %>
                     <oneit:button   value="Verify and login"    name="gotoPage"    cssClass="box-btn verify-btn"
                                     requestAttribs="<%= CollectionUtils.mapEntry("socialLogin", socialLogin)
                                                                     .mapEntry("procParams", CollectionUtils.mapEntry("Company", companyUser.getCompany()).toMap())
                                                                     .mapEntry("nextPage", nextPage).toMap() %>"/>
+            <%
+                }
+                else
+                {
+            %>
+                    <oneit:button   value="Verify and login"    name="sendCompanyUserInvites"   cssClass="box-btn verify-btn"
+                                            requestAttribs="<%= CollectionUtils.mapEntry("socialLogin", socialLogin)
+                                                                                .mapEntry("CompanyUser", companyUser)
+                                                                                .mapEntry("nextPage", homePage)
+                                                                                .toMap() %>"/>
+            <%
+                }
+            %>
         </div>
     </oneit:form>
 </oneit:dynIncluded>