#2322 - IER12 E2E Tests - Validate Multiple Files #2478

andrewsignori-aot · 2023-11-04T01:28:05Z

Changed the saveIER12TestInputData to use provided locations instead of creating a brand new one every time.
Once the institutions/locations were no longer brand new every time there were conflicts with the SABC program code. The logic was adapted to allow reusing the programs for the same institution and the same SABC code instead of creating new programs every time (which will generate the conflict).
Added the scenario to allow multiple files to be generated from different institutions/locations.
- Should generate 2 IER12 files for locations from different institutions using distinct institution codes.
Created getUploadedFiles to allow getting multiple uploaded files. The method getUploadedFile was kept for now to prevent further refactoring and also it can be used as a helper since most of the same we upload one file only.
Fix for a dynamic data assertion that was being treated as a constant which will make the E2E tests fail.

guru-aot · 2023-11-06T19:02:27Z

sources/packages/backend/libs/test-utils/src/factories/education-program-offering.ts

+  // an institution ensure that the relationship will be kept and
+  // another institution will not be generated.
+  const institution =
+    relations?.institutionLocation?.institution ?? relations.institution;


guru-aot · 2023-11-06T19:03:42Z

sources/packages/backend/libs/test-utils/src/factories/institution-location.ts

@@ -45,6 +45,7 @@ export function createFakeInstitutionLocation(
      count: 4,
      upcase: true,
    });
+  institutionLocation.hasIntegration = options?.initialValue?.hasIntegration;


did we miss this in the previous iterations? or why was this added now?

It was not needed till now.

guru-aot · 2023-11-06T19:09:20Z

sources/packages/backend/libs/test-utils/src/mocks/ssh-service-mock.ts

