feat: made docs optional

/spend 5m
nico-i · Mar 31, 2024 · e500893 · e500893
1 parent 85d1093
commit e500893
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 38 deletions.
diff --git a/src/entities/cert/repo/cert-repo.ts b/src/entities/cert/repo/cert-repo.ts
@@ -1,12 +1,6 @@
 import type { Cert } from "@/entities/cert";
 import type { Locale } from "@/value-objects/locale";
 
-export class InvalidCertDocError extends Error {
-  constructor() {
-    super("doc attribute must have a url attribute");
-  }
-}
-
 export interface CertRepo {
   getAllCerts(locale: Locale): Promise<Cert[]>;
 }
diff --git a/src/entities/cert/repo/strapi/strapi-cert-repo.ts b/src/entities/cert/repo/strapi/strapi-cert-repo.ts
@@ -1,11 +1,8 @@
 import { Cert } from "@/entities/cert";
-import {
-  InvalidCertDocError,
-  type CertRepo,
-} from "@/entities/cert/repo/cert-repo";
+import { type CertRepo } from "@/entities/cert/repo/cert-repo";
 import { InvalidLocalizedEntityError } from "@/entities/entity";
 import type { StrapiClient } from "@/infrastructure/interfaces/strapi";
-import { Doc } from "@/value-objects/doc";
+import { Doc } from "@/value-objects";
 import { Locale } from "@/value-objects/locale";
 import { Markdown } from "@/value-objects/markdown/markdown";
 
@@ -28,16 +25,6 @@ export class StrapiCertRepo implements CertRepo {
       if (!locale) {
         throw new InvalidLocalizedEntityError();
       }
-      let certDoc: Doc | undefined;
-
-      if (doc) {
-        if (!doc.data?.attributes?.url) {
-          throw new InvalidCertDocError();
-        }
-        certDoc = new Doc(new URL(doc.data.attributes.url));
-      } else {
-        certDoc = undefined;
-      }
 
       certs.push(
         new Cert(
@@ -47,7 +34,9 @@ export class StrapiCertRepo implements CertRepo {
           issuer,
           received,
           new Markdown(info),
-          certDoc,
+          resCert.attributes.doc?.data?.attributes?.url
+            ? new Doc(new URL(resCert.attributes.doc.data.attributes.url))
+            : undefined,
           url ? new URL(url) : undefined
         )
       );

diff --git a/src/entities/ed/repo/ed-repo.ts b/src/entities/ed/repo/ed-repo.ts
@@ -4,9 +4,3 @@ import type { Locale } from "@/value-objects/locale";
 export interface EdRepo {
   getAllEds(locale: Locale): Promise<Ed[]>;
 }
-
-export class InvalidEdDocError extends Error {
-  constructor(e: unknown) {
-    super(`Invalid Ed Doc: ${e}`);
-  }
-}
diff --git a/src/entities/ed/repo/strapi/strapi-ed-repo.ts b/src/entities/ed/repo/strapi/strapi-ed-repo.ts
@@ -1,5 +1,5 @@
 import { Ed } from "@/entities/ed";
-import { InvalidEdDocError, type EdRepo } from "@/entities/ed/repo";
+import { type EdRepo } from "@/entities/ed/repo";
 import { InvalidLocalizedEntityError } from "@/entities/entity";
 import type { StrapiClient } from "@/infrastructure/interfaces/strapi";
 import { Doc } from "@/value-objects/doc/doc";
@@ -25,14 +25,6 @@ export class StrapiEdRepo implements EdRepo {
         throw new InvalidLocalizedEntityError();
       }
 
-      let edDoc: Doc | undefined = undefined;
-      if (doc) {
-        if (!doc.data?.attributes?.url) {
-          throw new InvalidEdDocError("url not found in doc data attributes");
-        }
-        edDoc = new Doc(new URL(doc.data.attributes.url));
-      }
-
       eds.push(
         new Ed(
           resEd.id,
@@ -42,7 +34,9 @@ export class StrapiEdRepo implements EdRepo {
           start,
           grade,
           url ? new URL(url) : undefined,
-          edDoc,
+          resEd.attributes.doc?.data?.attributes?.url
+            ? new Doc(new URL(resEd.attributes.doc.data.attributes.url))
+            : undefined,
           end
         )
       );