Merge branch 'develop' into multiline_notes

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

cypress/e2e/facility_spec/facility_manage.cy.ts

@@ -0,0 +1,104 @@
+import { cy, describe, before, beforeEach, it, afterEach } from "local-cypress";
+import LoginPage from "../../pageobject/Login/LoginPage";
+import FacilityManage from "../../pageobject/Facility/FacilityManage";
+import FacilityPage from "../../pageobject/Facility/FacilityCreation";
+import { v4 as uuidv4 } from "uuid";
+
+describe("Facility Manage Functions", () => {
+  const loginPage = new LoginPage();
+  const facilityManage = new FacilityManage();
+  const facilityPage = new FacilityPage();
+  const facilityMiddlewareUpdateButton = "Update";
+  const facilityMiddleware = "dev-middleware.coronasafe.live";
+  const facilityUpdatedMiddleware = "updated.coronasafe.live";
+  const facilityMiddlewareSuccessfullNotification =
+    "Facility updated successfully";
+  const facilityHrfidUpdateButton = "Link Health Facility";
+  const facilityHrfidSuccessfullNotification =
+    "Health Facility config updated successfully";
+  const facilityHrfId = uuidv4();
+  const facilityUpdatedHrfId = uuidv4();
+
+  before(() => {
+    loginPage.loginAsDisctrictAdmin();
+    cy.saveLocalStorage();
+  });
+
+  beforeEach(() => {
+    cy.viewport(1280, 720);
+    cy.restoreLocalStorage();
+    cy.clearLocalStorage(/filters--.+/);
+    cy.awaitUrl("/");
+    facilityPage.visitAlreadyCreatedFacility();
+  });
+
+  it("Facility Cover Image button functionality", () => {
+    // It's only button functionality because we can't access S3 bucket in local
+    facilityManage.clickCoverImage();
+    facilityManage.verifyUploadButtonVisible();
+    facilityManage.uploadCoverImage("facilitycoverimage.jpg");
+    facilityManage.clickSaveCoverImage();
+  });
+
+  it("Configure Facility Middleware", () => {
+    facilityPage.clickManageFacilityDropdown();
+    facilityManage.clickFacilityConfigureButton();
+    facilityManage.verifyMiddlewareAddressVisible();
+    // verify mandatory field error message
+    facilityManage.clickButtonWithText(facilityMiddlewareUpdateButton);
+    facilityManage.checkErrorMessageVisibility(
+      "Middleware Address is required"
+    );
+    // add middleware and verify the notification
+    facilityManage.typeMiddlewareAddress(facilityMiddleware);
+    facilityManage.clickButtonWithText(facilityMiddlewareUpdateButton);
+    facilityManage.verifySuccessMessageVisibilityAndContent(
+      facilityMiddlewareSuccessfullNotification
+    );
+    // update the existing middleware
+    facilityPage.clickManageFacilityDropdown();
+    facilityManage.clickFacilityConfigureButton();
+    facilityManage.verifyMiddlewareAddressVisible();
+    facilityManage.typeMiddlewareAddress(facilityUpdatedMiddleware);
+    facilityManage.clickButtonWithText(facilityMiddlewareUpdateButton);
+    facilityManage.verifySuccessMessageVisibilityAndContent(
+      facilityMiddlewareSuccessfullNotification
+    );
+    // verify the updated middleware
+    facilityPage.clickManageFacilityDropdown();
+    facilityManage.clickFacilityConfigureButton();
+    facilityManage.verifyMiddlewareAddressValue(facilityUpdatedMiddleware);
+  });
+
+  it("Configure Facility Health ID", () => {
+    facilityPage.clickManageFacilityDropdown();
+    facilityManage.clickFacilityConfigureButton();
+    // verify mandatory field error message
+    facilityManage.clickButtonWithText(facilityHrfidUpdateButton);
+    facilityManage.checkErrorMessageVisibility(
+      "Health Facility Id is required"
+    );
+    // add facility health ID and verify notification
+    facilityManage.typeHrfId(facilityHrfId);
+    facilityManage.clickButtonWithText(facilityHrfidUpdateButton);
+    facilityManage.verifySuccessMessageVisibilityAndContent(
+      facilityHrfidSuccessfullNotification
+    );
+    // update the existing middleware
+    facilityPage.clickManageFacilityDropdown();
+    facilityManage.clickFacilityConfigureButton();
+    facilityManage.typeHrfId(facilityUpdatedHrfId);
+    facilityManage.clickButtonWithText(facilityHrfidUpdateButton);
+    facilityManage.verifySuccessMessageVisibilityAndContent(
+      facilityHrfidSuccessfullNotification
+    );
+    // verify its reflection
+    facilityPage.clickManageFacilityDropdown();
+    facilityManage.clickFacilityConfigureButton();
+    facilityManage.verifyHrfIdValue(facilityUpdatedHrfId);
+  });
+
+  afterEach(() => {
+    cy.saveLocalStorage();
+  });
+});

cypress/e2e/facility_spec/locations.cy.ts

@@ -50,13 +50,9 @@ describe("Location Management Section", () => {
     cy.restoreLocalStorage();
     cy.clearLocalStorage(/filters--.+/);
     cy.awaitUrl("/");
-    cy.intercept("GET", "**/api/v1/facility/**").as("getFacilities");
-    cy.get("[id='facility-details']").first().click();
-    cy.wait("@getFacilities").its("response.statusCode").should("eq", 200);
-    cy.get("h1.text-3xl.font-bold", { timeout: 10000 }).should("be.visible");
-    cy.get("#manage-facility-dropdown button").should("be.visible");
-    cy.get("[id='manage-facility-dropdown']").scrollIntoView().click();
-    cy.get("[id=location-management]").click();
+    facilityPage.visitAlreadyCreatedFacility();
+    facilityPage.clickManageFacilityDropdown();
+    facilityLocation.clickFacilityLocationManagement();
   });
 
   it("Add a Bed to facility location along with duplication and deleting a bed", () => {

cypress/e2e/users_spec/user_profile.cy.ts

@@ -0,0 +1,85 @@
+import { cy, describe, before, beforeEach, it, afterEach } from "local-cypress";
+import LoginPage from "../../pageobject/Login/LoginPage";
+import UserProfilePage from "../../pageobject/Users/UserProfilePage";
+import ManageUserPage from "../../pageobject/Users/ManageUserPage";
+
+describe("Manage User Profile", () => {
+  const loginPage = new LoginPage();
+  const userProfilePage = new UserProfilePage();
+  const manageUserPage = new ManageUserPage();
+
+  const age = "30";
+  const gender = "Male";
+  const email = "[email protected]";
+  const phone = "+918899887788";
+  const workinghours = "8";
+  const doctorQualification = "MBBS";
+  const doctorYoE = "10";
+  const medicalCouncilRegistration = "1234567890";
+
+  const facilitySearch = "Dummy Facility 1";
+
+  before(() => {
+    loginPage.loginAsDevDoctor();
+    cy.saveLocalStorage();
+  });
+
+  beforeEach(() => {
+    cy.restoreLocalStorage();
+    console.log(localStorage);
+    cy.clearLocalStorage(/filters--.+/);
+    console.log(localStorage);
+    cy.awaitUrl("/user/profile");
+  });
+
+  it("Set Age, Gender, Email, Phone and Working Hours for a user and verify its reflection in user profile", () => {
+    userProfilePage.clickEditProfileButton();
+
+    userProfilePage.typeAge(age);
+    userProfilePage.selectGender(gender);
+    userProfilePage.typeEmail(email);
+    userProfilePage.typePhone(phone);
+    userProfilePage.typeWhatsApp(phone);
+    userProfilePage.typeWorkingHours(workinghours);
+    userProfilePage.typeDoctorQualification(doctorQualification);
+    userProfilePage.typeDoctorYoE(doctorYoE);
+    userProfilePage.typeMedicalCouncilRegistration(medicalCouncilRegistration);
+
+    userProfilePage.clickUpdateButton();
+
+    cy.verifyNotification("Details updated successfully");
+
+    userProfilePage.assertAge(age);
+    userProfilePage.assertGender(gender);
+    userProfilePage.assertEmail(email);
+    userProfilePage.assertPhone(phone);
+    userProfilePage.assertWhatsApp(phone);
+    userProfilePage.assertWorkingHours(workinghours);
+  });
+
+  it("Adding video connect link for a user and verify its reflection in user profile and doctor connect", () => {
+    // verify the user doesn't have any video connect link
+    userProfilePage.assertVideoConnectLink("-");
+    //  Link a new video connect link and ensure it is under video connect link
+    userProfilePage.clickEditProfileButton();
+    userProfilePage.typeVideoConnectLink("https://www.example.com");
+    userProfilePage.clickUpdateButton();
+    userProfilePage.assertVideoConnectLink("https://www.example.com");
+    // Edit the video connect link and ensure it is updated
+    userProfilePage.clickEditProfileButton();
+    userProfilePage.typeVideoConnectLink("https://www.test.com");
+    userProfilePage.clickUpdateButton();
+    userProfilePage.assertVideoConnectLink("https://www.test.com");
+    //  Go to particular facility doctor connect and verify the video connect link is present
+    manageUserPage.navigateToFacility();
+    manageUserPage.typeFacilitySearch(facilitySearch);
+    manageUserPage.assertFacilityInCard(facilitySearch);
+    manageUserPage.clickFacilityPatients();
+    manageUserPage.clickDoctorConnectButton();
+    manageUserPage.assertVideoConnectLink("Dev Doctor", "https://www.test.com");
+  });
+
+  afterEach(() => {
+    cy.saveLocalStorage();
+  });
+});

cypress/pageobject/Facility/FacilityCreation.ts

@@ -321,6 +321,7 @@ class FacilityPage {
     cy.intercept("GET", "**/api/v1/facility/**").as("getFacilities");
     cy.get("[id='facility-details']").first().click();
     cy.wait("@getFacilities").its("response.statusCode").should("eq", 200);
+    cy.get("h1.text-3xl.font-bold", { timeout: 10000 }).should("be.visible");
   }
 
   verifyFacilityBadgeContent(expectedText: string) {

cypress/pageobject/Facility/FacilityLocation.ts

@@ -3,6 +3,10 @@ class FacilityLocation {
     cy.get("#add-new-location").click();
   }
 
+  clickFacilityLocationManagement() {
+    cy.get("[id=location-management]").click();
+  }
+
   clickEditLocationButton() {
     cy.get("#edit-location-button").click();
   }

cypress/pageobject/Facility/FacilityManage.ts

@@ -0,0 +1,58 @@
+class FacilityManage {
+  clickCoverImage() {
+    cy.get("#facility-coverimage").click({ force: true });
+  }
+
+  verifyUploadButtonVisible() {
+    cy.get("#upload-cover-image").should("be.visible");
+  }
+
+  uploadCoverImage(fileName) {
+    cy.get("#upload-cover-image")
+      .selectFile(`cypress/fixtures/${fileName}`, { force: true })
+      .wait(100); // Adjust the wait time as needed
+  }
+
+  clickSaveCoverImage() {
+    cy.get("#save-cover-image").scrollIntoView();
+    cy.get("#save-cover-image").click();
+  }
+
+  clickFacilityConfigureButton() {
+    cy.get("#configure-facility").should("be.visible");
+    cy.get("#configure-facility").click();
+  }
+
+  verifyMiddlewareAddressVisible() {
+    cy.get("#middleware_address").should("be.visible");
+  }
+
+  clickButtonWithText(text) {
+    cy.get("button#submit").contains(text).click();
+  }
+
+  checkErrorMessageVisibility(text) {
+    cy.get(".error-text").contains(text).should("be.visible");
+  }
+
+  typeMiddlewareAddress(address) {
+    cy.get("#middleware_address").click().clear().click().type(address);
+  }
+
+  typeHrfId(address) {
+    cy.get("#hf_id").click().clear().click().type(address);
+  }
+
+  verifySuccessMessageVisibilityAndContent(text) {
+    cy.get(".pnotify-text").should("be.visible").and("contain", text);
+  }
+
+  verifyMiddlewareAddressValue(expectedValue) {
+    cy.get("#middleware_address").should("have.value", expectedValue);
+  }
+
+  verifyHrfIdValue(expectedValue) {
+    cy.get("#hf_id").should("have.value", expectedValue);
+  }
+}
+export default FacilityManage;

cypress/pageobject/Login/LoginPage.ts

@@ -6,6 +6,10 @@ class LoginPage {
     cy.loginByApi("devdistrictadmin", "Coronasafe@123");
   }
 
+  loginAsDevDoctor(): void {
+    cy.loginByApi("devdoctor", "Coronasafe@123");
+  }
+
   login(username: string, password: string): void {
     cy.loginByApi(username, password);
   }

cypress/pageobject/Users/ManageUserPage.ts

@@ -149,6 +149,18 @@ export class ManageUserPage {
     cy.get("#doctor-connect-home-doctor").should("contain.text", realName);
     cy.get("#doctor-connect-remote-doctor").should("contain.text", realName);
   }
+
+  assertVideoConnectLink(docName: string, link: string) {
+    cy.get("ul#options")
+      .find("li")
+      .contains(docName)
+      .within(() => {
+        cy.get("a").should(($a) => {
+          const hrefs = $a.map((i, el) => Cypress.$(el).attr("href")).get();
+          expect(hrefs).to.include(link);
+        });
+      });
+  }
 }
 
 export default ManageUserPage;