-  return uploadedFile;
+  return sshClientMock.put.mock.calls.map((call) => {
+    const uploadedFile = {} as UploadedFile;
+    const [input, remoteFilePath] = call;


Not a show stopper, just a suggestion. I believe we can remove this const and pass it in the call itself.

return sshClientMock.put.mock.calls.map(([input, remoteFilePath]) => {

We can, I did the change and I am still not sure which one is cleaner from a code perspective.
Either way, I am accepting the suggestion.

guru-aot · 2023-11-06T19:12:20Z

...ssors/schedulers/institution-integration/ier12-integration/_tests_/e2e/utils/string-utils.ts

@@ -14,6 +15,15 @@ export function numberToText(
  return value.toString().padStart(options?.length ?? 10, "0");
 }

+/**


Is this method used anywhere?

I am not sure if I am following the question. This method was added in the previous PR and it is used in 18 places.

guru-aot

Nice work @andrewsignori-aot , Please have a look on some doubts.

guru-aot

LGTM, nice work

ann-aot · 2023-11-06T19:59:09Z

...nstitution-integration/ier12-integration/_tests_/e2e/ier12-integration.scheduler.e2e-spec.ts

+      },
+      assessment: {
+        triggerType: AssessmentTriggerType.OriginalAssessment,
+        // Add o one hour to ensure the proper file upload order.


Add **o** one??

ann-aot · 2023-11-06T20:03:49Z

...ssors/schedulers/institution-integration/ier12-integration/_tests_/e2e/utils/string-utils.ts

    expectedRecords?: number;
  },
 ): QueueProcessSummaryResult {
  return {
    summary: [
-      `The uploaded file: ${process.env.INSTITUTION_REQUEST_FOLDER}\\ZZZY\\IER_012_${timestamp}.txt`,
+      `The uploaded file: ${process.env.INSTITUTION_REQUEST_FOLDER}\\${options?.institutionCode}\\IER_012_${timestamp}.txt`,


ann-aot

LGTM @andrewsignori-aot 👍 nice work. only a very minor comment.

andrepestana-aot

Looks good! Great work!

sh16011993

Nice Work @andrewsignori-aot 👍

sonarqubecloud · 2023-11-06T20:36:14Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
1 Code Smell

No Coverage information
0.0% Duplication

github-actions · 2023-11-06T20:37:34Z

Backend Unit Tests Coverage Report

Totals
Statements:	18.17% ( 2341 / 12882 )
Methods:	9.28% ( 151 / 1628 )
Lines:	20.69% ( 2016 / 9744 )
Branches:	11.52% ( 174 / 1510 )

github-actions · 2023-11-06T20:38:09Z

E2E Queue Consumers Coverage Report

Totals
Statements:	76.94% ( 564 / 733 )
Methods:	71.59% ( 63 / 88 )
Lines:	78.75% ( 493 / 626 )
Branches:	42.11% ( 8 / 19 )

github-actions · 2023-11-06T20:38:54Z

E2E Workflow Workers Coverage Report

Totals
Statements:	52.62% ( 341 / 648 )
Methods:	50% ( 40 / 80 )
Lines:	56.85% ( 282 / 496 )
Branches:	26.39% ( 19 / 72 )

github-actions · 2023-11-06T20:40:39Z

E2E SIMS API Coverage Report

Totals
Statements:	55.53% ( 4084 / 7354 )
Methods:	52.88% ( 505 / 955 )
Lines:	60.25% ( 3310 / 5494 )
Branches:	29.72% ( 269 / 905 )

dheepak-aot · 2023-11-06T21:21:53Z

...nstitution-integration/ier12-integration/_tests_/e2e/ier12-integration.scheduler.e2e-spec.ts

+      }),
+    ]);
+    // Assert file output.
+    const [fileA, fileB] = getUploadedFiles(sftpClientMock);


dheepak-aot · 2023-11-06T21:22:35Z

...ssors/schedulers/institution-integration/ier12-integration/_tests_/e2e/utils/string-utils.ts

    expectedRecords?: number;
  },
 ): QueueProcessSummaryResult {
  return {
    summary: [
-      `The uploaded file: ${process.env.INSTITUTION_REQUEST_FOLDER}\\ZZZY\\IER_012_${timestamp}.txt`,
+      `The uploaded file: ${process.env.INSTITUTION_REQUEST_FOLDER}\\${options?.institutionCode}\\IER_012_${timestamp}.txt`,


dheepak-aot

Looks Good 👍

Preparation to allow shared locations.

b000f4c

andrewsignori-aot added Queue Consumers E2E/Unit tests labels Nov 4, 2023

andrewsignori-aot self-assigned this Nov 4, 2023

Added multiple files scenarios

c22306f

andrewsignori-aot marked this pull request as ready for review November 4, 2023 02:19

andrewsignori-aot requested review from andrepestana-aot, ann-aot, cditcher, dheepak-aot, JasonCTang, sh16011993 and guru-aot November 4, 2023 02:19

andrewsignori-aot changed the title ~~#2322 - IER12 E2E Tests - New Scenarios - Part 2~~ #2322 - IER12 E2E Tests - Validate Multiple Files Nov 4, 2023

guru-aot reviewed Nov 6, 2023

View reviewed changes

Minor PR comment change.

cf4614f

guru-aot approved these changes Nov 6, 2023

View reviewed changes

ann-aot reviewed Nov 6, 2023

View reviewed changes

ann-aot approved these changes Nov 6, 2023

View reviewed changes

andrepestana-aot approved these changes Nov 6, 2023

View reviewed changes

sh16011993 approved these changes Nov 6, 2023

View reviewed changes

Minor comment fix.

4804014

dheepak-aot reviewed Nov 6, 2023

View reviewed changes

dheepak-aot approved these changes Nov 6, 2023

View reviewed changes

andrewsignori-aot merged commit 4596c01 into main Nov 6, 2023

andrewsignori-aot temporarily deployed to DEV November 6, 2023 21:49 — with GitHub Actions Inactive

andrewsignori-aot temporarily deployed to DEV November 6, 2023 21:50 — with GitHub Actions Inactive

andrewsignori-aot temporarily deployed to DEV November 6, 2023 21:51 — with GitHub Actions Inactive

andrewsignori-aot temporarily deployed to DEV November 6, 2023 21:54 — with GitHub Actions Inactive

andrewsignori-aot deleted the feature/#2322-ier12-e2e-tests-new-scenarios-part-2 branch November 17, 2023 23:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#2322 - IER12 E2E Tests - Validate Multiple Files #2478

#2322 - IER12 E2E Tests - Validate Multiple Files #2478

andrewsignori-aot commented Nov 4, 2023 •

edited

Loading

guru-aot Nov 6, 2023

guru-aot Nov 6, 2023

andrewsignori-aot Nov 6, 2023

guru-aot Nov 6, 2023

andrewsignori-aot Nov 6, 2023

andrewsignori-aot Nov 6, 2023

guru-aot Nov 6, 2023

andrewsignori-aot Nov 6, 2023

guru-aot Nov 6, 2023

guru-aot left a comment

guru-aot left a comment

ann-aot Nov 6, 2023

andrewsignori-aot Nov 6, 2023

ann-aot Nov 6, 2023

ann-aot left a comment

andrepestana-aot left a comment

sh16011993 left a comment

sonarqubecloud bot commented Nov 6, 2023

github-actions bot commented Nov 6, 2023

github-actions bot commented Nov 6, 2023

github-actions bot commented Nov 6, 2023

github-actions bot commented Nov 6, 2023

dheepak-aot Nov 6, 2023

dheepak-aot Nov 6, 2023

dheepak-aot left a comment

#2322 - IER12 E2E Tests - Validate Multiple Files #2478

#2322 - IER12 E2E Tests - Validate Multiple Files #2478

Conversation

andrewsignori-aot commented Nov 4, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

guru-aot left a comment

Choose a reason for hiding this comment

guru-aot left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ann-aot left a comment

Choose a reason for hiding this comment

andrepestana-aot left a comment

Choose a reason for hiding this comment

sh16011993 left a comment

Choose a reason for hiding this comment

sonarqubecloud bot commented Nov 6, 2023

github-actions bot commented Nov 6, 2023

Backend Unit Tests Coverage Report

github-actions bot commented Nov 6, 2023

E2E Queue Consumers Coverage Report

github-actions bot commented Nov 6, 2023

E2E Workflow Workers Coverage Report

github-actions bot commented Nov 6, 2023

E2E SIMS API Coverage Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dheepak-aot left a comment

Choose a reason for hiding this comment

andrewsignori-aot commented Nov 4, 2023 •

edited

Loading