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

package/dist/index.js

@@ -57,6 +57,7 @@ __exportStar(require("./models/Editor.Container.Category.mapping"), exports);
 __exportStar(require("./models/Editor.BPcompanyTypes.Branch.Field.Mapping"), exports);
 __exportStar(require("./models/Editor.SLIITO.Branch.MembershipTypes.Field.Mapping"), exports);
 __exportStar(require("./models/Editor.Application.model"), exports);
+__exportStar(require("./models/ApplicationState.model"), exports);
 __exportStar(require("./src/dbConnect"), exports);
 //packege version 1.0.37 gs1 changes
 //packege version 1.0.38 and 1.0.38 after application(application verification stable 1.0.40) verification without GS1 changes

package/dist/models/ApplicationState.model.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mongoApplicationState = void 0;
+const mongoose_1 = require("mongoose");
+const ApplicationStateSchema = new mongoose_1.Schema({
+    referenceId: { type: String, required: true, unique: true },
+    payload: { type: mongoose_1.Schema.Types.Mixed, required: true },
+    expiresAt: { type: Date, required: true },
+    intendedUserId: { type: String, required: true },
+});
+ApplicationStateSchema.index({ expiresAt: 1 }, { expireAfterSeconds: 0 });
+const mongoApplicationState = (0, mongoose_1.model)("ApplicationState", ApplicationStateSchema);
+exports.mongoApplicationState = mongoApplicationState;

package/dist/models/Member.model.js

