Merge branch 'release/1.1.3'

Author: peggy-quartech

src/Spd.Manager.Screening/ApplicationContract.cs

@@ -635,6 +635,9 @@ public ApplicationCreateRequestValidator()
             RuleFor(r => r.BirthPlace)
                     .NotEmpty();
 
+            RuleFor(r => r.GenderCode)
+                    .NotEmpty();
+
             RuleFor(r => r.JobTitle)
                     .NotEmpty()
                     .MaximumLength(100);

src/Spd.Presentation.Screening/ClientApp/src/app/shared/components/manual-submission-common.component.ts

@@ -184,12 +184,13 @@ export interface ManualSubmissionBody {
 						</div>
 						<div class="col-xl-3 col-lg-6 col-md-12">
 							<mat-form-field>
-								<mat-label>Sex <span class="optional-label">(optional)</span></mat-label>
+								<mat-label>Sex</mat-label>
 								<mat-select formControlName="genderCode">
 									<mat-option *ngFor="let gdr of genderTypes" [value]="gdr.code">
 										{{ gdr.desc }}
 									</mat-option>
 								</mat-select>
+								<mat-error *ngIf="form.get('genderCode')?.hasError('required')">This is required</mat-error>
 							</mat-form-field>
 						</div>
 						<div class="col-xl-3 col-lg-6 col-md-12">
@@ -541,7 +542,7 @@ export class ManualSubmissionCommonComponent implements OnInit {
 			emailAddress: new FormControl('', [FormControlValidators.email]),
 			phoneNumber: new FormControl('', [Validators.required]),
 			driversLicense: new FormControl(''),
-			genderCode: new FormControl(''),
+			genderCode: new FormControl('', [Validators.required]),
 			dateOfBirth: new FormControl(null, [Validators.required]),
 			birthPlace: new FormControl('', [FormControlValidators.required]),
 			jobTitle: new FormControl('', [FormControlValidators.required]),

src/Spd.Presentation.Screening/ClientApp/src/app/shared/components/screening-application-steps/step-components/sa-personal-information.component.ts

@@ -59,12 +59,13 @@ import { AppInviteOrgData, CrcFormStepComponent } from '../screening-application
 						</div>
 						<div class="col-lg-4 col-md-12 col-sm-12">
 							<mat-form-field>
-								<mat-label>Sex <span class="optional-label">(optional)</span></mat-label>
+								<mat-label>Sex</mat-label>
 								<mat-select formControlName="genderCode">
 									<mat-option *ngFor="let gdr of genderTypes" [value]="gdr.code">
 										{{ gdr.desc }}
 									</mat-option>
 								</mat-select>
+								<mat-error *ngIf="form.get('genderCode')?.hasError('required')">This is required</mat-error>
 							</mat-form-field>
 						</div>
 					</div>
@@ -97,7 +98,7 @@ export class SaPersonalInformationComponent implements CrcFormStepComponent {
 				Validators.required,
 			]),
 			employeeId: new FormControl(data.employeeId),
-			genderCode: new FormControl(data.genderCode),
+			genderCode: new FormControl(data.genderCode, [FormControlValidators.required]),
 		});
 	}
 	get orgData(): AppInviteOrgData | null {

src/Spd.Presentation.Screening/ClientApp/src/app/shared/components/screening-application-steps/step-components/sa-security-information.component.ts

@@ -68,7 +68,12 @@ import { AppInviteOrgData, CrcFormStepComponent } from '../screening-application
 									<div class="col-xl-6 col-lg-12 col-md-12 col-sm-12">
 										<mat-form-field>
 											<mat-label>{{ companyFacilityLabel }}</mat-label>
-											<input matInput formControlName="contractedCompanyName" />
+											<input
+												matInput
+												formControlName="contractedCompanyName"
+												[errorStateMatcher]="matcher"
+												maxlength="100"
+											/>
 											<mat-hint>{{ companyFacilityHint }}</mat-hint>
 											<mat-error *ngIf="form.get('contractedCompanyName')?.hasError('required')"
 												>This is required</mat-error

src/Spd.Resource.Repository/Application/ApplicationRepository.Application.cs

@@ -138,16 +138,39 @@ public async Task ProcessAppWithSharableClearanceAsync(ApplicationCreateCmd crea
         if (!createApplicationCmd.SharedClearanceId.HasValue)
             throw new ArgumentException("SharedClearanceId cannot be null");
         account? org = await _context.GetOrgById(createApplicationCmd.OrgId, ct);
-        spd_clearance? clearance = await _context.GetClearanceById((Guid)createApplicationCmd.SharedClearanceId, ct);
         contact? contact = await _context.contacts.Where(c => c.contactid == createApplicationCmd.ContactId).FirstOrDefaultAsync(ct);
         _mapper.Map<ApplicationCreateCmd, contact>(createApplicationCmd, contact);
         _context.UpdateObject(contact);
 
-        Guid teamGuid = Guid.Parse(DynamicsConstants.Screening_Risk_Assessment_Coordinator_Team_Guid);
-        team? team = await _context.teams.Where(t => t.teamid == teamGuid).FirstOrDefaultAsync(ct);
+        //spdbt-3220
+        spd_clearance? clearance = await _context.spd_clearances
+            .Expand(c => c.spd_CaseID)
+            .Where(c => c.spd_clearanceid == (Guid)createApplicationCmd.SharedClearanceId)
+            .FirstOrDefaultAsync(ct);
+        if (clearance == null)
+            throw new ApiException(HttpStatusCode.BadRequest, "Cannot find specified clearance.");
+        team? team = null;
+        int state;
+        int status;
+        if (clearance.spd_CaseID.spd_risklevel == (int)CaseRiskLevelOptionSet.L2 || clearance.spd_CaseID.spd_risklevel == (int)CaseRiskLevelOptionSet.L3)
+        {
+            Guid teamGuid = Guid.Parse(DynamicsConstants.Screening_Risk_Assessment_Coordinator_Team_Guid);
+            team = await _context.teams.Where(t => t.teamid == teamGuid).FirstOrDefaultAsync(ct);
+            status = (int)ClearanceAccessStatusOptionSet.Draft;
+            state = DynamicsConstants.StateCode_Active;
+        }
+        else
+        {
+            Guid teamGuid = Guid.Parse(DynamicsConstants.Client_Service_Team_Guid);
+            team = await _context.teams.Where(t => t.teamid == teamGuid).FirstOrDefaultAsync(ct);
+            status = (int)ClearanceAccessStatusOptionSet.Approved;
+            state = DynamicsConstants.StateCode_Active;
+        }
+
         spd_clearanceaccess clearanceaccess = new() { spd_clearanceaccessid = Guid.NewGuid() };
-        clearanceaccess.statecode = DynamicsConstants.StateCode_Active;
-        clearanceaccess.statuscode = (int)ClearanceAccessStatusOptionSet.Draft;
+        clearanceaccess.statecode = state;
+        clearanceaccess.statuscode = status;
+        clearanceaccess.spd_issystemgenerated = true;
         _context.AddTospd_clearanceaccesses(clearanceaccess);
         _context.SetLink(clearanceaccess, nameof(clearanceaccess.spd_OrganizationId), org);
         _context.SetLink(clearanceaccess, nameof(clearanceaccess.spd_ClearanceId), clearance);

src/Spd.Utilities.Dynamics/OptionSets.cs

@@ -402,4 +402,11 @@ public enum EventStatusReasonOptionSet
         Success = 100000002, //Inactive State status reason
         Fail = 100000003 //Inactive State status reason
     }
+
+    public enum CaseRiskLevelOptionSet
+    {
+        L1 = 100000000,
+        L2 = 100000001,
+        L3 = 100000002
+    }
 }