merge develop

ohcnetwork · Jan 15, 2024 · 69689b8 · 69689b8
2 parents f222760 + 51b02c2
commit 69689b8
Show file tree

Hide file tree

Showing 114 changed files with 2,461 additions and 2,649 deletions.
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -188,9 +188,6 @@ jobs:
     needs: build-staging
     name: Deploy to staging GCP cluster
     runs-on: ubuntu-latest
-    - uses: actions/setup-node@v3
-      with:
-        node-version: '20'
     environment:
       name: Staging-GCP
       url: https://care-staging.ohc.network/
@@ -202,15 +199,19 @@ jobs:
           token: ${{ secrets.GIT_ACCESS_TOKEN }}
           path: kube
           ref: main
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '20'
 
       # Setup gcloud CLI
-      - uses: google-github-actions/setup-gcloud@v2
+      - uses: google-github-actions/setup-gcloud@94337306dda8180d967a56932ceb4ddcf01edae7
         with:
           service_account_key: ${{ secrets.GKE_SA_KEY }}
           project_id: ${{ secrets.GKE_PROJECT }}
 
       # Get the GKE credentials so we can deploy to the cluster
-      - uses: google-github-actions/get-gke-credentials@v2
+      - uses: google-github-actions/get-gke-credentials@fb08709ba27618c31c09e014e1d8364b02e5042e
         with:
           cluster_name: ${{ secrets.GKE_CLUSTER }}
           location: ${{ secrets.GKE_ZONE }}
@@ -233,9 +234,6 @@ jobs:
     needs: build-production
     name: Deploy to GKE Manipur
     runs-on: ubuntu-latest
-    - uses: actions/setup-node@v3
-      with:
-        node-version: '20'
     environment:
       name: Production-Manipur
       url: https://care.mn.gov.in
@@ -248,14 +246,18 @@ jobs:
           path: kube
           ref: main
 
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '20'
+
       # Setup gcloud CLI
-      - uses: google-github-actions/setup-gcloud@v2
+      - uses: google-github-actions/setup-gcloud@94337306dda8180d967a56932ceb4ddcf01edae7
         with:
           service_account_key: ${{ secrets.GKE_SA_KEY }}
           project_id: ${{ secrets.GKE_PROJECT }}
 
       # Get the GKE credentials so we can deploy to the cluster
-      - uses: google-github-actions/get-gke-credentials@v2
+      - uses: google-github-actions/get-gke-credentials@fb08709ba27618c31c09e014e1d8364b02e5042e
         with:
           cluster_name: ${{ secrets.GKE_CLUSTER }}
           location: ${{ secrets.GKE_ZONE }}
@@ -278,9 +280,6 @@ jobs:
     needs: build-production
     name: Deploy to GKE Karnataka
     runs-on: ubuntu-latest
-    - uses: actions/setup-node@v3
-      with:
-        node-version: '20'
     environment:
       name: Production-Karnataka
       url: https://karnataka.care
@@ -293,14 +292,18 @@ jobs:
           path: kube
           ref: main
 
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '20'
+
       # Setup gcloud CLI
-      - uses: google-github-actions/setup-gcloud@v2
+      - uses: google-github-actions/setup-gcloud@94337306dda8180d967a56932ceb4ddcf01edae7
         with:
           service_account_key: ${{ secrets.GKE_SA_KEY }}
           project_id: ${{ secrets.GKE_PROJECT }}
 
       # Get the GKE credentials so we can deploy to the cluster
-      - uses: google-github-actions/get-gke-credentials@v2
+      - uses: google-github-actions/get-gke-credentials@fb08709ba27618c31c09e014e1d8364b02e5042e
         with:
           cluster_name: ${{ secrets.GKE_CLUSTER }}
           location: ${{ secrets.GKE_ZONE }}
@@ -323,9 +326,6 @@ jobs:
     needs: build-production
     name: Deploy to GKE Sikkim
     runs-on: ubuntu-latest
-    - uses: actions/setup-node@v3
-      with:
-        node-version: '20'
     environment:
       name: Production-Sikkim
       url: https://care.sikkim.gov.in
@@ -338,14 +338,18 @@ jobs:
           path: kube
           ref: main
 
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '20'
+
       # Setup gcloud CLI
