Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: bcgov/SIMS
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.0.1-prerelease.0
Choose a base ref
...
head repository: bcgov/SIMS
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.0.1-prerelease.16
Choose a head ref
  • 16 commits
  • 163 files changed
  • 8 contributors

Commits on Mar 20, 2023

  1. #1769 - E2E/Unit - API Controllers - Part 1 - Program Years (#1803)

    * added createStudentUsers ot seeding; refactored ATBC tests; created program year e2e tests;
    
    * added createStudentUsers ot seeding; refactored ATBC tests; created program year e2e tests;
    
    * renaming & fixes
    
    * review comments
    
    * program year test split
    
    * review issues
    
    * removed unused import
    
    * review issues
    
    * fixed import
    
    * fixed import
    
    * set an id for the test
    
    * added TODO
    andrepestana-aot authored Mar 20, 2023
    Copy the full SHA
    98931d3 View commit details
  2. #1719 - Create Release Strategy (#1821)

    #1719 - Create Release Strategy  (#1821)
    ann-aot authored Mar 20, 2023
    Copy the full SHA
    720e8e3 View commit details

Commits on Mar 21, 2023

  1. #1757 - Create common container for content in tab (#1816)

    * #1757 - Created common container for the contents in tab
    
    Created common container for the contents in tab. However, this does not include the styling changes.
    
    * #1757 - Included default slot for BodyHeaderContainer
    
    * #1757 - Made changes to the styling
    
    * Commiting Notes file
    
    * #1757 - Updated code with code review suggestions
    
    * #1757 - Updated BodyHeader to use a positive margin for the subtitle
    
    * #1757 - Updated FullPageContainer to remove extra padding and margin for centeredTab layout
    
    * #1757 - Adjusted the code for better readability
    
    ---------
    
    Co-authored-by: Shekhar <Shashank.X.Shekhar@gov.bc.ca>
    sh16011993 and Shekhar authored Mar 21, 2023
    Copy the full SHA
    6064f16 View commit details

Commits on Mar 22, 2023

  1. #1722 - E2E Tests for assessment gateway (#1822)

    E2E Tests for assessment gateway
    dheepak-aot authored Mar 22, 2023
    Copy the full SHA
    7e084e3 View commit details

Commits on Mar 23, 2023

  1. #1757 - Create common container for content in tab (Institution) - Pa…

    …rt 2 (#1826)
    
    * Updated the Institution tabs in the Ministry portal to use the common TabContainer and the BodyHeaderContainer
    
    * Code updated with review comments
    sh16011993 authored Mar 23, 2023
    Copy the full SHA
    4a21d95 View commit details
  2. #1722 - Get worker name from enum (#1831)

    Get worker name from enum
    dheepak-aot authored Mar 23, 2023
    Copy the full SHA
    f6ba961 View commit details

Commits on Mar 27, 2023

  1. #1683 - Completed application - E2E tests for application tracker (#1832

    )
    
    - Fix for PIR decline throwing an error while completing the process.
    - Refactor application progress details to get rid of the Sonarcloud issue.
    - Icon spacing adjusted (@hellolynn-tbtb is aware of and approved it).
    - Renamed factory method saveFakeApplicationCOE to saveFakeApplicationDisbursements allowing it to be used for these E2E tests also.
    - Removed prefix ${ClientTypeBaseRoute.Institution} from some E2E that were wrongly added.
    - E2E tests for the new endpoint added for the completed status.
    ApplicationStudentsController(e2e)-getCompletedApplicationDetails
    ✓ Should throw NotFoundException when the application is not associated with the authenticated student. (390 ms)
    ✓ Should throw NotFoundException when the application is not in 'Completed' status. (75 ms)
    ✓ Should get application details when application is in 'Completed' status. (76 ms)
    ✓ Should get application details with scholastic standing change type when application has a scholastic standing 'Student did not complete program associated with. (60 ms)
    ✓ Should get application details with the most updated appeal status when the application has more than one student appeals associated with. (78 ms)
    andrewsignori-aot authored Mar 27, 2023
    Copy the full SHA
    70f04fd View commit details

