fix: handle declarations with missing data or insufficient duration (#…

…2165)
SocialGouv · Feb 27, 2024 · fb10251 · fb10251
1 parent 813f9f8
commit fb10251
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/packages/app/src/api/core-domain/repo/impl/PostgresDeclarationRepo.ts b/packages/app/src/api/core-domain/repo/impl/PostgresDeclarationRepo.ts
@@ -73,7 +73,9 @@ export class PostgresDeclarationRepo implements IDeclarationRepo {
 
   public async getAllBySiren(siren: Siren): Promise<Declaration[]> {
     try {
-      const raws = await this.sql`select * from ${this.table} where siren=${siren.getValue()} ${this.postgresLimit}`;
+      const raws = await this.sql`select * from ${this.table} where siren=${siren.getValue()} and data notnull ${
+        this.postgresLimit
+      }`;
 
       return raws.map(declarationMap.toDomain);
     } catch (error: unknown) {

diff --git a/packages/app/src/app/(default)/mon-espace/mes-declarations/IndexList.tsx b/packages/app/src/app/(default)/mon-espace/mes-declarations/IndexList.tsx
@@ -32,6 +32,7 @@ enum declarationOpmcStatus {
 
 const getDeclarationOpmcStatus = (declaration?: DeclarationOpmcDTO) => {
   if (!declaration) return declarationOpmcStatus.NOT_APPLICABLE;
+  if (declaration?.["periode-reference"]?.périodeSuffisante === "non") return declarationOpmcStatus.NOT_APPLICABLE;
   const { after2021, index, initialValuesObjectifsMesures, objectifsMesuresSchema } =
     buildHelpersObjectifsMesures(declaration);