joye-backend-utility 7.3.2 → 7.3.6

package/dist/config/notificationBucketSegmentRules.d.ts

@@ -1,12 +1,14 @@
 /**
  * Platform → segment base (added before `hash(employeeId) % 1000` for stored `User.bucket`).
  *
- * Only platforms listed in **`DEFAULT_BUCKET_SEGMENT_BASE_BY_PLATFORM`** get a `bucket`.
- * Keys are matched **case-insensitively** to `Organization.platformKey`. Anything else → no bucket.
+ * Keys are matched **case-insensitively** to `Organization.platformKey`.
+ * Reserved key **`pwa`**: used as the segment base for any org whose `Platform` doc has **`pwa: true`** but whose `platformKey` is not otherwise listed here.
  */
 /** Edit this object only — add one entry per platform that should participate in notification sharding. */
 export declare const DEFAULT_BUCKET_SEGMENT_BASE_BY_PLATFORM: Record<string, number>;
 export declare function getBucketSegmentMapping(): Record<string, number>;
 export declare function segmentBaseForPlatformKey(orgPlatformKey: string, mapping: Record<string, number>): number | null;
-/** Segment base if `platformKey` is in the map; otherwise `null` (do not set `User.bucket`). */
-export declare function resolveBucketSegmentBase(orgPlatformKey: string): number | null;
+/**
+ * Segment base: explicit map first; if missing and **`isPwaPlatform`**, use the **`pwa`** entry in the same map.
+ */
+export declare function resolveBucketSegmentBase(orgPlatformKey: string, isPwaPlatform?: boolean): number | null;

package/dist/config/notificationBucketSegmentRules.js

