Skip to content

Updated log messages and user messages to reflect trade compliance #5108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mkdolan wants to merge 1 commit into
base: dev
Choose a base branch
from
+6 −6
Open

Updated log messages and user messages to reflect trade compliance #5108

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions cla-backend-go/v2/sign/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,11 +278,11 @@ func (s *service) RequestCorporateSignature(ctx context.Context, lfUsername stri
}
if sanctioned {
if input.CompanySfid != nil {
err = fmt.Errorf("company %s is sanctioned", *input.CompanySfid)
err = fmt.Errorf("company %s requires further review for trade compliance", *input.CompanySfid)
} else {
err = fmt.Errorf("company is sanctioned")
err = fmt.Errorf("company requires further review for trade compliance")
}
log.WithFields(f).WithError(err).Error("company is sanctioned")
log.WithFields(f).WithError(err).Error("company requires further review for trade compliance")
return nil, err
}

Expand Down Expand Up @@ -1226,8 +1226,8 @@ func (s *service) SignedCorporateCallback(ctx context.Context, payload []byte, c
log.WithFields(f).WithError(complianceErr).Warnf("company compliance check failed in corporate callback for company %s; not finalizing CCLA", companyID)
return complianceErr
} else if sanctioned {
log.WithFields(f).Warnf("company %s is sanctioned; refusing to finalize corporate CLA in callback", companyID)
return fmt.Errorf("company %s is sanctioned; corporate CLA cannot be finalized", companyID)
log.WithFields(f).Warnf("company %s requires further review for trade compliance; refusing to finalize corporate CLA in callback", companyID)
return fmt.Errorf("company %s requires further review for trade compliance; corporate CLA cannot be finalized", companyID)
}

_, currentTime := utils.CurrentTime()
Expand Down Expand Up @@ -2996,7 +2996,7 @@ func (s *service) checkCompanyCompliance(ctx context.Context, company *v1Models.
"companyExternalID": company.CompanyExternalID,
"sssMode": sssMode,
}
log.WithFields(f).Debugf("starting company sanctions screening (mode=%s)", sssMode)
log.WithFields(f).Debugf("starting company trade compliance screening (mode=%s)", sssMode)

// Short-circuit for manually/admin-set blocks (sanction_origin != "sss" or no origin).
// SSS-origin blocks fall through so a now-clean result can clear them.
Expand Down
Loading