Final fixes

Author: Riron

back/integration-tests/db-deploy/db_model.dump

@@ -64,6 +64,7 @@
     "passport-local": "^1.0.0",
     "passport-oauth2-client-password": "^0.1.2",
     "pdf-lib": "^1.12.0",
+    "postgres-migrations": "^5.1.0",
     "rate-limit-redis": "^2.0.0",
     "request": "^2.88.2",
     "winston": "^3.2.1",

back/package-lock.json

@@ -6,7 +6,7 @@ const dbConfig = {
   user: process.env.POSTGRES_USER,
   password: process.env.POSTGRES_PASSWORD,
   host: process.env.POSTGRES_HOST,
-  port: process.env.POSTGRES_PORT
+  port: parseInt(process.env.POSTGRES_PORT, 10)
 };
 
 migrate(dbConfig, path.join(__dirname, "migrations"))

back/package.json

@@ -57,4 +57,36 @@ ALTER TABLE "default$default"."StatusLog" RENAME COLUMN "user" to "userId";
 ALTER TABLE "default$default"."TransportSegment" RENAME COLUMN "form" to "formId";
 
 -- Form.isAccepted default to false
-ALTER TABLE "default$default"."Form" ALTER COLUMN "isAccepted" SET DEFAULT FALSE;
+ALTER TABLE "default$default"."Form" ALTER COLUMN "isAccepted" SET DEFAULT FALSE;
+
+-- Application admins: Migrate from N-N to 1-N
+ALTER TABLE "default$default"."User" ADD COLUMN "applicationId" character varying(30);
+
+UPDATE "default$default"."User"
+  SET "applicationId" = t."A"
+FROM (
+  SELECT *
+  FROM "default$default"."_ApplicationToUser"
+) t
+WHERE t."B" = "default$default"."User"."id";
+
+DROP TABLE "default$default"."_ApplicationToUser";
+
+-- Appendix2 forms: Migrate from N-N to 1-N
+ALTER TABLE "default$default"."Form" ADD COLUMN "appendix2RootFormId" character varying(30);
+
+UPDATE "default$default"."Form"
+  SET "appendix2RootFormId" = t."A"
+FROM (
+  SELECT *
+  FROM "default$default"."_FormToForm"
+) t
+WHERE t."B" = "default$default"."Form"."id";
+
+DROP TABLE "default$default"."_FormToForm";
+
+-- Some fields were added in the Prisma1 schema while migrating
+-- They might be missing in some environments.
+ALTER TABLE "default$default"."Form" ADD COLUMN IF NOT EXISTS "signedBy" character varying(30);
+ALTER TABLE "default$default"."TemporaryStorageDetail" ADD COLUMN IF NOT EXISTS "tempStorerSignedBy" character varying(30);
+ALTER TABLE "default$default"."Form" ADD COLUMN IF NOT EXISTS "wasteDetailsPop" BOOLEAN SET DEFAULT FALSE NOT NULL;

back/prisma/migrate.ts

@@ -65,14 +65,17 @@ enum Status {
   SEALED
   SENT
   RECEIVED
+  ACCEPTED
   PROCESSED
   AWAITING_GROUP
   GROUPED
   NO_TRACEABILITY
   REFUSED
+  PARTIALLY_REFUSED
 
   // Temporary storage status
   TEMP_STORED
+  TEMP_STORER_ACCEPTED
   RESEALED
   RESENT
 }