Commits on Mar 28, 2023

  1. #1737 - Update institution location content (new) (#1839)

    Content updates and style enhancements
    hellolynn-tbtb authored Mar 28, 2023
    Copy the full SHA
    0b7aab5 View commit details
  2. #1769 - E2E/Unit - API Controllers - Part 2 - ApplicationException (#…

    …1836)
    
    * added getExceptionById and getPendingApplicationExceptions
    
    * added apporveException
    
    * renamed class
    
    * changed createMockedZeebeModule to use a mockedZBClient; tested notification;
    
    * removed comment
    
    * review comments
    
    * removed explict declaration
    
    * removed unused import
    
    * review issues
    
    * review issues
    
    * review issues
    
    * review issues
    
    * review issues
    
    * review issues
    
    * review issues
    
    * review issues
    andrepestana-aot authored Mar 28, 2023
    Copy the full SHA
    ac74eab View commit details

Commits on Mar 29, 2023

  1. #1712 - Students overawards UI - Part 1 (#1846)

    Students overawards UI - Part 1
    guru-aot authored Mar 29, 2023
    Copy the full SHA
    955f54b View commit details

Commits on Mar 30, 2023

  1. #1780 - Associate MSFAA with disbursement (#1847)

    Associate MSFAA with disbursement
    dheepak-aot authored Mar 30, 2023
    Copy the full SHA
    bdbfc5f View commit details
  2. #1715 COE and Tuition Remittance - e-Cert Adjustments (#1840)

    #1715 COE and Tuition Remittance - e-Cert Adjustments (#1840)
    ann-aot authored Mar 30, 2023
    Copy the full SHA
    2dcbe73 View commit details
  3. #1837 - Fix missing details on submitting Designation Request (#1848)

    * #1837 - Fixed the Designation Request bug
    
    * Update code with review comments
    
    * Updated code with review comments
    
    * Updated code with review comments
    
    * Updated code with review comments
    
    * Updated code with the review comments
    sh16011993 authored Mar 30, 2023
    Copy the full SHA
    25c01c4 View commit details

Commits on Mar 31, 2023

  1. #1712 - Students over awards UI - E2E Test cases (#1856)

    Students over awards UI - E2E Test cases
    guru-aot authored Mar 31, 2023
    Copy the full SHA
    0091bca View commit details

Commits on Apr 3, 2023

  1. #1683 - Show success icon when application is completed (#1858)

    The success icon was not displayed for a reassessment because the check relied on the COE confirmation.
    Change the check to be based on the application status.
    andrewsignori-aot authored Apr 3, 2023
    Copy the full SHA
    e7d519c View commit details

Commits on Apr 5, 2023

  1. #1834 - Service task identifier for subprocesses (#1842)

    Created single mocked worker to handle subprocesses mocks. Further details on PR description.
    andrewsignori-aot authored Apr 5, 2023
    Copy the full SHA
    2145c5b View commit details
