pristine-member-nest-api-database 1.2.3 → 1.2.5

package/dist/models/Member.model.js

@@ -587,13 +587,13 @@ const barcodeMembershipSchema = new mongoose_1.Schema({
     membershipType: {
         type: mongoose_1.Schema.Types.ObjectId,
         ref: "Membership.Types",
-        required: true,
+        // required: true,
         set: (v) => (v === "" ? null : v),
     },
     membershipStatus: {
         type: mongoose_1.Schema.Types.ObjectId,
         ref: "Membership.Statuses",
-        required: true,
+        // required: true,
         set: (v) => (v === "" ? null : v),
     },
     remarks: String,
@@ -619,13 +619,13 @@ const noneGs1MembershipSchema = new mongoose_1.Schema({
     membershipStatus: {
         type: mongoose_1.Schema.Types.ObjectId,
         ref: "Membership.Statuses",
-        required: true,
+        // required: true,
         set: (v) => (v === "" ? null : v),
     },
     membershipType: {
         type: mongoose_1.Schema.Types.ObjectId,
         ref: "Membership.Types",
-        required: true,
+        // required: true,
         set: (v) => (v === "" ? null : v),
     },
     isTerminated: Boolean,
@@ -663,6 +663,14 @@ const approverSchema = new mongoose_1.Schema({
     userId: String,
     attachment: [fileSchema],
 });
+// ------------------ Manager Data ------------------
+const managerDataSchema = new mongoose_1.Schema({
+    remarks: String,
+    userId: String,
+    attachment: [fileSchema],
+    invoiceDiscountPercentage: mongoose_1.Schema.Types.Mixed,
+    categoryData: [categorySchema],
+});
 // ------------------ Member Association ------------------
 const memberAssociationSchema = new mongoose_1.Schema({
     applicationId: mongoose_1.Schema.Types.ObjectId,
@@ -681,8 +689,10 @@ const memberAssociationSchema = new mongoose_1.Schema({
     salesOrderStatus: { type: String, default: null },
     isActive: { type: Boolean, default: true },
     createdDate: { type: Date, default: Date.now },
+    linkedMemberId: { type: mongoose_1.Schema.Types.ObjectId, default: null },
     approverOneData: approverSchema,
     approverTwoData: approverSchema,
+    managerData: managerDataSchema,
 });
 // ------------------ Member ------------------
 const memberSchema = new mongoose_1.Schema({

package/models/Member.model.ts

@@ -706,6 +706,7 @@ interface MemberDocument extends Document {
       salesOrderStatus: string | null;
       isActive: boolean;
       createdDate: Date;
+      linkedMemberId: mongoose.Types.ObjectId | null;
       approverOneData: {
         fieldId: mongoose.Types.ObjectId;
         remarks: string;
@@ -718,6 +719,23 @@ interface MemberDocument extends Document {
         userId: string;
         attachment: IFile[];
       };
+      managerData: {
+        remarks: string;
+        userId: string;
+        attachment: IFile[];
+        invoiceDiscountPercentage?: string | number | any;
+        categoryData?: [
+          {
+            categoryId: mongoose.Types.ObjectId;
+            fieldValues: [
+              {
+                fieldId: mongoose.Types.ObjectId;
+                value: string | number | any;
+              },
+            ];
+          },
+        ];
+      };
     },
   ];
   audit: Audit[];
@@ -739,13 +757,13 @@ const barcodeMembershipSchema = new Schema({
   membershipType: {
     type: Schema.Types.ObjectId,
     ref: "Membership.Types",
-    required: true,
+    // required: true,
     set: (v: string) => (v === "" ? null : v),
   },
   membershipStatus: {
     type: Schema.Types.ObjectId,
     ref: "Membership.Statuses",
-    required: true,
+    // required: true,
     set: (v: string) => (v === "" ? null : v),
   },
   remarks: String,
@@ -772,13 +790,13 @@ const noneGs1MembershipSchema = new Schema({
   membershipStatus: {
     type: Schema.Types.ObjectId,
     ref: "Membership.Statuses",
-    required: true,
+    // required: true,
     set: (v: string) => (v === "" ? null : v),
   },
   membershipType: {
     type: Schema.Types.ObjectId,
     ref: "Membership.Types",
-    required: true,
+    // required: true,
     set: (v: string) => (v === "" ? null : v),
   },
   isTerminated: Boolean,
@@ -821,6 +839,15 @@ const approverSchema = new Schema({
   attachment: [fileSchema],
 });
 
+// ------------------ Manager Data ------------------
+const managerDataSchema = new Schema({
+  remarks: String,
+  userId: String,
+  attachment: [fileSchema],
+  invoiceDiscountPercentage: Schema.Types.Mixed,
+  categoryData: [categorySchema],
+});
+
 // ------------------ Member Association ------------------
 const memberAssociationSchema = new Schema({
   applicationId: Schema.Types.ObjectId,
@@ -839,8 +866,10 @@ const memberAssociationSchema = new Schema({
   salesOrderStatus: { type: String, default: null },
   isActive: { type: Boolean, default: true },
   createdDate: { type: Date, default: Date.now },
+  linkedMemberId: { type: Schema.Types.ObjectId, default: null },
   approverOneData: approverSchema,
   approverTwoData: approverSchema,
+  managerData: managerDataSchema,
 });
 
 // ------------------ Member ------------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pristine-member-nest-api-database",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "application verification database changes with gs1 branch. not tested. ",
   "main": "dist/index.js",
   "scripts": {