@@ -128,6 +131,8 @@ model Application {
   logoUrl      String?
   redirectUris String[]
   admins       User[]
+  AccessToken  AccessToken[]
+  Grant        Grant[]
 }
 
 model Company {
@@ -150,6 +155,25 @@ model Company {
   traderReceipt          TraderReceipt?       @relation(fields: [traderReceiptId], references: [id])
   transporterReceiptId   String?
   transporterReceipt     TransporterReceipt?  @relation(fields: [transporterReceiptId], references: [id])
+  CompanyAssociation     CompanyAssociation[]
+  MembershipRequest      MembershipRequest[]
+}
+
+// Companies with restricted diffusion of SIRENE information (police, army, etc)
+
+// "Certaines entreprises demandent à ne pas figurer sur les listes de diffusion publique
+// en vertu de l'article A123-96 du code du commerce. On parle d‘entreprise non diffusable.
+// Dans ce cas les API SIRENE ne diffusent pas les informations de cette entreprise dans
+// les résultats de recherche. Pour des raisons de sécurité, certaines associations et les
+// organismes relevant du Ministère de la Défense ne sont pas diffusibles non plus."
+model AnonymousCompany {
+  id          String @id @default(cuid())
+  siret       String @unique
+  name        String
+  address     String
+  codeNaf     String
+  libelleNaf  String
+  codeCommune String
 }
 
 model CompanyAssociation {
@@ -218,6 +242,7 @@ model Form {
   wasteDetailsNumberOfPackages       Int?
   wasteDetailsQuantity               Float?
   wasteDetailsQuantityType           QuantityType?
+  wasteDetailsPop                    Boolean                 @default(false)
   readableId                         String                  @unique
   status                             Status                  @default(DRAFT)
   sentAt                             DateTime?
@@ -278,6 +303,7 @@ model Form {
   appendix2RootForm                  Form?                   @relation("FormToForm", fields: [appendix2RootFormId], references: [id])
   ownerId                            String
   owner                              User                    @relation(fields: [ownerId], references: [id])
+  StatusLog                          StatusLog[]
 }
 
 model Grant {
@@ -396,20 +422,23 @@ model TemporaryStorageDetail {
   signedByTransporter              Boolean?
   signedBy                         String?
   signedAt                         DateTime?
+  Form                             Form[]
 }
 
 model TraderReceipt {
   id            String    @id @default(cuid())
   receiptNumber String
   validityLimit DateTime
   department    String
+  Company       Company[]
 }
 
 model TransporterReceipt {
   id            String    @id @default(cuid())
   receiptNumber String
   validityLimit DateTime
   department    String
+  Company       Company[]
 }
 
 model TransportSegment {
@@ -449,6 +478,12 @@ model User {
   applicationId       String?
   application         Application?         @relation(fields: [applicationId], references: [id])
   companyAssociations CompanyAssociation[]
+  AccessToken         AccessToken[]
+  Form                Form[]
+  Grant               Grant[]
+  MembershipRequest   MembershipRequest[]
+  StatusLog           StatusLog[]
+  UserActivationHash  UserActivationHash[]
 }
 
 model UserAccountHash {

back/prisma/migrations/03_migration.relations.sql

@@ -1,6 +1,6 @@
 import * as fs from "fs";
 import { Updater, registerUpdater } from "./helper/helper";
-import { prisma } from "../../src/generated/prisma-client";
+import prisma from "src/prisma";
 
 @registerUpdater(
   "Load anonymous companies",
@@ -20,7 +20,7 @@ export class LoadAnonymousCompaniesUpdater implements Updater {
       const data = JSON.parse(fs.readFileSync(fixturePath, "utf8"));
 
       for (const companyInput of data) {
-        await prisma.createAnonymousCompany(companyInput);
+        await prisma.anonymousCompany.create({ data: companyInput });
       }
     } catch (err) {
       console.error("☠ Something went wrong during the update", err);

back/prisma/schema.prisma

@@ -1,25 +1,25 @@
 import { Updater, registerUpdater } from "./helper/helper";
-import { prisma } from "../../src/generated/prisma-client";
+import prisma from "src/prisma";
 
 @registerUpdater(
-    "Migrate the forms to received forms to the new accepted status",
-    "Replace RECEIVED with ACCEPTED, and TEMP_STORED to TEMP_STORER_ACCEPTED",
-    true
+  "Migrate the forms to received forms to the new accepted status",
+  "Replace RECEIVED with ACCEPTED, and TEMP_STORED to TEMP_STORER_ACCEPTED",
+  true
 )
 export class MigrateAcceptedForms implements Updater {
-    async run() {
-        await prisma.updateManyForms({
-            where: {
-                status: "RECEIVED"
-            },
-            data: { status: "ACCEPTED" }
-        })
+  async run() {
+    await prisma.forms.updateMany({
+      where: {
+        status: "RECEIVED"
+      },
+      data: { status: "ACCEPTED" }
+    });
 
-        await prisma.updateManyForms({
-            where: {
-                status: "TEMP_STORED"
-            },
-            data: { status: "TEMP_STORER_ACCEPTED" }
-        })
-    }
+    await prisma.forms.updateMany({
+      where: {
+        status: "TEMP_STORED"
+      },
+      data: { status: "TEMP_STORER_ACCEPTED" }
+    });
+  }
 }

back/prisma/scripts/load-anonymous-companies.ts

@@ -1,5 +1,5 @@
 import axios from "axios";
-import { addContact } from "src/common/mails.helper";
+import { addContact } from "src/mailer/mailing";
 import prisma from "src/prisma";
 import { Updater, registerUpdater } from "./helper/helper";
 

back/prisma/scripts/migrate-accepted.ts

@@ -23,10 +23,10 @@ jest.mock("src/prisma", () => ({
 }));
 
 describe("xDaysAgo", () => {
-  it("should return a formatted relative past date", () => {
+  it("should return a relative past date", () => {
     const someDate = new Date(2019, 9, 3, 10, 0, 0);
     const threeDaysBefore = xDaysAgo(someDate, 3);
-    expect(threeDaysBefore).toEqual("2019-09-30");
+    expect(threeDaysBefore.toISOString()).toEqual("2019-09-30T00:00:00.000Z");
   });
 });
 

back/prisma/scripts/set-contacts.ts

@@ -7,13 +7,13 @@ import { userMails } from "../users/mails";
  *
  * @param baseDate Date
  * @param daysAgo Integer
- * @return a date formatted as "YYYY-MM-DD"
+ * @return a date at 00:00:00
  */
-export const xDaysAgo = (baseDate: Date, daysAgo: number): string => {
+export const xDaysAgo = (baseDate: Date, daysAgo: number): Date => {
   const clonedDate = new Date(baseDate.getTime()); // avoid mutating baseDate
-  return new Date(clonedDate.setDate(clonedDate.getDate() - daysAgo))
-    .toISOString()
-    .split("T")[0];
+  clonedDate.setDate(clonedDate.getDate() - daysAgo);
+
+  return new Date(clonedDate.toDateString());
 };
 
 /**
@@ -31,8 +31,8 @@ export const sendOnboardingEmails = async (daysAgo: number, emailFunction) => {
   const recipients = await prisma.user.findMany({
     where: {
       AND: [
-        { createdAt_gt: inscriptionDateGt },
-        { createdAt_lt: inscriptionDateLt }
+        { createdAt: { gt: inscriptionDateGt } },
+        { createdAt: { lt: inscriptionDateLt } }
       ],
       isActive: true
     }

back/src/commands/__tests__/sendmails.tests.ts

@@ -1,8 +1,8 @@
+import { UserInputError } from "apollo-server-express";
+import prisma from "src/prisma";
 import * as searchCompanyDecorated from "../searchCompany";
 import { searchCompany } from "../index";
 import { resetDatabase } from "../../../../integration-tests/helper";
-import { UserInputError } from "apollo-server-express";
-import { prisma } from "../../../generated/prisma-client";
 
 const searchCompanySpy = jest.spyOn(searchCompanyDecorated, "default");
 // Mock the fact a siret is not found in SIRENE API's
@@ -21,13 +21,15 @@ describe("searchCompany", () => {
     // do not bypass sirene client call
     process.env.NODE_ENV = "production";
     const siret = "11111111111111";
-    const anonymousCompany = await prisma.createAnonymousCompany({
-      siret,
-      name: "GENDARMERIE NATIONALE",
-      address: "Rue des tropiques, Saint Tropez",
-      codeNaf: "7150",
-      libelleNaf: "Service du ministère de la Défense",
-      codeCommune: "83119 "
+    const anonymousCompany = await prisma.anonymousCompany.create({
+      data: {
+        siret,
+        name: "GENDARMERIE NATIONALE",
+        address: "Rue des tropiques, Saint Tropez",
+        codeNaf: "7150",
+        libelleNaf: "Service du ministère de la Défense",
+        codeCommune: "83119 "
+      }
     });
     const searchResult = await searchCompany(siret);
     expect(searchResult).toMatchObject(anonymousCompany);

back/src/commands/onboarding.helpers.ts

@@ -1,5 +1,5 @@
 import { CompanySearchResult } from "../../generated/graphql/types";
-import { prisma } from "../../generated/prisma-client";
+import prisma from "src/prisma";
 
 /**
  * "Certaines entreprises demandent à ne pas figurer sur les listes de diffusion publique
@@ -14,7 +14,9 @@ import { prisma } from "../../generated/prisma-client";
 export async function searchAnonymousCompany(
   siret: string
 ): Promise<CompanySearchResult> {
-  const company = await prisma.anonymousCompany({ siret });
+  const company = await prisma.anonymousCompany.findUnique({
+    where: { siret }
+  });
   if (company) {
     return {
       ...company,

back/src/companies/sirene/__tests__/index.integration.ts

@@ -1,5 +1,5 @@
 import { Form } from "@prisma/client";
-import axios from "axios";
+import * as mailing from "../../mailer/mailing";
 import { TDEventPayload } from "../emitter";
 
 import { formsEventCallback } from "../forms";
@@ -45,18 +45,15 @@ describe("mailWhenFormTraceabilityIsBroken", () => {
       } as Form
     };
 
-    const mockedAxiosPost = jest.spyOn(axios, "post");
-    mockedAxiosPost.mockResolvedValue({} as any);
+    const mockedSendMail = jest.spyOn(mailing, "sendMail");
 
     await formsEventCallback(formPayload);
 
-    expect(mockedAxiosPost as jest.Mock<any>).toHaveBeenCalledTimes(1);
+    expect(mockedSendMail as jest.Mock<any>).toHaveBeenCalledTimes(1);
 
-    const postArgs = mockedAxiosPost.mock.calls[0];
+    const postArgs = mockedSendMail.mock.calls[0];
 
-    expect(postArgs[0]).toEqual("http://mailservice/smtp/email"); // fake url for tests
-
-    const payload = postArgs[1];
+    const payload = postArgs[0];
 
     // Check To & Cc
     expect(payload.to[0].email).toEqual(mockedForm.emitterCompanyMail);
@@ -66,9 +63,9 @@ describe("mailWhenFormTraceabilityIsBroken", () => {
     expect(payload.cc[0].name).toEqual(mockedForm.recipientCompanyContact);
 
     // check mail body infos
-    expect(payload.params.body).toContain(mockedForm.readableId);
-    expect(payload.params.body).toContain(mockedForm.recipientCompanyName);
-    expect(payload.params.body).toContain(mockedForm.wasteDetailsName);
-    expect(payload.params.body).toContain(mockedForm.wasteDetailsCode);
+    expect(payload.body).toContain(mockedForm.readableId);
+    expect(payload.body).toContain(mockedForm.recipientCompanyName);
+    expect(payload.body).toContain(mockedForm.wasteDetailsName);
+    expect(payload.body).toContain(mockedForm.wasteDetailsCode);
   });
 });