chore(schema): move comments to only be used in invoices

boklisten · Dec 26, 2024 · dbf1f9f · dbf1f9f
1 parent 3848f27
commit dbf1f9f
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 22 deletions.
diff --git a/backend/src/collections/customer-item/customer-item-generate-report.operation.ts b/backend/src/collections/customer-item/customer-item-generate-report.operation.ts
@@ -146,7 +146,6 @@ export class CustomerItemGenerateReportOperation implements Operation {
           guardianPhone: { $first: "$customerInfo.guardian.phone" },
           guardianName: { $first: "$customerInfo.guardian.name" },
           handoutEmployee: { $first: "$employeeInfo.name" },
-          comments: 1,
           pivot: "1",
         },
       },

diff --git a/backend/src/collections/invoice/invoice.schema.ts b/backend/src/collections/invoice/invoice.schema.ts
@@ -91,4 +91,17 @@ export const invoiceSchema = new Schema<ToSchema<Invoice>>({
   ourReference: String,
   invoiceId: String,
   reference: String,
+  comments: {
+    type: [
+      {
+        id: String,
+        msg: String,
+        creationTime: {
+          type: Date,
+          default: Date.now(),
+        },
+        user: Schema.Types.ObjectId,
+      },
+    ],
+  },
 });
diff --git a/backend/src/collections/order/helpers/order-validator/item-validator/item-validator.spec.ts b/backend/src/collections/order/helpers/order-validator/item-validator/item-validator.spec.ts
@@ -36,7 +36,6 @@ describe("ItemValidator", () => {
       categories: [],
       creationTime: new Date(),
       lastUpdated: new Date(),
-      comments: [],
       active: true,
     };
 

diff --git a/backend/src/collections/order/hooks/order-hook-before.spec.ts b/backend/src/collections/order/hooks/order-hook-before.spec.ts
@@ -75,7 +75,6 @@ describe("OrderHookBefore", () => {
           branch: "b1",
           byCustomer: true,
           payments: ["payment1"],
-          comments: [],
           active: false,
           user: {
             id: "u1",

diff --git a/backend/src/collections/order/hooks/order.post.hook.spec.ts b/backend/src/collections/order/hooks/order.post.hook.spec.ts
@@ -102,7 +102,6 @@ describe("OrderPostHook", () => {
       byCustomer: true,
       payments: [],
       delivery: "",
-      comments: [],
       active: false,
       user: {
         id: "u1",

diff --git a/backend/src/payment/dibs/dibs-payment.service.spec.ts b/backend/src/payment/dibs/dibs-payment.service.spec.ts
@@ -49,7 +49,6 @@ describe("DibsPaymentService", () => {
         },
       ],
       payments: [],
-      comments: [],
       delivery: "",
       active: false,
       user: {

diff --git a/backend/src/storage/mongoDb/mongoose-schema-creator.ts b/backend/src/storage/mongoDb/mongoose-schema-creator.ts
@@ -17,19 +17,6 @@ export class MongooseModelCreator<T> {
   private standardizeSchema(schema: Schema): Schema {
     schema.add({
       blid: String,
-      comments: {
-        type: [
-          {
-            id: String,
-            msg: String,
-            creationTime: {
-              type: Date,
-              default: Date.now(),
-            },
-            user: Schema.Types.ObjectId,
-          },
-        ],
-      },
       active: {
         type: Boolean,
         default: true,

diff --git a/shared/src/bl-document/bl-document.ts b/shared/src/bl-document/bl-document.ts
@@ -1,12 +1,10 @@
-import { Comment } from "@shared/comment/comment";
 import { UserPermission } from "@shared/permission/user-permission";
 
 export interface BlDocument {
   id: string;
   blid?: string;
   lastUpdated?: Date;
   creationTime?: Date;
-  comments?: Comment[];
   active?: boolean;
   user?: {
     // the user that created the document

diff --git a/shared/src/invoice/invoice.ts b/shared/src/invoice/invoice.ts
@@ -1,4 +1,5 @@
 import { BlDocument } from "@shared/bl-document/bl-document";
+import { Comment } from "@shared/comment/comment";
 import { CustomerItemType } from "@shared/customer-item/customer-item-type";
 
 export interface Invoice extends BlDocument {
@@ -62,4 +63,5 @@ export interface Invoice extends BlDocument {
   ourReference?: string;
   invoiceId?: string; // ex. 201810000
   reference?: string; // ex. 'Not delivered books in time'
+  comments?: Comment[];
 }
diff --git a/shared/src/match/match.ts b/shared/src/match/match.ts
@@ -1,5 +1,4 @@
 import { BlDocument } from "@shared/bl-document/bl-document";
-import { Comment } from "@shared/comment/comment";
 import { UserPermission } from "@shared/permission/user-permission";
 
 export enum MatchVariant {
@@ -19,7 +18,6 @@ export class MatchBase implements BlDocument {
   blid?: string;
   lastUpdated?: Date;
   creationTime?: Date;
-  comments?: Comment[];
   active?: boolean;
   user?: {
     id: string;