picker-db 5.0.3 → 5.0.7

package/constants.js

@@ -462,5 +462,9 @@ module.exports = {
       PICKUP: "PICKUP",
       DELIVERY: "DELIVERY",
     },
-  }
+    SUBTYPES: {
+      PICKUP_AND_DELIVER: "PICKUP_AND_DELIVER",
+      MULTI_PICKING: "MULTI_PICKING",
+    },
+  },
 };

package/modules/picker/models/index.js

@@ -27,6 +27,7 @@ const BookingDriverDetailsSchema = require("../schemas/bookingDriverDetails");
 const ConversationSchema = require("../schemas/conversation");
 const BookingMetadataSchema = require("../schemas/bookingMetadata");
 const BookingStopSchema = require("../schemas/bookingStop");
+const UserAuditLogSchema = require("../schemas/userAuditLog");
 
 /** @param {import("mongoose")} connection */
 module.exports = (connection) => {
@@ -60,5 +61,6 @@ module.exports = (connection) => {
     Conversation: connection.model("Conversation", ConversationSchema(connection)),
     BookingMetadata: connection.model("BookingMetadata", BookingMetadataSchema(connection)),
     BookingStop: connection.model("BookingStop", BookingStopSchema(connection)),
+    UserAuditLog: connection.model("UserAuditLog", UserAuditLogSchema(connection)),
   };
 };

package/modules/picker/schemas/bookings.js

@@ -1,4 +1,4 @@
-const { VEHICLE_TYPES, PAYMENT_METHODS, BOOKING_TYPES, BOOKING_STATUS, DELIVERY_CHARGE_TYPE, PROOF_OF_DELIVERY, PNF_REASON } = require("../../../constants");
+const { VEHICLE_TYPES, PAYMENT_METHODS, BOOKING_TYPES, BOOKING_STATUS, DELIVERY_CHARGE_TYPE, PROOF_OF_DELIVERY, PNF_REASON, BOOKING } = require("../../../constants");
 const { DEVICE_TYPES } = require("../../../constants").USER;
 
 const PricingDetailsSchema = require("./pricingDetails");
@@ -375,7 +375,11 @@ module.exports = (connection) => {
     },
     subtype: {
       type: String,
-      default: "PICKUP_AND_DELIVER",
+      enum: [
+        BOOKING.SUBTYPES.PICKUP_AND_DELIVER,
+        BOOKING.SUBTYPES.MULTI_PICKING,
+      ],
+      default: BOOKING.SUBTYPES.PICKUP_AND_DELIVER,
     },
     transactionDetails: {
       itemCharge: {

package/modules/picker/schemas/user.js

@@ -331,6 +331,17 @@ module.exports = (connection) => {
     dashboardInviteTokenDate: {
       type: Date,
     },
+    twoFactorEnabled: { type: Boolean, default: false },
+    twoFactorSetupCompleted: { type: Boolean, default: false },
+    twoFactorSecret: { type: String },
+    twoFactorIV: { type: String },
+    twoFactorAuthTag: { type: String },
+    lastUsedTOTPTimestamp: { type: Number, default: null },
+    twoFactorBackupCodes: [{
+      hash: { type: String },
+      used: { type: Boolean, default: false },
+    }],
+    twoFactorGraceDeadline: { type: Date, default: null },
   }, { timestamps: true });
 
   return UserSchema;

package/modules/picker/schemas/userAuditLog.js

@@ -0,0 +1,24 @@
+/** @param {import("mongoose")} connection */
+module.exports = (connection) => {
+  const UserAuditLogSchema = new connection.base.Schema({
+    event: {
+      type: String,
+      required: true,
+      index: true,
+    },
+    userId: {
+      type: connection.base.Schema.ObjectId,
+      ref: "User",
+      required: true,
+      index: true,
+    },
+    performedBy: {
+      type: connection.base.Schema.ObjectId,
+      ref: "User",
+    },
+    ip: { type: String },
+    metadata: { type: JSON },
+  }, { timestamps: true });
+
+  return UserAuditLogSchema;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "picker-db",
-  "version": "5.0.3",
+  "version": "5.0.7",
   "description": "Picker DB services",
   "main": "index.js",
   "scripts": {