Merge pull request #1247 from AletheiaFact/stage

Production Release

.env.example

@@ -45,4 +45,7 @@ AWS_ENDPOINT=http://localhost:4566
 
 MONGO_MIGRATION_URL=
 
-OPENAI_API_KEY=
+OPENAI_API_KEY=
+
+ZENVIA_API_URL=
+ZENVIA_API_TOKEN=

.github/workflows/aws.yml

@@ -38,6 +38,8 @@ env:
   NEXT_PUBLIC_RECAPTCHA_SITEKEY: ${{ secrets.RECAPTCHA_SITEKEY }}
   AGENTS_API_URL: ${{ secrets.DEVELOPMENT_AGENTS_API_URL }}
   OPENAI_API_KEY: ${{ secrets.DEVELOPMENT_OPENAI_API_KEY }}
+  ZENVIA_API_URL: ${{ secrets.DEVELOPMENT_ZENVIA_API_URL }}
+  ZENVIA_API_TOKEN: ${{ secrets.DEVELOPMENT_ZENVIA_API_URL }}
 
 jobs:
   setup-build-publish:
@@ -71,6 +73,8 @@ jobs:
           echo "NEXT_PUBLIC_ORY_SDK_URL=${{ secrets.ORY_SDK_URL }}" >> $GITHUB_ENV
           echo "AGENTS_API_URL=${{ secrets.PRODUCTION_AGENTS_API_URL }}" >> $GITHUB_ENV
           echo "OPENAI_API_KEY=${{ secrets.PRODUCTION_OPENAI_API_KEY }}" >> $GITHUB_ENV
+          echo "ZENVIA_API_URL=${{ secrets.PRODUCTION_ZENVIA_API_URL }}" >> $GITHUB_ENV
+          echo "ZENVIA_API_TOKEN=${{ secrets.PRODUCTION_ZENVIA_API_TOKEN }}" >> $GITHUB_ENV
 
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v1
@@ -86,48 +90,50 @@ jobs:
       # Setting up config.yaml based on environment
       - name: Set config.yaml
         env:
-            RECAPTCHA_SECRET: ${{ secrets.RECAPTCHA_SECRETKEY }}
+          RECAPTCHA_SECRET: ${{ secrets.RECAPTCHA_SECRETKEY }}
         run: |
