[#13104] Accounts request form: auto-unify country names (#13117)

* Added unified countries for InstructorRequestForm * Added tests for InstructorRequestForm for unified countries * Fixed lint errors for InstructorRequestForm * Added countries and moved countrymapping * Tests Fixed --------- Co-authored-by: Francisco Savala <[email protected]> Co-authored-by: Wei Qing <[email protected]> Co-authored-by: Ching Ming Yuan <[email protected]> Co-authored-by: domoberzin <[email protected]>
TEAMMATES · Jul 11, 2024 · 3f5f68d · 3f5f68d
1 parent 13a1891
commit 3f5f68d
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 2 deletions.
diff --git a/...ges-static/request-page/instructor-request-form/instructor-request-form.component.spec.ts b/...ges-static/request-page/instructor-request-form/instructor-request-form.component.spec.ts
@@ -114,4 +114,24 @@ describe('InstructorRequestFormComponent', () => {
     expect(accountService.createAccountRequest).toHaveBeenCalledTimes(1);
     expect(accountService.createAccountRequest).toHaveBeenCalledWith(expect.objectContaining(typicalCreateRequest));
   });
+
+  it('should auto-unify country when applicable', () => {
+    jest.spyOn(accountService, 'createAccountRequest').mockReturnValue(
+        new Observable((subscriber) => { subscriber.next(); }));
+    const unitedStatesModel: InstructorRequestFormModel = {
+      ...typicalModel,
+      country: 'españa',
+    };
+    const unitedStatesCreateRequest: AccountCreateRequest = {
+      ...typicalCreateRequest,
+      instructorInstitution: `${unitedStatesModel.institution}, Spain`,
+    };
+    fillFormWith(unitedStatesModel);
+    component.onSubmit();
+
+    expect(accountService.createAccountRequest).toHaveBeenCalledTimes(1);
+    expect(accountService.createAccountRequest).toHaveBeenCalledWith(
+        expect.objectContaining(unitedStatesCreateRequest));
+  });
+
 });
diff --git a/...pp/pages-static/request-page/instructor-request-form/instructor-request-form.component.ts b/...pp/pages-static/request-page/instructor-request-form/instructor-request-form.component.ts
@@ -115,11 +115,24 @@ export class InstructorRequestFormComponent {
     const name = this.name.value!.trim();
     const email = this.email.value!.trim();
     const comments = this.comments.value!.trim();
-
+    // Country Mapping
+    const countryMapping: { [key: string]: string } = {
+      'united states': 'USA',
+      us: 'USA',
+      america: 'USA',
+      uk: 'United Kingdom',
+      deutschland: 'Germany',
+      'united arab emirates': 'UAE',
+      españa: 'Spain',
+      méxico: 'Mexico',
+      belgië: 'Belgium',
+      holland: 'Netherlands',
+    };
     // Combine country and institution
     const country = this.country.value!.trim();
+    const mappedCountry = countryMapping[country.toLowerCase()] || country;
     const institution = this.institution.value!.trim();
-    const combinedInstitution = `${institution}, ${country}`;
+    const combinedInstitution = `${institution}, ${mappedCountry}`;
 
     const requestData: AccountCreateRequest = {
       instructorEmail: email,