Showing with 6,167 additions and 2,243 deletions.
  1. +3 −1 .github/workflows/build-deploy-dev.yml
  2. +8 −2 .github/workflows/build-deploy-forms.yml
  3. +10 −8 .github/workflows/deploy-all.yml
  4. +6 −0 .github/workflows/deploy-secrets.yml
  5. +2 −0 sources/packages/backend/apps/api/src/app.aest.module.ts
  6. +4 −0 sources/packages/backend/apps/api/src/app.students.module.ts
  7. +73 −0 ...kend/apps/api/src/route-controllers/application-exception/_tests_/application-exception-helper.ts
  8. +206 −0 ...rollers/application-exception/_tests_/e2e/application-exception.aest.approveException.e2e-spec.ts
  9. +78 −0 ...rollers/application-exception/_tests_/e2e/application-exception.aest.getExceptionById.e2e-spec.ts
  10. +106 −0 ...tion-exception/_tests_/e2e/application-exception.aest.getPendingApplicationExceptions.e2e-spec.ts
  11. +236 −0 ...e-controllers/application/_tests_/application.students.getCompletedApplicationDetails.e2e-spec.ts
  12. +1 −0 ...es/packages/backend/apps/api/src/route-controllers/application/application.students.controller.ts
  13. +1 −0 sources/packages/backend/apps/api/src/route-controllers/application/models/application.dto.ts
  14. +2 −1 sources/packages/backend/apps/api/src/route-controllers/assessment/assessment.controller.service.ts
  15. +0 −1 sources/packages/backend/apps/api/src/route-controllers/assessment/models/assessment.dto.ts
  16. +13 −8 ...firmation-of-enrollment/_tests_/e2e/confirmation-of-enrollment.aest.confirmEnrollment.e2e-spec.ts
  17. +72 −47 ...n-of-enrollment/_tests_/e2e/confirmation-of-enrollment.institutions.confirmEnrollment.e2e-spec.ts
  18. +27 −19 ...f-enrollment/_tests_/e2e/confirmation-of-enrollment.institutions.getApplicationForCOE.e2e-spec.ts
  19. +1 −2 ...-of-enrollment/_tests_/e2e/confirmation-of-enrollment.institutions.getCOEDeniedReason.e2e-spec.ts
  20. +25 −20 ...ation-of-enrollment/_tests_/e2e/confirmation-of-enrollment.institutions.getCOESummary.e2e-spec.ts
  21. +12 −1 .../api/src/route-controllers/designation-agreement/designation-agreement.institutions.controller.ts
  22. +5 −0 .../backend/apps/api/src/route-controllers/designation-agreement/models/designation-agreement.dto.ts
  23. +2 −0 sources/packages/backend/apps/api/src/route-controllers/index.ts
  24. +2 −2 ...te-controllers/overaward/_tests_/e2e/overaward.aest.controller.getOverawardsByStudent.e2e-spec.ts
  25. +67 −0 ...e-controllers/overaward/_tests_/e2e/overaward.students.controller.getOverawardBalance.e2e-spec.ts
  26. +97 −0 ...ontrollers/overaward/_tests_/e2e/overaward.students.controller.getOverawardsByStudent.e2e-spec.ts
  27. +7 −3 sources/packages/backend/apps/api/src/route-controllers/overaward/models/overaward.dto.ts
  28. +8 −19 sources/packages/backend/apps/api/src/route-controllers/overaward/overaward.aest.controller.ts
  29. +58 −0 sources/packages/backend/apps/api/src/route-controllers/overaward/overaward.controller.service.ts
  30. +54 −0 sources/packages/backend/apps/api/src/route-controllers/overaward/overaward.students.controller.ts
  31. +96 −0 ...trollers/program-year/_tests_/e2e/program-year.students.controller.getProgramYearById.e2e-spec.ts
  32. +80 −0 ...controllers/program-year/_tests_/e2e/program-year.students.controller.getProgramYears.e2e-spec.ts
  33. +24 −89 ...s/packages/backend/apps/api/src/route-controllers/student/student.students.controller.e2e-spec.ts
  34. +1 −9 sources/packages/backend/apps/api/src/services/application/application.service.ts
  35. +32 −0 sources/packages/backend/apps/api/src/services/institution/institution.service.ts
  36. +2 −2 sources/packages/backend/apps/api/src/services/student-assessment/student-assessment.service.ts
  37. +33 −0 sources/packages/backend/apps/api/src/testHelpers/auth/aest-auth-helpers.ts
  38. +2 −0 sources/packages/backend/apps/api/src/testHelpers/auth/index.ts
  39. +69 −0 sources/packages/backend/apps/api/src/testHelpers/auth/student-token-helpers.ts
  40. +1 −1 sources/packages/backend/apps/api/src/testHelpers/fake-entities/application-fake.ts
  41. +0 −12 sources/packages/backend/apps/api/src/testHelpers/fake-entities/program-year-fake.ts
  42. +1 −0 sources/packages/backend/apps/api/src/testHelpers/index.ts
  43. +3 −1 sources/packages/backend/apps/api/src/testHelpers/mocked-providers/zeebe-client-mock.ts
  44. +24 −0 ...backend/apps/db-migrations/src/migrations/1679688897417-AddTuitionRemittanceEffectiveAmountCol.ts
  45. +27 −0 ...es/backend/apps/db-migrations/src/migrations/1679969876527-DisbursementSchedulesAddMSFAANumber.ts
  46. +24 −0 ...d/apps/db-migrations/src/migrations/1680120153698-DesignationAgreementsTableAlterSubmittedData.ts
  47. +7 −0 ...ckend/apps/db-migrations/src/sql/DesignationAgreements/Update-col-submitted-data-add-not-null.sql
  48. +5 −0 ...kend/apps/db-migrations/src/sql/DesignationAgreements/Update-col-submitted-data-drop-not-null.sql
  49. +6 −0 ...ces/packages/backend/apps/db-migrations/src/sql/DisbursementSchedules/Add-col-msfaa-number-id.sql
  50. +7 −0 .../apps/db-migrations/src/sql/DisbursementSchedules/Add-tuition-remittance-effective-amount-col.sql
  51. +2 −0 ...es/packages/backend/apps/db-migrations/src/sql/DisbursementSchedules/Drop-col-msfaa-number-id.sql
  52. +3 −0 ...ps/db-migrations/src/sql/DisbursementSchedules/Remove-tuition-remittance-effective-amount-col.sql
  53. +4 −2 ...backend/apps/queue-consumers/src/processors/assessment/cancel-application-assessment.processor.ts
  54. +1 −1 ...sdc-integration/ecert-integration/tests/ecert-full-time-process-integration.scheduler.e2e-spec.ts
  55. +25 −0 ...s/backend/apps/test-db-seeding/src/db-seeding/student/basic-seeding/create-student-users.model.ts
  56. +80 −0 ...ackages/backend/apps/test-db-seeding/src/db-seeding/student/basic-seeding/create-student-users.ts
  57. +1 −0 sources/packages/backend/apps/test-db-seeding/src/db-seeding/student/index.ts
  58. +2 −0 sources/packages/backend/apps/test-db-seeding/src/test-db-seeding.module.ts
  59. +3 −2 sources/packages/backend/apps/workers/src/constants/error-code.constants.ts
  60. +3 −41 sources/packages/backend/apps/workers/src/controllers/application/application.controller.ts
  61. +0 −4 sources/packages/backend/apps/workers/src/controllers/application/application.dto.ts
  62. +5 −4 sources/packages/backend/apps/workers/src/controllers/assessment/assessment.controller.ts
  63. +3 −2 sources/packages/backend/apps/workers/src/controllers/cra-integration/cra-integration.controller.ts
  64. +50 −4 sources/packages/backend/apps/workers/src/controllers/disbursement/disbursement.controller.ts
  65. +5 −0 sources/packages/backend/apps/workers/src/controllers/disbursement/disbursement.dto.ts
  66. +2 −1 ...ages/backend/apps/workers/src/controllers/program-info-request/program-info-request.controller.ts
  67. +3 −2 sources/packages/backend/apps/workers/src/controllers/supporting-user/supporting-user.controller.ts
  68. +1 −159 sources/packages/backend/apps/workers/src/services/application/application.service.ts
  69. +177 −0 ...packages/backend/apps/workers/src/services/disbursement-schedule/disbursement-schedule.service.ts
  70. +1 −0 sources/packages/backend/apps/workers/src/services/index.ts
  71. +2 −2 sources/packages/backend/apps/workers/src/services/msfaa-number/msfaa-number.service.ts
  72. +3 −1 sources/packages/backend/apps/workers/src/workers.module.ts
  73. +1 −1 ...packages/backend/libs/integrations/src/esdc-integration/e-cert-integration/e-cert-file-handler.ts
  74. +2 −0 ...es/backend/libs/integrations/src/esdc-integration/e-cert-integration/e-cert-integration.module.ts
  75. +27 −3 ...ackages/backend/libs/integrations/src/services/disbursement-schedule/e-cert-generation.service.ts
  76. +1 −0 sources/packages/backend/libs/services/src/constants/index.ts
  77. +15 −0 sources/packages/backend/libs/services/src/constants/worker-constants.ts
  78. +1 −0 sources/packages/backend/libs/services/src/disbursement-overaward/disbursement-overaward.service.ts
  79. +0 −20 sources/packages/backend/libs/sims-db/src/entities/application.model.ts
  80. +2 −2 sources/packages/backend/libs/sims-db/src/entities/designation-agreement.model.ts
  81. +34 −0 sources/packages/backend/libs/sims-db/src/entities/disbursement-schedule.model.ts
  82. +35 −0 sources/packages/backend/libs/test-utils/src/factories/application-exception-request.ts
  83. +30 −0 sources/packages/backend/libs/test-utils/src/factories/application-exception.ts
  84. +127 −0 sources/packages/backend/libs/test-utils/src/factories/application.ts
  85. +0 −109 sources/packages/backend/libs/test-utils/src/factories/confirmation-of-enrollment.ts
  86. +12 −6 sources/packages/backend/libs/test-utils/src/factories/program-year.ts
  87. +34 −0 sources/packages/backend/libs/test-utils/src/factories/student-appeal-request.ts
  88. +27 −0 sources/packages/backend/libs/test-utils/src/factories/student-appeal.ts
  89. +34 −0 sources/packages/backend/libs/test-utils/src/factories/student-scholastic-standing.ts
  90. +5 −0 sources/packages/backend/libs/test-utils/src/index.ts
  91. +1 −1 sources/packages/backend/package.json
  92. +189 −173 sources/packages/backend/workflow/BPMN/camunda-8/assessment-gateway.bpmn
  93. +10 −10 sources/packages/backend/workflow/BPMN/camunda-8/income-verification.bpmn
  94. +0 −1 sources/packages/backend/workflow/test/2021-2022/constants/program-year.constants.ts
  95. +0 −124 ...ges/backend/workflow/test/2021-2022/fulltime-assessment/fulltime-assessment-2021-2022.e2e-spec.ts
  96. +301 −0 ...kend/workflow/test/2022-2023/assessment-gateway/assessment-gateway.originalAssessment.e2e-spec.ts
  97. +56 −0 ...s/backend/workflow/test/2022-2023/assessment-gateway/assessment-gateway.studentAppeal.e2e-spec.ts
  98. +6 −0 sources/packages/backend/workflow/test/2022-2023/constants/program-year.constants.ts
  99. +13 −3 ...ges/backend/workflow/test/2022-2023/fulltime-assessment/fulltime-assessment-2022-2023.e2e-spec.ts
  100. +301 −0 ...kend/workflow/test/2023-2024/assessment-gateway/assessment-gateway.originalAssessment.e2e-spec.ts
  101. +56 −0 ...s/backend/workflow/test/2023-2024/assessment-gateway/assessment-gateway.studentAppeal.e2e-spec.ts
  102. +6 −0 sources/packages/backend/workflow/test/2023-2024/constants/program-year.constants.ts
  103. +13 −8 ...ges/backend/workflow/test/2023-2024/fulltime-assessment/fulltime-assessment-2023-2024.e2e-spec.ts
  104. +1 −1 sources/packages/backend/workflow/test/jest-e2e.json
  105. +2 −0 sources/packages/backend/workflow/test/models/assessment.model.ts
  106. +24 −0 sources/packages/backend/workflow/test/test-utils/constants/mock-constants.ts
  107. +16 −0 sources/packages/backend/workflow/test/test-utils/constants/system-configurations-constants.ts
  108. +43 −0 sources/packages/backend/workflow/test/test-utils/constants/workflow-variables-constants.ts
  109. +82 −2 sources/packages/backend/workflow/test/test-utils/factories/assessment-consolidated-data.ts
  110. +4 −0 sources/packages/backend/workflow/test/test-utils/index.ts
  111. +37 −0 ...end/workflow/test/test-utils/mock/assessment-gateway/create-supporting-users-parents-task-mock.ts
  112. +19 −0 ...ackend/workflow/test/test-utils/mock/assessment-gateway/load-assessment-consolidated-data-mock.ts
  113. +23 −0 ...ckend/workflow/test/test-utils/mock/assessment-gateway/verify-application-exceptions-task-mock.ts
  114. +21 −0 ...rkflow/test/test-utils/mock/cra-integration-income-verification/check-income-request-task-mock.ts
  115. +40 −0 ...kflow/test/test-utils/mock/cra-integration-income-verification/create-income-request-task-mock.ts
  116. +8 −0 sources/packages/backend/workflow/test/test-utils/mock/index.ts
  117. +173 −0 sources/packages/backend/workflow/test/test-utils/mock/mock.utils.ts
  118. +27 −0 ...t/test-utils/mock/supporting-user-information-request/check-supporting-user-response-task-mock.ts
  119. +76 −0 sources/packages/backend/workflow/test/test-utils/mock/zeebe-worker-mock.ts
  120. +36 −0 sources/packages/backend/workflow/test/test-utils/validation/workflow-validation.utils.ts
  121. +18 −15 sources/packages/forms/src/form-definitions/institutionlocation.json
  122. +192 −98 sources/packages/forms/src/form-definitions/noticeofassessment.json
  123. +10 −0 sources/packages/web/src/assets/css/base.scss
  124. +17 −8 sources/packages/web/src/assets/css/formio-shared.scss
  125. +4 −0 sources/packages/web/src/assets/css/vuetify.scss
  126. +548 −0 sources/packages/web/src/assets/images/student-glass-jar.svg
  127. +118 −115 sources/packages/web/src/components/aest/StudentApplications.vue
  128. +168 −164 sources/packages/web/src/components/common/InstitutionUserSummary.vue
  129. +98 −96 sources/packages/web/src/components/common/LocationSummary.vue
  130. +105 −90 sources/packages/web/src/components/common/OverawardDetails.vue
  131. +0 −1 sources/packages/web/src/components/common/StepperProgressBar.vue
  132. +49 −48 sources/packages/web/src/components/common/StudentOverawardDetails.vue
  133. +70 −70 sources/packages/web/src/components/common/notes/Notes.vue
  134. +1 −1 sources/packages/web/src/components/generic/BodyHeader.vue
  135. +28 −0 sources/packages/web/src/components/layouts/BodyHeaderContainer.vue
  136. +1 −1 sources/packages/web/src/components/layouts/FullPageContainer.vue
  137. +25 −0 sources/packages/web/src/components/layouts/TabContainer.vue
  138. +40 −50 sources/packages/web/src/components/students/applicationTracker/ApplicationProgressBar.vue
  139. +1 −1 sources/packages/web/src/components/students/applicationTracker/Cancelled.vue
  140. +1 −1 sources/packages/web/src/components/students/applicationTracker/MultipleDisbursementBanner.vue
  141. +1 −0 sources/packages/web/src/constants/routes/RouteConstants.ts
  142. +4 −0 sources/packages/web/src/main.ts
  143. +9 −0 sources/packages/web/src/router/StudentRoutes.ts
  144. +1 −0 sources/packages/web/src/services/http/dto/Application.dto.ts
  145. +1 −0 sources/packages/web/src/types/AppRoutes.ts
  146. +16 −13 sources/packages/web/src/views/aest/institution/Designation.vue
  147. +42 −38 sources/packages/web/src/views/aest/institution/InstitutionNotes.vue
  148. +6 −8 sources/packages/web/src/views/aest/institution/Locations.vue
  149. +23 −21 sources/packages/web/src/views/aest/institution/Profile.vue
  150. +89 −83 sources/packages/web/src/views/aest/institution/Programs.vue
  151. +88 −82 sources/packages/web/src/views/aest/institution/Restrictions.vue
  152. +7 −9 sources/packages/web/src/views/aest/institution/Users.vue
  153. +6 −8 sources/packages/web/src/views/aest/student/Applications.vue
  154. +93 −89 sources/packages/web/src/views/aest/student/FileUploads.vue
  155. +2 −3 sources/packages/web/src/views/aest/student/Overawards.vue
  156. +7 −5 sources/packages/web/src/views/aest/student/Profile.vue
  157. +76 −67 sources/packages/web/src/views/aest/student/SINManagement.vue
  158. +43 −39 sources/packages/web/src/views/aest/student/StudentNotes.vue
  159. +84 −80 sources/packages/web/src/views/aest/student/StudentRestrictions.vue
  160. +13 −1 sources/packages/web/src/views/institution/EditInstitutionLocation.vue
  161. +8 −0 sources/packages/web/src/views/student/AppStudent.vue
  162. +76 −0 sources/packages/web/src/views/student/StudentOverawardsBalance.vue
  163. +1 −1 sources/tests/workflow-docker-compose.yml