-            sed -i "s/ENV/$ENVIRONMENT/g" config.$ENVIRONMENT.yaml
-            sed -i "s%RECAPTCHA_SECRET%$RECAPTCHA_SECRET%g" config.$ENVIRONMENT.yaml
-            sed -i "s%MONGODB_URI%$MONGODB_URI%g" config.$ENVIRONMENT.yaml
-            sed -i "s%ORY_SDK_URL%$ORY_SDK_URL%g" config.$ENVIRONMENT.yaml
-            sed -i "s%GITLAB_FEATURE_FLAG_URL%$GITLAB_FEATURE_FLAG_URL%g" config.$ENVIRONMENT.yaml
-            sed -i "s%GITLAB_FEATURE_FLAG_INSTANCE_ID%$GITLAB_FEATURE_FLAG_INSTANCE_ID%g" config.$ENVIRONMENT.yaml
-            sed -i "s/ORY_ACCESS_TOKEN/$ORY_ACCESS_TOKEN/g" config.$ENVIRONMENT.yaml
-            sed -i "s/ALETHEIA_SCHEMA_ID/$ALETHEIA_SCHEMA_ID/g" config.$ENVIRONMENT.yaml
-            sed -i "s%AWS_SDK_BUCKET%$AWS_SDK_BUCKET%g" config.$ENVIRONMENT.yaml
-            sed -i "s%AWS_ACCESS_KEY_ID%$AWS_ACCESS_KEY_ID%g" config.$ENVIRONMENT.yaml
-            sed -i "s%AWS_SECRET_ACCESS_KEY%$AWS_SECRET_ACCESS_KEY%g" config.$ENVIRONMENT.yaml
-            sed -i "s%NOVU_API_KEY%$NOVU_API_KEY%g" config.$ENVIRONMENT.yaml
-            sed -i "s%NOVU_APPLICATION_IDENTIFIER%$NOVU_APPLICATION_IDENTIFIER%g" config.$ENVIRONMENT.yaml
-            sed -i "s%AGENTS_API_URL%$AGENTS_API_URL%g" config.$ENVIRONMENT.yaml
-            sed -i "s%OPENAI_API_KEY%$OPENAI_API_KEY%g" config.$ENVIRONMENT.yaml
+          sed -i "s/ENV/$ENVIRONMENT/g" config.$ENVIRONMENT.yaml
+          sed -i "s%RECAPTCHA_SECRET%$RECAPTCHA_SECRET%g" config.$ENVIRONMENT.yaml
+          sed -i "s%MONGODB_URI%$MONGODB_URI%g" config.$ENVIRONMENT.yaml
+          sed -i "s%ORY_SDK_URL%$ORY_SDK_URL%g" config.$ENVIRONMENT.yaml
+          sed -i "s%GITLAB_FEATURE_FLAG_URL%$GITLAB_FEATURE_FLAG_URL%g" config.$ENVIRONMENT.yaml
+          sed -i "s%GITLAB_FEATURE_FLAG_INSTANCE_ID%$GITLAB_FEATURE_FLAG_INSTANCE_ID%g" config.$ENVIRONMENT.yaml
+          sed -i "s/ORY_ACCESS_TOKEN/$ORY_ACCESS_TOKEN/g" config.$ENVIRONMENT.yaml
+          sed -i "s/ALETHEIA_SCHEMA_ID/$ALETHEIA_SCHEMA_ID/g" config.$ENVIRONMENT.yaml
+          sed -i "s%AWS_SDK_BUCKET%$AWS_SDK_BUCKET%g" config.$ENVIRONMENT.yaml
+          sed -i "s%AWS_ACCESS_KEY_ID%$AWS_ACCESS_KEY_ID%g" config.$ENVIRONMENT.yaml
+          sed -i "s%AWS_SECRET_ACCESS_KEY%$AWS_SECRET_ACCESS_KEY%g" config.$ENVIRONMENT.yaml
+          sed -i "s%NOVU_API_KEY%$NOVU_API_KEY%g" config.$ENVIRONMENT.yaml
+          sed -i "s%NOVU_APPLICATION_IDENTIFIER%$NOVU_APPLICATION_IDENTIFIER%g" config.$ENVIRONMENT.yaml
+          sed -i "s%AGENTS_API_URL%$AGENTS_API_URL%g" config.$ENVIRONMENT.yaml
+          sed -i "s%OPENAI_API_KEY%$OPENAI_API_KEY%g" config.$ENVIRONMENT.yaml
+          sed -i "s%ZENVIA_API_URL%$ZENVIA_API_URL%g" config.$ENVIRONMENT.yaml
+          sed -i "s%ZENVIA_API_TOKEN%$ZENVIA_API_TOKEN%g" config.$ENVIRONMENT.yaml
 
       - name: Set migrate-mongo-config.ts
         run: |
-            sed -i "s%MONGODB_URI%$MONGODB_URI%g" migrate-mongo-config-example.ts
-            sed -i "s%MONGODB_NAME%$MONGODB_NAME%g" migrate-mongo-config-example.ts
+          sed -i "s%MONGODB_URI%$MONGODB_URI%g" migrate-mongo-config-example.ts
+          sed -i "s%MONGODB_NAME%$MONGODB_NAME%g" migrate-mongo-config-example.ts
 
       # Setting user seed config
       - name: Set config.seed.example.yaml
         env:
-            SMTP_HOST: ${{ secrets.SMTP_HOST }}
-            SMTP_PORT: ${{ secrets.SMTP_PORT }}
-            SMTP_EMAIL_USER: ${{ secrets.SMTP_EMAIL_USER }}
-            SMTP_EMAIL_PASS: ${{ secrets.SMTP_EMAIL_PASS }}
-            TEST_USER_PASS: ${{ secrets.TEST_USER_PASS }}
+          SMTP_HOST: ${{ secrets.SMTP_HOST }}
+          SMTP_PORT: ${{ secrets.SMTP_PORT }}
+          SMTP_EMAIL_USER: ${{ secrets.SMTP_EMAIL_USER }}
+          SMTP_EMAIL_PASS: ${{ secrets.SMTP_EMAIL_PASS }}
+          TEST_USER_PASS: ${{ secrets.TEST_USER_PASS }}
 
         run: |
-            sed -i "s%SMTP_HOST%$SMTP_HOST%g" config.seed.example.yaml
-            sed -i "s%SMTP_PORT%$SMTP_PORT%g" config.seed.example.yaml
-            sed -i "s%SMTP_EMAIL_USER%$SMTP_EMAIL_USER%g" config.seed.example.yaml
-            sed -i "s%SMTP_EMAIL_PASS%$SMTP_EMAIL_PASS%g" config.seed.example.yaml
-            sed -i "s/TEST_USER_PASS/$TEST_USER_PASS/g" config.seed.example.yaml
-            sed -i "s%MONGODB_URI%$MONGODB_URI%g" config.seed.example.yaml
-            sed -i "s%ORY_SDK_URL%$ORY_SDK_URL%g" config.seed.example.yaml
-            sed -i "s/ORY_ACCESS_TOKEN/$ORY_ACCESS_TOKEN/g" config.seed.example.yaml
-            sed -i "s/ALETHEIA_SCHEMA_ID/$ALETHEIA_SCHEMA_ID/g" config.seed.example.yaml
+          sed -i "s%SMTP_HOST%$SMTP_HOST%g" config.seed.example.yaml
+          sed -i "s%SMTP_PORT%$SMTP_PORT%g" config.seed.example.yaml
+          sed -i "s%SMTP_EMAIL_USER%$SMTP_EMAIL_USER%g" config.seed.example.yaml
+          sed -i "s%SMTP_EMAIL_PASS%$SMTP_EMAIL_PASS%g" config.seed.example.yaml
+          sed -i "s/TEST_USER_PASS/$TEST_USER_PASS/g" config.seed.example.yaml
+          sed -i "s%MONGODB_URI%$MONGODB_URI%g" config.seed.example.yaml
+          sed -i "s%ORY_SDK_URL%$ORY_SDK_URL%g" config.seed.example.yaml
+          sed -i "s/ORY_ACCESS_TOKEN/$ORY_ACCESS_TOKEN/g" config.seed.example.yaml
+          sed -i "s/ALETHEIA_SCHEMA_ID/$ALETHEIA_SCHEMA_ID/g" config.seed.example.yaml
 
       # Build the Docker image
       - name: Build
@@ -174,6 +180,8 @@ jobs:
           echo "NOVU_API_KEY=${{ secrets.PRODUCTION_NOVU_API_KEY }}" >> $GITHUB_ENV
           echo "NOVU_APPLICATION_IDENTIFIER=${{ secrets.PRODUCTION_NOVU_APPLICATION_IDENTIFIER }}" >> $GITHUB_ENV
           echo "OPENAI_API_KEY=${{ secrets.PRODUCTION_OPENAI_API_KEY }}" >> $GITHUB_ENV
+          echo "ZENVIA_API_URL=${{ secrets.PRODUCTION_ZENVIA_API_URL }}" >> $GITHUB_ENV
+          echo "ZENVIA_API_TOKEN=${{ secrets.PRODUCTION_ZENVIA_API_TOKEN }}" >> $GITHUB_ENV
 
       - name: Set environment
         run: |
@@ -199,17 +207,17 @@ jobs:
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: 'us-east-1'
-          cluster-name: 'production'
+          aws-region: "us-east-1"
+          cluster-name: "production"
           command: kubectl apply -f ./deployment/
 
       - name: Validation
         uses: giovannirossini/[email protected]
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: 'us-east-1'
-          cluster-name: 'production'
+          aws-region: "us-east-1"
+          cluster-name: "production"
           command: kubectl rollout status deployments/aletheia -n ${{ env.ENVIRONMENT }} --timeout=360s
         if: success()
 
@@ -218,7 +226,7 @@ jobs:
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: 'us-east-1'
-          cluster-name: 'production'
+          aws-region: "us-east-1"
+          cluster-name: "production"
           command: kubectl rollout undo deployments/aletheia -n ${{ env.ENVIRONMENT }}
         if: failure()

.gitignore

@@ -3,6 +3,8 @@
 # dependencies
 /node_modules
 
+.yarn/install-state.gz
+
 # testing
 /coverage
 /cypress.env.json
@@ -65,4 +67,4 @@ data
 
 # Auto-generated documentation
 docs/compodoc/**/*
-docs/storybook/**/*
+docs/storybook/**/*

config.development.yaml

@@ -41,4 +41,7 @@ services:
         application_identifier: NOVU_APPLICATION_IDENTIFIER
       openai:
         api_key: OPENAI_API_KEY
+      zenvia:
+        api_url: ZENVIA_API_URL
+        api_token: ZENVIA_API_TOKEN
 

config.example.yaml

@@ -43,4 +43,7 @@ services:
         api_key: NOVU_API_KEY
       openai:
         api_key: OPENAI_API_KEY
+      zenvia:
+        api_url: ZENVIA_API_URL
+        api_token: ZENVIA_API_TOKEN
 

config.production.yaml

@@ -39,3 +39,6 @@ services:
         application_identifier: NOVU_APPLICATION_IDENTIFIER
       openai:
         api_key: OPENAI_API_KEY
+      zenvia:
+        api_url: ZENVIA_API_URL
+        api_token: ZENVIA_API_TOKEN

config.seed.example.yaml

@@ -37,3 +37,6 @@ services:
         api_key: NOVU_API_KEY
       openai:
         api_key: OPENAI_API_KEY
+      zenvia:
+        api_url: ZENVIA_API_URL
+        api_token: ZENVIA_API_TOKEN

config.seed.test.ci.yaml

@@ -36,3 +36,6 @@ services:
         instanceId: {env(GITLAB_FEATURE_FLAG_INSTANCE_ID)}
       openai:
         api_key: {env(OPENAI_API_KEY)}
+      zenvia:
+        api_url: {env(ZENVIA_API_URL)}
+        api_token: {env(ZENVIA_API_TOKEN)}

config.test.ci.yaml

@@ -35,3 +35,6 @@ services:
         secretAccessKey: {env(AWS_SECRET_ACCESS_KEY)}
       openai:
         api_key: {env(OPENAI_API_KEY)}
+      zenvia:
+        api_url: {env(ZENVIA_API_URL)}
+        api_token: {env(ZENVIA_API_TOKEN)}

cypress/e2e/tests/header.cy.ts

@@ -23,10 +23,16 @@ describe("Test the header menus", () => {
             cy.url().should("contains", "claim");
         });
 
-        it("Open side bar and click sources", () => {
+        it("Open side bar and click source", () => {
             cy.get(locators.menu.SIDE_MENU).click();
-            cy.get("[data-cy=testSourcestItem]").click();
-            cy.url().should("contains", "sources");
+            cy.get("[data-cy=testSourcetItem]").click();
+            cy.url().should("contains", "source");
+        });
+
+        it("Open side bar and click source", () => {
+            cy.get(locators.menu.SIDE_MENU).click();
+            cy.get("[data-cy=testVerificationRequestItem]").click();
+            cy.url().should("contains", "verification-request");
         });
 
         it("Open side bar and click about", () => {

cypress/e2e/tests/image.cy.ts

@@ -23,9 +23,9 @@ describe("Create image claim", () => {
 
         cy.get(locators.claim.INPUT_SOURCE)
             .should("be.visible")
-            .type(claim.source);
+            .type(claim.imageSource);
         cy.get(locators.claim.BTN_UPLOAD_IMAGE).should("be.visible");
-        cy.get('input[type="file"]').selectFile(claim.imageSource, {
+        cy.get('input[type="file"]').selectFile(claim.imageSourceFile, {
             force: true,
         });
         cy.get("[data-cy=testCheckboxAcceptTerms]").click();

cypress/e2e/tests/review.cy.ts

@@ -23,6 +23,31 @@ const goToClaimReviewPage = () => {
     cy.get(locators.claim.BTN_SEE_FULL_REVIEW).should("exist");
 };
 
+const assignUser = () => {
+    cy.get(locators.claimReview.BTN_START_CLAIM_REVIEW).should("exist").click();
+    cy.get(locators.claimReview.INPUT_USER)
+        .should("exist")
+        .type(review.username, { delay: 200 });
+    cy.get(".ant-select-item-option-active").click();
+    cy.get('[title="reCAPTCHA"]').should("exist");
+    cy.get(locators.claimReview.BTN_ASSIGN_USER).should("be.disabled");
+    cy.checkRecaptcha();
+    cy.get(locators.claimReview.BTN_ASSIGN_USER).should("be.enabled").click();
+    cy.get(locators.claimReview.INPUT_CLASSIFICATION).should("exist");
+};
+
+const blockAssignedUserReview = () => {
+    cy.checkRecaptcha();
+    cy.get(locators.claimReview.BTN_SELECTED_REVIEW).should("exist").click();
+    cy.get(locators.claimReview.INPUT_REVIEWER)
+        .should("exist")
+        .type(review.username, { delay: 200 });
+    cy.get(".ant-select-item-option-active").click();
+    cy.checkRecaptcha();
+    cy.get(locators.claimReview.BTN_SUBMIT).should("be.enabled").click();
+    cy.get(locators.claimReview.TEXT_REVIEWER_ERROR).should("exist");
+};
+
 describe("Test claim review", () => {
     it("should not show start review when not logged in", () => {
         cy.visit(
@@ -36,25 +61,12 @@ describe("Test claim review", () => {
     it("should be able to assign a user", () => {
         cy.login();
         goToClaimReviewPage();
-        cy.get(locators.claimReview.BTN_START_CLAIM_REVIEW)
-            .should("exist")
-            .click();
-        cy.get(locators.claimReview.INPUT_USER)
-            .should("exist")
-            .type(review.username, { delay: 200 });
-        cy.get(".ant-select-item-option-active").click();
-        cy.get('[title="reCAPTCHA"]').should("exist");
-        cy.get(locators.claimReview.BTN_ASSIGN_USER).should("be.disabled");
-        cy.checkRecaptcha();
-        cy.get(locators.claimReview.BTN_ASSIGN_USER)
-            .should("be.enabled")
-            .click();
-        cy.get(locators.claimReview.INPUT_CLASSIFICATION).should("exist");
+        assignUser();
     });
 
     it("should be able to submit full review fields", () => {
         cy.login();
-        cy.intercept("GET", "/api/claimreviewtask/editor-content/*", (req) => {
+        cy.intercept("GET", "/api/reviewtask/editor-content/*", (req) => {
             req.reply({
                 statusCode: 200,
                 body: review.editorContent,
@@ -102,16 +114,6 @@ describe("Test claim review", () => {
     it("should not be able submit after choosing assigned user as reviewer", () => {
         cy.login();
         goToClaimReviewPage();
-        cy.checkRecaptcha();
-        cy.get(locators.claimReview.BTN_SELECTED_REVIEW)
-            .should("exist")
-            .click();
-        cy.get(locators.claimReview.INPUT_REVIEWER)
-            .should("exist")
-            .type(review.username, { delay: 200 });
-        cy.get(".ant-select-item-option-active").click();
-        cy.checkRecaptcha();
-        cy.get(locators.claimReview.BTN_SUBMIT).should("be.enabled").click();
-        cy.get(locators.claimReview.TEXT_REVIEWER_ERROR).should("exist");
+        blockAssignedUserReview();
     });
 });