@@ -2,16 +2,17 @@
 /**
  * Platform → segment base (added before `hash(employeeId) % 1000` for stored `User.bucket`).
  *
- * Only platforms listed in **`DEFAULT_BUCKET_SEGMENT_BASE_BY_PLATFORM`** get a `bucket`.
- * Keys are matched **case-insensitively** to `Organization.platformKey`. Anything else → no bucket.
+ * Keys are matched **case-insensitively** to `Organization.platformKey`.
+ * Reserved key **`pwa`**: used as the segment base for any org whose `Platform` doc has **`pwa: true`** but whose `platformKey` is not otherwise listed here.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveBucketSegmentBase = exports.segmentBaseForPlatformKey = exports.getBucketSegmentMapping = exports.DEFAULT_BUCKET_SEGMENT_BASE_BY_PLATFORM = void 0;
 /** Edit this object only — add one entry per platform that should participate in notification sharding. */
 exports.DEFAULT_BUCKET_SEGMENT_BASE_BY_PLATFORM = {
     teams: 0,
-    visit: 1000,
-    medibuddy: 3000,
+    pwa: 1000,
+    visit: 3000,
+    medibuddy: 4000,
 };
 function lowercaseKeys(map) {
     const out = {};
@@ -38,8 +39,20 @@ function segmentBaseForPlatformKey(orgPlatformKey, mapping) {
     return null;
 }
 exports.segmentBaseForPlatformKey = segmentBaseForPlatformKey;
-/** Segment base if `platformKey` is in the map; otherwise `null` (do not set `User.bucket`). */
-function resolveBucketSegmentBase(orgPlatformKey) {
-    return segmentBaseForPlatformKey(orgPlatformKey, getBucketSegmentMapping());
+/**
+ * Segment base: explicit map first; if missing and **`isPwaPlatform`**, use the **`pwa`** entry in the same map.
+ */
+function resolveBucketSegmentBase(orgPlatformKey, isPwaPlatform = false) {
+    const mapping = getBucketSegmentMapping();
+    const key = String(orgPlatformKey || '').trim();
+    if (key !== '') {
+        const mapped = segmentBaseForPlatformKey(key, mapping);
+        if (mapped != null)
+            return mapped;
+    }
+    if (isPwaPlatform) {
+        return segmentBaseForPlatformKey('pwa', mapping);
+    }
+    return null;
 }
 exports.resolveBucketSegmentBase = resolveBucketSegmentBase;

package/dist/index.d.ts

@@ -4,5 +4,3 @@ export { createHashPassword, createUuid } from './util';
 export { createToken, jwtVerify } from './jwt';
 export { getPreviousWorkday, get2ndLastPreviousWorkday, addDays, addMinutes, addYears, getCurrentDateTime, getCurrentUtcTime, newDate, getDatesBetweenRange, getMoment, getCurrentEpoch, } from './dateTime';
 export { RedisClient } from './redisClient';
-export { DEFAULT_BUCKET_SEGMENT_BASE_BY_PLATFORM, getBucketSegmentMapping, segmentBaseForPlatformKey, resolveBucketSegmentBase, } from './config/notificationBucketSegmentRules';
-export { BUCKET_SEGMENT_SPAN, stableBucketFromEmployeeId, notificationBucketFromSegmentBase } from './config/notificationBucket';

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.notificationBucketFromSegmentBase = exports.stableBucketFromEmployeeId = exports.BUCKET_SEGMENT_SPAN = exports.resolveBucketSegmentBase = exports.segmentBaseForPlatformKey = exports.getBucketSegmentMapping = exports.DEFAULT_BUCKET_SEGMENT_BASE_BY_PLATFORM = exports.RedisClient = exports.getCurrentEpoch = exports.getMoment = exports.getDatesBetweenRange = exports.newDate = exports.getCurrentUtcTime = exports.getCurrentDateTime = exports.addYears = exports.addMinutes = exports.addDays = exports.get2ndLastPreviousWorkday = exports.getPreviousWorkday = exports.jwtVerify = exports.createToken = exports.createUuid = exports.createHashPassword = void 0;
+exports.RedisClient = exports.getCurrentEpoch = exports.getMoment = exports.getDatesBetweenRange = exports.newDate = exports.getCurrentUtcTime = exports.getCurrentDateTime = exports.addYears = exports.addMinutes = exports.addDays = exports.get2ndLastPreviousWorkday = exports.getPreviousWorkday = exports.jwtVerify = exports.createToken = exports.createUuid = exports.createHashPassword = void 0;
 const database_1 = require("./database");
 exports.default = database_1.default;
 var util_1 = require("./util");
@@ -24,12 +24,3 @@ Object.defineProperty(exports, "getMoment", { enumerable: true, get: function ()
 Object.defineProperty(exports, "getCurrentEpoch", { enumerable: true, get: function () { return dateTime_1.getCurrentEpoch; } });
 var redisClient_1 = require("./redisClient");
 Object.defineProperty(exports, "RedisClient", { enumerable: true, get: function () { return redisClient_1.RedisClient; } });
-var notificationBucketSegmentRules_1 = require("./config/notificationBucketSegmentRules");
-Object.defineProperty(exports, "DEFAULT_BUCKET_SEGMENT_BASE_BY_PLATFORM", { enumerable: true, get: function () { return notificationBucketSegmentRules_1.DEFAULT_BUCKET_SEGMENT_BASE_BY_PLATFORM; } });
-Object.defineProperty(exports, "getBucketSegmentMapping", { enumerable: true, get: function () { return notificationBucketSegmentRules_1.getBucketSegmentMapping; } });
-Object.defineProperty(exports, "segmentBaseForPlatformKey", { enumerable: true, get: function () { return notificationBucketSegmentRules_1.segmentBaseForPlatformKey; } });
-Object.defineProperty(exports, "resolveBucketSegmentBase", { enumerable: true, get: function () { return notificationBucketSegmentRules_1.resolveBucketSegmentBase; } });
-var notificationBucket_1 = require("./config/notificationBucket");
-Object.defineProperty(exports, "BUCKET_SEGMENT_SPAN", { enumerable: true, get: function () { return notificationBucket_1.BUCKET_SEGMENT_SPAN; } });
-Object.defineProperty(exports, "stableBucketFromEmployeeId", { enumerable: true, get: function () { return notificationBucket_1.stableBucketFromEmployeeId; } });
-Object.defineProperty(exports, "notificationBucketFromSegmentBase", { enumerable: true, get: function () { return notificationBucket_1.notificationBucketFromSegmentBase; } });

package/dist/schema/user.js

@@ -206,7 +206,7 @@ const User = new mongoose_1.Schema({
         required: false,
     },
     /**
-     * Stable shard index: segment base from `DEFAULT_BUCKET_SEGMENT_BASE_BY_PLATFORM` + hash(employeeId)%1000; see BUCKET_SHARDING.md.
+     * Stable shard index: segment base (see user-service / notification-delivery `notificationBucketSegmentRules`) + hash(employeeId)%1000; see BUCKET_SHARDING.md.
      * Schedulers filter `bucket` in [BUCKET_MIN, BUCKET_MAX]; omit field for platforms without notification sharding.
      */
     bucket: {

package/dist/schema/user_analytic.js

@@ -8,6 +8,12 @@ const UserAnalytic = new mongoose_1.Schema({
         required: true,
         index: true,
     },
+    /** Denormalized from `User.bucket` for sharded schedulers (e.g. daily-suggestion queue cron). */
+    bucket: {
+        type: Number,
+        required: false,
+        index: true,
+    },
     date: {
         type: String,
         required: true,
@@ -133,4 +139,5 @@ const UserAnalytic = new mongoose_1.Schema({
 });
 UserAnalytic.index({ employeeId: 1, weekNumber: -1, year: -1, date: -1 });
 UserAnalytic.index({ employeeId: 1, month: -1, year: -1, date: -1 });
+UserAnalytic.index({ year: 1, weekNumber: 1, bucket: 1 });
 exports.UserAnalyticSchema = UserAnalytic;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "joye-backend-utility",
-  "version": "7.3.2",
+  "version": "7.3.6",
   "description": "Joye backend utility for db functions and common functions",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",