4 changes: 3 additions & 1 deletion .github/workflows/build-deploy-dev.yml
Original file line number Diff line number Diff line change
@@ -188,7 +188,9 @@ jobs:
echo HOST_PREFIX: $HOST_PREFIX
# Checkout the PR branch
- name: Checkout Target Branch
uses: actions/checkout@v1
uses: actions/checkout@v3
with:
ref: ${{ needs.createTag.outputs.newTag }}
# Log in to OpenShift.
# Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
# PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
10 changes: 8 additions & 2 deletions .github/workflows/build-deploy-forms.yml
Original file line number Diff line number Diff line change
@@ -12,6 +12,10 @@ on:
type: string
required: true
default: "v2.5.3"
gitRef:
description: "Git Ref"
required: true
default: ""

jobs:
build_deploy:
@@ -22,7 +26,7 @@ jobs:
FORMIO_SOURCE_REPO_TAG: ${{ github.event.inputs.formioTag }}
FORMS_NAME: forms
NAMESPACE: ${{ secrets.OPENSHIFT_ENV_NAMESPACE }}
BUILD_REF: ${{ github.event.inputs.buildRef }}
BUILD_REF: ${{ github.event.inputs.formioTag }}
HOST_PREFIX: ${{ secrets.HOST_PREFIX }}
MONGODB_URI: ${{ secrets.MONGODB_URI }}
BUILD_NAMESPACE: 0c27fb-tools
@@ -35,7 +39,9 @@ jobs:
echo HOST_PREFIX: $HOST_PREFIX
# Checkout the PR branch
- name: Checkout Target Branch
uses: actions/checkout@v1
uses: actions/checkout@v3
with:
ref: ${{ github.event.inputs.gitRef }}
# Log in to OpenShift.
# Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
# PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
18 changes: 10 additions & 8 deletions .github/workflows/deploy-all.yml
Original file line number Diff line number Diff line change
@@ -3,10 +3,10 @@ name: Deploy to OpenShift/Camunda
on:
workflow_dispatch:
inputs:
buildRef:
description: "Build Ref"
gitRef:
description: "Git Ref (e.g. v1.0.0 or v1.0.0-prerelease.1)"
required: true
default: "main"
default: ""
environment:
required: true
type: environment
@@ -20,7 +20,7 @@ on:
default: true
workflow_call:
inputs:
buildRef:
gitRef:
required: true
type: string
environment:
@@ -40,7 +40,7 @@ jobs:
environment: ${{ github.event.inputs.environment }}
env:
NAMESPACE: ${{ secrets.OPENSHIFT_ENV_NAMESPACE }}
BUILD_REF: ${{ github.event.inputs.buildRef }}
BUILD_REF: ${{ github.event.inputs.gitRef }}
HOST_PREFIX: ${{ secrets.HOST_PREFIX }}
BUILD_NAMESPACE: 0c27fb-tools
KEYCLOAK_REALM: "aestsims"
@@ -70,7 +70,9 @@ jobs:
echo HOST_PREFIX: $HOST_PREFIX
# Checkout the PR branch
- name: Checkout Target Branch
uses: actions/checkout@v1
uses: actions/checkout@v3
with:
ref: ${{ github.event.inputs.gitRef }}
# Log in to OpenShift.
# Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
# PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
@@ -105,7 +107,7 @@ jobs:
uses: ./.github/workflows/deploy-camunda-definitions.yml
with:
environment: ${{ github.event.inputs.environment }}
gitRef: ${{ github.event.inputs.buildRef }}
gitRef: ${{ github.event.inputs.gitRef }}
secrets: inherit
deployFormioDefinitions:
if: ${{ github.event.inputs.deployFormioDefinitions == 'true' }}
@@ -115,5 +117,5 @@ jobs:
uses: ./.github/workflows/deploy-formio-definitions.yml
with:
environment: ${{ github.event.inputs.environment }}
gitRef: ${{ github.event.inputs.buildRef }}
gitRef: ${{ github.event.inputs.gitRef }}
secrets: inherit
6 changes: 6 additions & 0 deletions .github/workflows/deploy-secrets.yml
Original file line number Diff line number Diff line change
@@ -6,6 +6,10 @@ on:
environment:
required: true
type: environment
gitRef:
description: "Build Ref"
required: true
default: ""