-      - uses: google-github-actions/setup-gcloud@v2
+      - uses: google-github-actions/setup-gcloud@94337306dda8180d967a56932ceb4ddcf01edae7
         with:
           service_account_key: ${{ secrets.GKE_SA_KEY }}
           project_id: ${{ secrets.GKE_PROJECT }}
 
       # Get the GKE credentials so we can deploy to the cluster
-      - uses: google-github-actions/get-gke-credentials@v2
+      - uses: google-github-actions/get-gke-credentials@fb08709ba27618c31c09e014e1d8364b02e5042e
         with:
           cluster_name: ${{ secrets.GKE_CLUSTER }}
           location: ${{ secrets.GKE_ZONE }}
@@ -368,9 +372,6 @@ jobs:
     needs: build-production
     name: Deploy to GKE Assam
     runs-on: ubuntu-latest
-    - uses: actions/setup-node@v3
-      with:
-        node-version: '20'
     environment:
       name: Production-Assam
       url: https://care.assam.gov.in
@@ -383,14 +384,18 @@ jobs:
           path: kube
           ref: main
 
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '20'
+
       # Setup gcloud CLI
-      - uses: google-github-actions/setup-gcloud@v2
+      - uses: google-github-actions/setup-gcloud@94337306dda8180d967a56932ceb4ddcf01edae7
         with:
           service_account_key: ${{ secrets.GKE_SA_KEY }}
           project_id: ${{ secrets.GKE_PROJECT }}
 
       # Get the GKE credentials so we can deploy to the cluster
-      - uses: google-github-actions/get-gke-credentials@v2
+      - uses: google-github-actions/get-gke-credentials@fb08709ba27618c31c09e014e1d8364b02e5042e
         with:
           cluster_name: ${{ secrets.GKE_CLUSTER }}
           location: ${{ secrets.GKE_ZONE }}
@@ -413,9 +418,6 @@ jobs:
     needs: build-production
     name: Deploy to GKE Nagaland
     runs-on: ubuntu-latest
-    - uses: actions/setup-node@v3
-      with:
-        node-version: '20'
     environment:
       name: Production - Nagaland
       url: https://care.nagaland.gov.in
@@ -427,15 +429,19 @@ jobs:
           token: ${{ secrets.GIT_ACCESS_TOKEN  }}
           path: kube
           ref: main
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '20'
 
       # Setup gcloud CLI
-      - uses: google-github-actions/setup-gcloud@v2
+      - uses: google-github-actions/setup-gcloud@94337306dda8180d967a56932ceb4ddcf01edae7
         with:
           service_account_key: ${{ secrets.GKE_SA_KEY }}
           project_id: ${{ secrets.GKE_PROJECT }}
 
       # Get the GKE credentials, so we can deploy to the cluster
-      - uses: google-github-actions/get-gke-credentials@v2
+      - uses: google-github-actions/get-gke-credentials@fb08709ba27618c31c09e014e1d8364b02e5042e
         with:
           cluster_name: ${{ secrets.GKE_CLUSTER }}
           location: ${{ secrets.GKE_ZONE }}
@@ -458,9 +464,6 @@ jobs:
     needs: build-production
     name: Deploy to GKE Meghalaya
     runs-on: ubuntu-latest
-    - uses: actions/setup-node@v3
-      with:
-        node-version: '20'
     environment:
       name: Production-Meghalaya
       url: https://care.meghealth.gov.in
@@ -472,15 +475,19 @@ jobs:
           token: ${{ secrets.GIT_ACCESS_TOKEN }}
           path: kube
           ref: main
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '20'
 
       # Setup gcloud CLI
-      - uses: google-github-actions/setup-gcloud@v2
+      - uses: google-github-actions/setup-gcloud@94337306dda8180d967a56932ceb4ddcf01edae7
         with:
           service_account_key: ${{ secrets.GKE_SA_KEY }}
           project_id: ${{ secrets.GKE_PROJECT }}
 
       # Get the GKE credentials, so we can deploy to the cluster
-      - uses: google-github-actions/get-gke-credentials@v2
+      - uses: google-github-actions/get-gke-credentials@fb08709ba27618c31c09e014e1d8364b02e5042e
         with:
           cluster_name: ${{ secrets.GKE_CLUSTER }}
           location: ${{ secrets.GKE_ZONE }}

diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ Authenticate to staging API with any of the following credentials
 
 - username: staffdev
   password: Coronasafe@123
-  role: Staff
+  role: Nurse
 
 - username: doctordev
   password: Coronasafe@123

diff --git a/cypress/e2e/facility_spec/facility_creation.cy.ts b/cypress/e2e/facility_spec/facility_creation.cy.ts
@@ -221,7 +221,6 @@ describe("Facility Creation", () => {
       .should("be.visible");
     // verify the facility homepage
     cy.visit("/facility");
-    cy.get("#removeicon").click();
     manageUserPage.typeFacilitySearch(facilityName);
     facilityPage.verifyFacilityBadgeContent(facilityName);
     manageUserPage.assertFacilityInCard(facilityName);

diff --git a/cypress/e2e/facility_spec/facility_homepage.cy.ts b/cypress/e2e/facility_spec/facility_homepage.cy.ts
@@ -5,20 +5,23 @@ import FacilityHome from "../../pageobject/Facility/FacilityHome";
 import ManageUserPage from "../../pageobject/Users/ManageUserPage";
 import FacilityPage from "../../pageobject/Facility/FacilityCreation";
 import { UserPage } from "../../pageobject/Users/UserSearch";
+import { AssetPagination } from "../../pageobject/Asset/AssetPagination";
 
 describe("Facility Homepage Function", () => {
   const loginPage = new LoginPage();
   const facilityHome = new FacilityHome();
   const facilityPage = new FacilityPage();
   const manageUserPage = new ManageUserPage();
   const userPage = new UserPage();
+  const assetPagination = new AssetPagination();
   const facilitiesAlias = "downloadFacilitiesCSV";
   const capacitiesAlias = "downloadCapacitiesCSV";
   const doctorsAlias = "downloadDoctorsCSV";
   const triagesAlias = "downloadTriagesCSV";
   const facilityname = "Dummy Facility 1";
   const statename = "Kerala";
   const district = "Ernakulam";
+  const localbody = "Aikaranad";
   const facilitytype = "Private Hospital";
 
   before(() => {
@@ -31,24 +34,52 @@ describe("Facility Homepage Function", () => {
     cy.awaitUrl("/facility");
   });
 
+  it("Verify the Facility card button redirection", () => {
+    // view cns button
+    facilityHome.clickViewCnsButton();
+    facilityHome.verifyCnsUrl();
+    facilityHome.navigateBack();
+    // view notify button
+    facilityHome.clickFacilityNotifyButton();
+    facilityHome.verifyAndCloseNotifyModal();
+    // view facility button
+    facilityHome.clickViewFacilityDetails();
+    facilityPage.getFacilityName().should("be.visible");
+    facilityHome.verifyFacilityDetailsUrl();
+    facilityHome.navigateBack();
+    // view patient button
+    manageUserPage.clickFacilityPatients();
+    facilityHome.verifyPatientListVisibility();
+    facilityHome.verifyPatientListUrl();
+    facilityHome.navigateBack();
+    // occupancy badge
+    facilityHome.verifyOccupancyBadgeVisibility();
+  });
+
   it("Verify the functionality of advance filter", () => {
     userPage.clickAdvancedFilters();
     facilityPage.selectState(statename);
     facilityPage.selectDistrict(district);
-    // facilityPage.selectLocalBody("Anthikad Grama"); current dummy data have issue in local body
+    facilityPage.selectLocalBody(localbody);
     facilityPage.clickUpdateFacilityType(facilitytype);
     userPage.applyFilter();
     facilityPage.verifyStateBadgeContent(statename);
     facilityPage.verifyDistrictBadgeContent(district);
+    facilityPage.verifyLocalBodyBadgeContent(localbody);
     facilityPage.verifyFacilityTypeBadgeContent(facilitytype);
     manageUserPage.assertFacilityInCard(facilityname);
     userPage.clearFilters();
     userPage.verifyDataTestIdNotVisible("State");
     userPage.verifyDataTestIdNotVisible("District");
     userPage.verifyDataTestIdNotVisible("Facility type");
+    userPage.verifyDataTestIdNotVisible("Local Body");
   });
 
-  it("Search a facility in homepage", () => {
+  it("Search a facility in homepage and pagination", () => {
+    // pagination of the facility page
+    assetPagination.navigateToNextPage();
+    assetPagination.navigateToPreviousPage();
+    // search for a facility
     manageUserPage.typeFacilitySearch(facilityname);
     facilityPage.verifyFacilityBadgeContent(facilityname);
     manageUserPage.assertFacilityInCard(facilityname);

diff --git a/cypress/e2e/facility_spec/inventory.cy.ts b/cypress/e2e/facility_spec/inventory.cy.ts
@@ -1,10 +1,12 @@
 import { cy, describe, before, beforeEach, it, afterEach } from "local-cypress";
 import FacilityPage from "../../pageobject/Facility/FacilityCreation";
 import LoginPage from "../../pageobject/Login/LoginPage";
+import FacilityHome from "../../pageobject/Facility/FacilityHome";
 
 describe("Inventory Management Section", () => {
   const facilityPage = new FacilityPage();
   const loginPage = new LoginPage();
+  const facilityHome = new FacilityHome();
 
   before(() => {
     loginPage.loginAsDisctrictAdmin();
@@ -16,18 +18,64 @@ describe("Inventory Management Section", () => {
     cy.clearLocalStorage(/filters--.+/);
     cy.awaitUrl("/");
     cy.viewport(1280, 720);
-  });
-
-  it("Adds Inventory", () => {
     facilityPage.visitAlreadyCreatedFacility();
     facilityPage.clickManageFacilityDropdown();
     facilityPage.clickInventoryManagementOption();
+  });
+
+  it("Add New Inventory | Modify data and delete last entry ", () => {
+    // add a new item
     facilityPage.clickManageInventory();
-    facilityPage.fillInventoryDetails("Liquid Oxygen", "Add Stock", "120");
+    facilityPage.fillInventoryDetails("PPE", "Add Stock", "10");
     facilityPage.clickAddInventory();
     facilityPage.verifySuccessNotification("Inventory created successfully");
+    facilityPage.clickManageInventory();
+    // modify the new item
+    facilityPage.fillInventoryDetails("PPE", "Use Stock", "5");
+    facilityPage.clickAddInventory();
+    facilityPage.verifySuccessNotification("Inventory created successfully");
+    // verify the new modification
+    facilityPage.verifyPpeQuantity("PPE");
+    facilityPage.verifyPpeQuantity("5");
+    // delete the last Entry
+    facilityPage.clickPpeQuantity();
+    facilityPage.clickLastEntry();
+    // verify the last entry deletion
+    facilityPage.verifyStockInRow("#row-0", "Added Stock");
+    facilityPage.verifyStockInRow("#row-1", "Used Stock");
+    cy.wait(3000);
+    facilityHome.navigateBack();
+    facilityPage.verifyPpeQuantity("PPE");
   });
 
+  it("Add New Inventory | Verify Backend and manual Minimum", () => {
+    // Add Inventory
+    facilityPage.clickManageInventory();
+    facilityPage.fillInventoryDetails("PPE", "Add Stock", "5");
+    facilityPage.clickAddInventory();
+    facilityPage.verifySuccessNotification("Inventory created successfully");
+    // Verify Backend minimum badge
+    facilityPage.verifyBadgeWithText(".badge-danger", "Low Stock");
+    // modify with manual minimum badge
+    facilityPage.clickAddMinimumQuanitity();
+    cy.wait(3000);
+    cy.get("body").then(($body) => {
+      if ($body.find("#update-minimum-quantity").is(":visible")) {
+        // If the 'update-minimum-quantity' element is visible, click it
+        facilityPage.clickUpdateMinimumQuantity();
+        facilityPage.setQuantity("5");
+        facilityPage.clickSaveUpdateMinimumQuantity();
+      } else {
+        // Otherwise, click the 'set-minimum-quantity' element
+        facilityPage.clickSetMinimumQuantity();
+        facilityPage.fillInventoryMinimumDetails("PPE", "1");
+        facilityPage.clickSetButton();
+        facilityPage.verifySuccessNotification(
+          "Minimum quantiy updated successfully"
+        );
+      }
+    });
+  });
   afterEach(() => {
     cy.saveLocalStorage();
   });