[#4357,#4348] Bug/LF Users

- Handled exception case for users that dont exist
- Updated response with ccla,icla,ccla_requires_icla fields

Signed-off-by: Harold Wanyama <hwanyama@contractor.linuxfoundation.org>

cla-backend-go/company/service.go

@@ -62,10 +62,10 @@ type IService interface { // nolint
 	// calls org service
 	SearchOrganizationByName(ctx context.Context, orgName string, websiteName string, includeSigningEntityName bool, filter string) (*models.OrgList, error)
 
-	sendRequestAccessEmail(ctx context.Context, companyModel *models.Company, requesterName, requesterEmail, recipientName, recipientAddress string)
-	sendRequestApprovedEmailToRecipient(ctx context.Context, companyModel *models.Company, recipientName, recipientAddress string)
-	sendRequestRejectedEmailToRecipient(ctx context.Context, companyModel *models.Company, recipientName, recipientAddress string)
-	getPreferredNameAndEmail(ctx context.Context, lfid string) (string, string, error)
+	// sendRequestAccessEmail(ctx context.Context, companyModel *models.Company, requesterName, requesterEmail, recipientName, recipientAddress string)
+	// sendRequestApprovedEmailToRecipient(ctx context.Context, companyModel *models.Company, recipientName, recipientAddress string)
+	// sendRequestRejectedEmailToRecipient(ctx context.Context, companyModel *models.Company, recipientName, recipientAddress string)
+	// getPreferredNameAndEmail(ctx context.Context, lfid string) (string, string, error)
 }
 
 // NewService creates a new company service object

cla-backend-go/signatures/service.go

@@ -72,10 +72,10 @@ type SignatureService interface {
 	GetClaGroupCCLASignatures(ctx context.Context, claGroupID string, approved, signed *bool) (*models.Signatures, error)
 	GetClaGroupCorporateContributors(ctx context.Context, claGroupID string, companyID *string, pageSize *int64, nextKey *string, searchTerm *string) (*models.CorporateContributorList, error)
 
-	createOrGetEmployeeModels(ctx context.Context, claGroupModel *models.ClaGroup, companyModel *models.Company, corporateSignatureModel *models.Signature) ([]*models.User, error)
+	// createOrGetEmployeeModels(ctx context.Context, claGroupModel *models.ClaGroup, companyModel *models.Company, corporateSignatureModel *models.Signature) ([]*models.User, error)
 	CreateOrUpdateEmployeeSignature(ctx context.Context, claGroupModel *models.ClaGroup, companyModel *models.Company, corporateSignatureModel *models.Signature) ([]*models.User, error)
 	UpdateEnvelopeDetails(ctx context.Context, signatureID, envelopeID string, signURL *string) (*models.Signature, error)
-	handleGitHubStatusUpdate(ctx context.Context, employeeUserModel *models.User) error
+	// handleGitHubStatusUpdate(ctx context.Context, employeeUserModel *models.User) error
 	ProcessEmployeeSignature(ctx context.Context, companyModel *models.Company, claGroupModel *models.ClaGroup, user *models.User) (*bool, error)
 }
 

cla-backend-go/swagger/cla.v2.yaml

@@ -6176,5 +6176,22 @@ definitions:
       companyID:
         type: string
         description: The ID of the company associated with the User (optional)
+      CCLARequiresICLA:
+        type: boolean
+        description: Flag ensuring user signs ICLA and is acknowledged the company
+        x-omitempty: false
+      companyAffiliation:
+        type: boolean
+        description: User is affiliated with a company (use case when user has no companyID attribute)
+        x-omitempty: false
+      ICLA:
+        type: boolean
+        description: User has an ICLA signature
+        x-omitempty: false
+      CCLA:
+        type: boolean
+        description: Flag to indicate if user has been company acknowledged and approved
+        x-omitempty: false
+