Skip to content

Comments

Add dev-env&test-env branches; update ROS report query; add KeyCloak login option#1101

Merged
chloe-yuu merged 39 commits intomasterfrom
test-env
Jun 18, 2025
Merged

Add dev-env&test-env branches; update ROS report query; add KeyCloak login option#1101
chloe-yuu merged 39 commits intomasterfrom
test-env

Conversation

@chloe-yuu
Copy link
Contributor

@chloe-yuu chloe-yuu commented May 22, 2025

This PR includes the following updates:

  1. New Branches Added:
    dev-env and test-env branches have been introduced.

  2. Updated GitHub Actions Behavior:
    Format Check
    Trigger: Runs on PRs that are opened, synchronized, or reopened to any branch.
    Analysis: Evaluates the current feature branch without comparing against any other branch.

Sonar Check
PR Check: Runs on PRs opened, synchronized, or reopened to any branch. Compares the current feature branch against the target branch (e.g., dev-env).
Push Check: Runs on direct pushes to master, dev-env, and test-env branches. Analyzes the target branch directly.

Cypress/Jest Tests
Tag Trigger: Runs when a Git tag named cypress is pushed, analyzing the current feature branch.
PR Trigger: Also runs on PRs opened, synchronized, or reopened to master, dev-env, or test-env only, analyzing the current feature branch.

  1. Deployment Process:
    Development Environment Deployment can be triggered in the following ways:
    By creating and merging a PR into the dev-env branch.
    Manually triggering the “OpenShift Deploy/Promotion to Dev” workflow from GitHub Actions.
    Using the Makefile command for quick, PR-free deployment.

Test Environment Deployment can only be triggered manually from the GitHub Actions tab by clicking the “Run workflow” button. This is required as test deployments depend on RFCs/approvals.

  1. ROS Report:
    Updated to reflect changes based on the revised query.
SELECT DISTINCT
    ross.participant_id AS "Participant ID",
    p.body->>'firstName' AS "First Name",
    p.body->>'lastName' AS "Last Name",
    p.body->>'program' AS "Pathway",
    TO_DATE(ross.data->>'date', 'YYYY-MM-DD') AS "ROS Start Date",
    CASE 
        WHEN EXTRACT(month FROM TO_DATE(ross.data->>'date', 'YYYY-MM-DD')) = 2 
         AND EXTRACT(day FROM TO_DATE(ross.data->>'date', 'YYYY-MM-DD')) = 29
        THEN TO_DATE(ross.data->>'date', 'YYYY-MM-DD') + INTERVAL '1 year' + INTERVAL '1 day'
        ELSE TO_DATE(ross.data->>'date', 'YYYY-MM-DD') + INTERVAL '1 year'
    END AS "ROS End Date",
    TO_DATE(COALESCE(ross.data->>'startDate', ross.data->>'date'), 'YYYY-MM-DD') AS "Start Date at a Site",
    COALESCE(ross.data->>'positionType', 'Unknown') AS "Position Type",
    COALESCE(ross.data->>'employmentType', 'Unknown') AS "Specific Position Type",
    es.body->>'siteName' AS "Site of ROS",
    es.body->>'healthAuthority' AS "Health Region",
    CASE 
        WHEN EXISTS (
            SELECT 1 
            FROM participants_status ps_sub
            WHERE ps_sub.participant_id = ross.participant_id
              AND ps_sub.status = 'archived'
              AND ps_sub.data->>'type' = 'rosComplete'
              AND ps_sub.data->>'confirmed' = 'true'
              AND ps_sub.current = true
        ) THEN 'TRUE'
        ELSE 'FALSE'
    END AS "Return of Service Completed",
    COALESCE(
        (
            SELECT ps_sub.data->>'remainingInSectorOrRoleOrAnother'
            FROM participants_status ps_sub
            WHERE ps_sub.participant_id = ross.participant_id
              AND ps_sub.status = 'archived'
              AND ps_sub.data->>'type' = 'rosComplete'
              AND ps_sub.data->>'confirmed' = 'true'
              AND ps_sub.current = true
            LIMIT 1
        ),
        'Unknown'
    ) AS "Intends to Continue as HCA/MHAW Following ROS Completion"
FROM
    return_of_service_status ross
LEFT JOIN participants p ON
    ross.participant_id = p.id
LEFT JOIN employer_sites es ON
    ross.site_id = es.id;
  1. Enabled KeyCloak login options on both dev and test environments to support internal and UAT testing with new test accounts

chloe-yuu added 30 commits May 15, 2025 16:33
* update the format/sonar/test workflow configurations

* update the deployment workflow file for dev-env
* update the format/sonar/test workflow configurations

* update the deployment workflow file for dev-env

* update test deployment workflow
* update the format/sonar/test workflow configurations

* update the deployment workflow file for dev-env

* update test deployment workflow

* remove the auto deployment feture on test-env
* update the format/sonar/test workflow configurations

* update the deployment workflow file for dev-env

* update test deployment workflow

* remove the auto deployment feture on test-env

* remove tags for dev&test deployments
* update the format/sonar/test workflow configurations