jobs:
updateSecrets:
@@ -48,6 +52,8 @@ jobs:
echo NAMESPACE: $NAMESPACE
- name: Checkout Target Branch
uses: actions/checkout@v3
with:
ref: ${{ github.event.inputs.gitRef }}
- name: Log in to OpenShift
run: |
oc login --token=${{ secrets.SA_TOKEN }} --server=https://api.silver.devops.gov.bc.ca:6443
2 changes: 2 additions & 0 deletions sources/packages/backend/apps/api/src/app.aest.module.ts
Original file line number Diff line number Diff line change
@@ -63,6 +63,7 @@ import {
ConfirmationOfEnrollmentAESTController,
ConfirmationOfEnrollmentControllerService,
OverawardAESTController,
OverawardControllerService,
} from "./route-controllers";
import { AuthModule } from "./auth/auth.module";
import {
@@ -156,6 +157,7 @@ import {
DisbursementScheduleService,
DisbursementOverawardService,
NoteSharedService,
OverawardControllerService,
],
})
export class AppAESTModule {}
4 changes: 4 additions & 0 deletions sources/packages/backend/apps/api/src/app.students.module.ts
Original file line number Diff line number Diff line change
@@ -38,6 +38,8 @@ import {
RestrictionStudentsController,
ProgramYearStudentsController,
ApplicationControllerService,
OverawardStudentsController,
OverawardControllerService,
} from "./route-controllers";
import { AuthModule } from "./auth/auth.module";
import { ConfigModule } from "@sims/utilities/config";
@@ -70,6 +72,7 @@ import { ATBCIntegrationModule } from "@sims/integrations/atbc-integration";
RestrictionStudentsController,
ATBCStudentController,
ProgramYearStudentsController,
OverawardStudentsController,
],
providers: [
WorkflowClientService,
@@ -106,6 +109,7 @@ import { ATBCIntegrationModule } from "@sims/integrations/atbc-integration";
StudentRestrictionSharedService,
DisbursementOverawardService,
NoteSharedService,
OverawardControllerService,
],
})
export class AppStudentsModule {}
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
import {
Application,
ApplicationException,
ApplicationExceptionRequest,
ApplicationExceptionStatus,
Student,
} from "@sims/sims-db";
import {
createFakeApplication,
createFakeApplicationException,
createFakeApplicationExceptionRequest,
createFakeStudent,
} from "@sims/test-utils";
import { AESTGroups, getAESTUser } from "../../../testHelpers";
import { DataSource } from "typeorm";

/**
* Create a fake application with an application exception associated.
* @param dataSource application dataSource.
* @param applicationExceptionStatus application exception status.
* @returns application with an application exception associated.
*/
export async function saveFakeApplicationWithApplicationException(
dataSource: DataSource,
applicationExceptionStatus: ApplicationExceptionStatus,
): Promise<Application> {
const applicationRepo = dataSource.getRepository(Application);
const applicationExceptionRepo =
dataSource.getRepository(ApplicationException);
const applicationExceptionRequestRepo = dataSource.getRepository(
ApplicationExceptionRequest,
);
const studentRepo = dataSource.getRepository(Student);
const assessedBy = await getAESTUser(
dataSource,
AESTGroups.BusinessAdministrators,
);

const student = await studentRepo.save(createFakeStudent());
let applicationException = createFakeApplicationException({
creator: student.user,
assessedBy,
});
applicationException.exceptionStatus = applicationExceptionStatus;
applicationException = await applicationExceptionRepo.save(
applicationException,
);

const application = await applicationRepo.save(
createFakeApplication({ student, applicationException }),
);

await applicationExceptionRequestRepo.save(
createFakeApplicationExceptionRequest({
applicationException,
creator: student.user,
}),
);

return applicationRepo.findOne({
relations: {
applicationException: {
exceptionNote: true,
exceptionRequests: true,
assessedBy: true,
},
student: true,
},
where: {
id: application.id,
},
});
}
Loading