@@ -588,11 +588,13 @@ const barcodeMembershipSchema = new mongoose_1.Schema({
         type: mongoose_1.Schema.Types.ObjectId,
         ref: "Membership.Types",
         required: true,
+        set: (v) => (v === "" ? null : v),
     },
     membershipStatus: {
         type: mongoose_1.Schema.Types.ObjectId,
         ref: "Membership.Statuses",
         required: true,
+        set: (v) => (v === "" ? null : v),
     },
     remarks: String,
     requestedDate: { type: Date, default: null },
@@ -614,8 +616,18 @@ const barcodeMembershipSchema = new mongoose_1.Schema({
 // ------------------ None GS1 Membership ------------------
 const noneGs1MembershipSchema = new mongoose_1.Schema({
     associationMemberCode: String,
-    membershipStatus: { type: mongoose_1.Schema.Types.ObjectId, ref: "Membership.Statuses" },
-    membershipType: { type: mongoose_1.Schema.Types.ObjectId, ref: "Membership.Types" },
+    membershipStatus: {
+        type: mongoose_1.Schema.Types.ObjectId,
+        ref: "Membership.Statuses",
+        required: true,
+        set: (v) => (v === "" ? null : v),
+    },
+    membershipType: {
+        type: mongoose_1.Schema.Types.ObjectId,
+        ref: "Membership.Types",
+        required: true,
+        set: (v) => (v === "" ? null : v),
+    },
     isTerminated: Boolean,
     terminatedDate: Date,
     reasonForTermination: String,

package/dist/models/User.model.js

@@ -25,7 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mongoUser = void 0;
 const mongoose_1 = __importStar(require("mongoose"));
-mongoose_1.default.set('strictPopulate', false);
+mongoose_1.default.set("strictPopulate", false);
 const userSchema = new mongoose_1.Schema({
     userId: String,
     userName: String,
@@ -33,12 +33,17 @@ const userSchema = new mongoose_1.Schema({
     userType: String,
     member: {
         type: mongoose_1.Schema.Types.ObjectId,
-        ref: 'Members', // Reference to the 'Members' model
+        ref: "Members", // Reference to the 'Members' model
+    },
+    linkMemberUser: {
+        type: mongoose_1.Schema.Types.ObjectId,
+        ref: "Users", // Reference to the 'Users' model (represents the linked member user)
     },
     userPassword: String,
     unsuccessfulLoginAttempts: Number,
     lastSuccessfulLoginOn: Date,
-    oneTimePassword: String,
+    oneTimePassword: { type: String, default: "" },
+    otpExpiresAt: { type: Date, default: null },
     companyName: { type: String },
     contactNumber: { type: String },
     isFirstAccess: { type: Boolean, default: true },
@@ -50,20 +55,26 @@ const userSchema = new mongoose_1.Schema({
     isActive: { type: Boolean, default: true },
     isUserCreationNotified: { type: Boolean, default: false },
     isPasswordNotified: { type: Boolean, default: false },
-    accessibleBranches: [{
+    accessibleBranches: [
+        {
             type: mongoose_1.Schema.Types.ObjectId,
-            ref: 'Branches', // Reference to the 'Branches' model
-        }],
+            ref: "Branches", // Reference to the 'Branches' model
+        },
+    ],
     requisitionUserType: { type: String, default: "" },
-    requisitionBranches: [{
+    requisitionBranches: [
+        {
             type: mongoose_1.Schema.Types.ObjectId,
-            ref: 'Branches', // Reference to the 'Branches' model
-        }],
-    audit: [{
+            ref: "Branches", // Reference to the 'Branches' model
+        },
+    ],
+    audit: [
+        {
             userId: String,
             auditedOn: { type: Date, default: Date.now() },
-            actionType: String
-        }]
+            actionType: String,
+        },
+    ],
 });
-const mongoUser = mongoose_1.default.model('Users', userSchema);
+const mongoUser = mongoose_1.default.model("Users", userSchema);
 exports.mongoUser = mongoUser;

package/index.ts

@@ -45,6 +45,7 @@ export * from "./models/Editor.BPcompanyTypes.Branch.Field.Mapping";
 export * from "./models/Editor.SLIITO.Branch.MembershipTypes.Field.Mapping";
 
 export * from "./models/Editor.Application.model";
+export * from "./models/ApplicationState.model"
 
 export * from "./src/dbConnect";
 

package/models/ApplicationState.model.ts

@@ -0,0 +1,24 @@
+import { Schema, Document, model } from "mongoose";
+
+interface IApplicationStateDocument extends Document {
+  referenceId: string;
+  payload: any;
+  expiresAt: Date;
+  intendedUserId: string;
+}
+
+const ApplicationStateSchema = new Schema<IApplicationStateDocument>({
+  referenceId: { type: String, required: true, unique: true },
+  payload: { type: Schema.Types.Mixed, required: true },
+  expiresAt: { type: Date, required: true },
+  intendedUserId: { type: String, required: true },
+});
+
+ApplicationStateSchema.index({ expiresAt: 1 }, { expireAfterSeconds: 0 });
+
+const mongoApplicationState = model<IApplicationStateDocument>(
+  "ApplicationState",
+  ApplicationStateSchema,
+);
+
+export { IApplicationStateDocument, mongoApplicationState };

package/models/Member.model.ts

@@ -740,11 +740,13 @@ const barcodeMembershipSchema = new Schema({
     type: Schema.Types.ObjectId,
     ref: "Membership.Types",
     required: true,
+    set: (v: string) => (v === "" ? null : v),
   },
   membershipStatus: {
     type: Schema.Types.ObjectId,
     ref: "Membership.Statuses",
     required: true,
+    set: (v: string) => (v === "" ? null : v),
   },
   remarks: String,
   requestedDate: { type: Date, default: null },
@@ -767,8 +769,18 @@ const barcodeMembershipSchema = new Schema({
 // ------------------ None GS1 Membership ------------------
 const noneGs1MembershipSchema = new Schema({
   associationMemberCode: String,
-  membershipStatus: { type: Schema.Types.ObjectId, ref: "Membership.Statuses" },
-  membershipType: { type: Schema.Types.ObjectId, ref: "Membership.Types" },
+  membershipStatus: {
+    type: Schema.Types.ObjectId,
+    ref: "Membership.Statuses",
+    required: true,
+    set: (v: string) => (v === "" ? null : v),
+  },
+  membershipType: {
+    type: Schema.Types.ObjectId,
+    ref: "Membership.Types",
+    required: true,
+    set: (v: string) => (v === "" ? null : v),
+  },
   isTerminated: Boolean,
   terminatedDate: Date,
   reasonForTermination: String,

package/models/User.model.ts

@@ -1,5 +1,5 @@
-import mongoose, { Document, Schema } from 'mongoose';
-import { Audit } from '../interface/Audit.interface';
+import mongoose, { Document, Schema } from "mongoose";
+import { Audit } from "../interface/Audit.interface";
 
 interface UserDocument extends Document {
   userId: string;
@@ -11,6 +11,7 @@ interface UserDocument extends Document {
   unsuccessfulLoginAttempts: number;
   lastSuccessfulLoginOn: Date;
   oneTimePassword: string;
+  otpExpiresAt: Date | null;
   isFirstAccess: boolean;
   isPasswordReset: boolean;
   isProfileLocked: boolean;
@@ -23,12 +24,13 @@ interface UserDocument extends Document {
   accessibleBranches: mongoose.Types.ObjectId[];
   requisitionUserType: string;
   requisitionBranches: mongoose.Types.ObjectId[];
-  companyName:string;
-  contactNumber:string;
+  companyName: string;
+  contactNumber: string;
   audit: Audit[];
+  linkMemberUser: mongoose.Types.ObjectId;
 }
 
-mongoose.set('strictPopulate', false);
+mongoose.set("strictPopulate", false);
 
 const userSchema = new Schema<UserDocument>({
   userId: String,
@@ -37,12 +39,17 @@ const userSchema = new Schema<UserDocument>({
   userType: String,
   member: {
     type: Schema.Types.ObjectId,
-    ref: 'Members', // Reference to the 'Members' model
+    ref: "Members", // Reference to the 'Members' model
+  },
+  linkMemberUser: {
+    type: Schema.Types.ObjectId,
+    ref: "Users", // Reference to the 'Users' model (represents the linked member user)
   },
   userPassword: String,
   unsuccessfulLoginAttempts: Number,
   lastSuccessfulLoginOn: Date,
-  oneTimePassword: String,
+  oneTimePassword: { type: String, default: "" },
+  otpExpiresAt: { type: Date, default: null },
   companyName: { type: String },
   contactNumber: { type: String },
   isFirstAccess: { type: Boolean, default: true },
@@ -54,22 +61,29 @@ const userSchema = new Schema<UserDocument>({
   isActive: { type: Boolean, default: true },
   isUserCreationNotified: { type: Boolean, default: false },
   isPasswordNotified: { type: Boolean, default: false },
-  accessibleBranches: [{
-    type: Schema.Types.ObjectId,
-    ref: 'Branches', // Reference to the 'Branches' model
-  }],
+  accessibleBranches: [
+    {
+      type: Schema.Types.ObjectId,
+      ref: "Branches", // Reference to the 'Branches' model
+    },
+  ],
   requisitionUserType: { type: String, default: "" },
-  requisitionBranches: [{
-    type: Schema.Types.ObjectId,
-    ref: 'Branches', // Reference to the 'Branches' model
-  }],  
-  audit: [{
-    userId: String,
-    auditedOn: { type: Date, default: Date.now() },
-    actionType: String
-  }]
+  requisitionBranches: [
+    {
+      type: Schema.Types.ObjectId,
+      ref: "Branches", // Reference to the 'Branches' model
+    },
+  ],
+  audit: [
+    {
+      userId: String,
+      auditedOn: { type: Date, default: Date.now() },
+      actionType: String,
+    },
+  ],
+
 });
 
-const mongoUser = mongoose.model<UserDocument>('Users', userSchema);
+const mongoUser = mongoose.model<UserDocument>("Users", userSchema);
 
 export { UserDocument, mongoUser };

package/package.json

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