* update the deployment workflow file for dev-env

* update test deployment workflow

* remove the auto deployment feture on test-env

* remove tags for dev&test deployments

* update the deployment workflow file for dev&test
…test environments. (#1097)

* update the format/sonar/test workflow configurations

* update the format/sonar/test workflow configurations (#1094)

* update the deployment workflow file for dev-env

* update the deployment workflow file for dev-env (#1095)

* update the format/sonar/test workflow configurations

* update the deployment workflow file for dev-env

* update test deployment workflow

* update test deployment workflow (#1096)

* update the format/sonar/test workflow configurations

* update the deployment workflow file for dev-env

* update test deployment workflow

* remove the auto deployment feture on test-env

* Remove the auto deployment feature on test-env (#1098)

* update the format/sonar/test workflow configurations

* update the deployment workflow file for dev-env

* update test deployment workflow

* remove the auto deployment feture on test-env

* remove tags for dev&test deployments

* remove tags for dev&test deployments (#1099)

* update the format/sonar/test workflow configurations

* update the deployment workflow file for dev-env

* update test deployment workflow

* remove the auto deployment feture on test-env

* remove tags for dev&test deployments

* update the deployment workflow file for dev&test

* update the deployment workflow file for dev&test (#1100)

* update the format/sonar/test workflow configurations

* update the deployment workflow file for dev-env

* update test deployment workflow

* remove the auto deployment feture on test-env

* remove tags for dev&test deployments

* update the deployment workflow file for dev&test

* update README for deployment
* update the manual trigger on dev&test deployment files

* update format('{0}~1', github.sha) to 'HEAD^'
…orkflow files (#1104)

* update the format/sonar/test workflow configurations

* update the format/sonar/test workflow configurations (#1094)

* update the deployment workflow file for dev-env

* update the deployment workflow file for dev-env (#1095)

* update the format/sonar/test workflow configurations

* update the deployment workflow file for dev-env

* update test deployment workflow

* update test deployment workflow (#1096)

* update the format/sonar/test workflow configurations

* update the deployment workflow file for dev-env

* update test deployment workflow

* remove the auto deployment feture on test-env

* Remove the auto deployment feature on test-env (#1098)

* update the format/sonar/test workflow configurations

* update the deployment workflow file for dev-env

* update test deployment workflow

* remove the auto deployment feture on test-env

* remove tags for dev&test deployments

* remove tags for dev&test deployments (#1099)

* update the format/sonar/test workflow configurations

* update the deployment workflow file for dev-env

* update test deployment workflow

* remove the auto deployment feture on test-env

* remove tags for dev&test deployments

* update the deployment workflow file for dev&test

* update the deployment workflow file for dev&test (#1100)

* update the format/sonar/test workflow configurations

* update the deployment workflow file for dev-env

* update test deployment workflow

* remove the auto deployment feture on test-env

* remove tags for dev&test deployments

* update the deployment workflow file for dev&test

* update README for deployment

* update the manual trigger on dev&test deployment files

* update the manual trigger on dev&test deployment files (#1102)

* update format('{0}~1', github.sha) to 'HEAD^'

* update format('{0}~1', github.sha) to 'HEAD^'  (#1103)

* update the manual trigger on dev&test deployment files

* update format('{0}~1', github.sha) to 'HEAD^'

* add step to get previous commit

* fix the issue getting the previous commit info
npham49 and others added 7 commits June 13, 2025 09:24
…mapping (#1107)

* initial work on the script, adding the core script and the make commands accordingly

* updating git ignore and extraction path

* updating comments and adding dir generation function

* updating comments

* initial work on the script, adding the core script and the make commands accordingly

* updating git ignore and extraction path

* updating comments and adding dir generation function

* updating comments

* removing duplicate command from rebasing

* updating naming scheme to specifically target business_bceid
…mapping (#1107) (#1109)

* initial work on the script, adding the core script and the make commands accordingly

* updating git ignore and extraction path

* updating comments and adding dir generation function

* updating comments

* initial work on the script, adding the core script and the make commands accordingly

* updating git ignore and extraction path

* updating comments and adding dir generation function

* updating comments

* removing duplicate command from rebasing

* updating naming scheme to specifically target business_bceid
* update ROS report (#1108)

* remove duplicates on ROS report (#1110)
@sonarqubecloud
Copy link

Quality Gate Failed Quality Gate failed

Failed conditions
0.0% Coverage on New Code (required ≥ 80%)
14.7% Duplication on New Code (required ≤ 3%)

See analysis details on SonarQube Cloud

@chloe-yuu chloe-yuu changed the title Add separate branches (dev-env and test-env) for Dev and Test envrionments Add separate branches for Dev and Test environments and update ROS report query Jun 18, 2025
@chloe-yuu chloe-yuu changed the title Add separate branches for Dev and Test environments and update ROS report query Add dev-env&test-env branches; update ROS report query; add KeyCloak login option Jun 18, 2025
@chloe-yuu chloe-yuu merged commit 4bd472a into master Jun 18, 2025
26 of 29 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants