Merge branch 'develop' into ON-1148_Mendoza_Integration

Open-Earth-Foundation · Jan 17, 2024 · 75485d2 · 75485d2
2 parents 6f0b1cb + a30b0f7
commit 75485d2
Show file tree

Hide file tree

Showing 105 changed files with 132,962 additions and 1,772 deletions.
diff --git a/app/config/config.cjs b/app/config/config.cjs
@@ -7,20 +7,22 @@ module.exports = {
     database: process.env.DATABASE_NAME,
     host: process.env.DATABASE_HOST,
     dialect: "postgres",
-    logging: true,
+    logging: false,
   },
   test: {
     username: process.env.DATABASE_USER,
     password: process.env.DATABASE_PASSWORD || null,
     database: process.env.DATABASE_NAME,
     host: process.env.DATABASE_HOST,
     dialect: "postgres",
+    logging: false,
   },
   production: {
     username: process.env.DATABASE_USER,
     password: process.env.DATABASE_PASSWORD || null,
     database: process.env.DATABASE_NAME,
     host: process.env.DATABASE_HOST,
     dialect: "postgres",
+    logging: false,
   },
 };
diff --git a/app/cypress/support/commands.ts b/app/cypress/support/commands.ts
@@ -1,5 +1,7 @@
 // https://on.cypress.io/custom-commands
 
+import { logger } from '../../src/services/logger';
+
 Cypress.Commands.add("signup", (email, password) => {
   cy.request({
     method: "POST",
@@ -25,7 +27,7 @@ Cypress.Commands.add("login", (email, password) => {
       email,
       password,
     }).then((res) => {
-      console.log(res.body);
+      logger.debug(res.body);
     });
   });
 });

diff --git a/app/env.example b/app/env.example
@@ -12,3 +12,6 @@ SMTP_USER="user"
 SMTP_PASSWORD="password"
 SMTP_FROM_EMAIL="[email protected]"
 RESET_TOKEN_SECRET="WwjFGhcP8VikgsmtcPv+ufPhTGS8t7e+/aN5k2qY4ms="
+NEXT_PUBLIC_SUPPORT_EMAILS="[email protected],[email protected]"
+VERIFICATION_TOKEN_SECRET="80c70dfdeedf2c01757b880d39c79214e915c786dd48d5473c9c0aecf81d67cf"
+
diff --git a/app/migrations/20231206143948-SubSectorValue-unique.cjs b/app/migrations/20231206143948-SubSectorValue-unique.cjs
@@ -0,0 +1,30 @@
+"use strict";
+
+/** @type {import('sequelize-cli').Migration} */
+module.exports = {
+  async up(queryInterface) {
+    return queryInterface.sequelize.transaction(async (transaction) => {
+      await queryInterface.bulkDelete("SubSectorValue", {}, { transaction });
+      await queryInterface.addIndex(
+        "SubSectorValue",
+        ["inventory_id", "subsector_id"],
+        {
+          name: "ID_SubSectorValue_inventory_id_subsector_id",
+          indicesType: "UNIQUE",
+          unique: true,
+          transaction,
+        },
+      );
+    });
+  },
+
+  async down(queryInterface) {
+    return queryInterface.sequelize.transaction(async (transaction) => {
+      await queryInterface.removeIndex(
+        "SubSectorValue",
+        "ID_SubSectorValue_inventory_id_subsector_id",
+        { transaction },
+      );
+    });
+  },
+};