@escapenavigator/utils 2.0.33 → 2.0.34

package/dist/user-session-permissions.d.ts

@@ -16,8 +16,37 @@ export type UserSessionPermissionTarget = {
     authorId?: number | null;
     date: string;
 };
+export type UserSessionClaimTarget = {
+    hold?: boolean;
+    userId?: number | null;
+    needReplace?: boolean;
+    start: string;
+    end: string;
+    locationId: number;
+    comment?: string | null;
+};
+export type UserSessionClaimDto = {
+    userId?: number | null;
+    needReplace?: boolean;
+    start?: string;
+    end?: string;
+    locationId?: number;
+    comment?: string | null;
+    hold?: boolean;
+};
 export declare const canEditOtherUserSessions: (role: UserSessionRolePermissions) => boolean;
 export declare const isSessionDateTodayOrFuture: (date: string, today?: string) => boolean;
+/** Unassigned shift or a shift with an open replace request — any employee may claim it. */
+export declare const isOpenUserSession: (session: Pick<UserSessionClaimTarget, "userId" | "needReplace">) => boolean;
+/**
+ * True when the actor is only claiming an open shift for themselves
+ * (assign userId / clear needReplace) without changing schedule fields.
+ */
+export declare const isTakingOpenUserSession: (params: {
+    session: UserSessionClaimTarget;
+    dto: UserSessionClaimDto;
+    actorId: number;
+}) => boolean;
 /** Returns an English denial message, or null when edit/delete is allowed. */
 export declare const getUserSessionEditDenial: (params: {
     session: UserSessionPermissionTarget;

package/dist/user-session-permissions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.canEditUserSession = exports.getUserSessionCreateDenial = exports.getUserSessionEditDenial = exports.isSessionDateTodayOrFuture = exports.canEditOtherUserSessions = exports.USER_SESSION_ERRORS_EN = exports.USER_SESSION_ERROR_KEYS = void 0;
+exports.canEditUserSession = exports.getUserSessionCreateDenial = exports.getUserSessionEditDenial = exports.isTakingOpenUserSession = exports.isOpenUserSession = exports.isSessionDateTodayOrFuture = exports.canEditOtherUserSessions = exports.USER_SESSION_ERRORS_EN = exports.USER_SESSION_ERROR_KEYS = void 0;
 exports.USER_SESSION_ERROR_KEYS = {
     shiftLocked: 'shiftLocked',
     noPermission: 'noPermission',
@@ -23,6 +23,42 @@ const canEditOtherUserSessions = (role) => !!role.totalAccess || !!role.canEditW
 exports.canEditOtherUserSessions = canEditOtherUserSessions;
 const isSessionDateTodayOrFuture = (date, today = formatTodayYmd()) => today <= date;
 exports.isSessionDateTodayOrFuture = isSessionDateTodayOrFuture;
+/** Unassigned shift or a shift with an open replace request — any employee may claim it. */
+const isOpenUserSession = (session) => session.userId == null || !!session.needReplace;
+exports.isOpenUserSession = isOpenUserSession;
+/**
+ * True when the actor is only claiming an open shift for themselves
+ * (assign userId / clear needReplace) without changing schedule fields.
+ */
+const isTakingOpenUserSession = (params) => {
+    const { session, dto, actorId } = params;
+    if (session.hold) {
+        return false;
+    }
+    if (!(0, exports.isOpenUserSession)(session)) {
+        return false;
+    }
+    if (dto.userId !== actorId) {
+        return false;
+    }
+    if (dto.hold === true) {
+        return false;
+    }
+    if (dto.start != null && dto.start !== session.start) {
+        return false;
+    }
+    if (dto.end != null && dto.end !== session.end) {
+        return false;
+    }
+    if (dto.locationId != null && dto.locationId !== session.locationId) {
+        return false;
+    }
+    if (dto.comment != null && (dto.comment ?? '') !== (session.comment ?? '')) {
+        return false;
+    }
+    return true;
+};
+exports.isTakingOpenUserSession = isTakingOpenUserSession;
 const formatTodayYmd = () => {
     const d = new Date();
     return `${d.getFullYear()}-${`${d.getMonth() + 1}`.padStart(2, '0')}-${`${d.getDate()}`.padStart(2, '0')}`;

package/dist/user-session-permissions.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/user-session-permissions.spec.js

@@ -0,0 +1,94 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const user_session_permissions_1 = require("./user-session-permissions");
+const openSession = {
+    hold: false,
+    userId: null,
+    needReplace: false,
+    start: '10:00',
+    end: '18:00',
+    locationId: 1,
+    comment: null,
+};
+describe('isOpenUserSession', () => {
+    it('is true when unassigned', () => {
+        expect((0, user_session_permissions_1.isOpenUserSession)({ userId: null, needReplace: false })).toBe(true);
+        expect((0, user_session_permissions_1.isOpenUserSession)({ userId: undefined, needReplace: false })).toBe(true);
+    });
+    it('is true when replace was requested', () => {
+        expect((0, user_session_permissions_1.isOpenUserSession)({ userId: 5, needReplace: true })).toBe(true);
+    });
+    it('is false for a normal assigned shift', () => {
+        expect((0, user_session_permissions_1.isOpenUserSession)({ userId: 5, needReplace: false })).toBe(false);
+    });
+});
+describe('isTakingOpenUserSession', () => {
+    it('allows any employee to claim an unassigned shift for themselves', () => {
+        expect((0, user_session_permissions_1.isTakingOpenUserSession)({
+            session: openSession,
+            dto: {
+                userId: 42,
+                needReplace: false,
+                start: '10:00',
+                end: '18:00',
+                locationId: 1,
+                comment: null,
+            },
+            actorId: 42,
+        })).toBe(true);
+    });
+    it('allows claiming a shift with an open replace request', () => {
+        expect((0, user_session_permissions_1.isTakingOpenUserSession)({
+            session: { ...openSession, userId: 7, needReplace: true },
+            dto: {
+                userId: 42,
+                needReplace: false,
+                start: '10:00',
+                end: '18:00',
+                locationId: 1,
+            },
+            actorId: 42,
+        })).toBe(true);
+    });
+    it('rejects claiming for another employee', () => {
+        expect((0, user_session_permissions_1.isTakingOpenUserSession)({
+            session: openSession,
+            dto: { userId: 99, start: '10:00', end: '18:00', locationId: 1 },
+            actorId: 42,
+        })).toBe(false);
+    });
+    it('rejects locked shifts', () => {
+        expect((0, user_session_permissions_1.isTakingOpenUserSession)({
+            session: { ...openSession, hold: true },
+            dto: { userId: 42, start: '10:00', end: '18:00', locationId: 1 },
+            actorId: 42,
+        })).toBe(false);
+    });
+    it('rejects when schedule fields change alongside the claim', () => {
+        expect((0, user_session_permissions_1.isTakingOpenUserSession)({
+            session: openSession,
+            dto: { userId: 42, start: '11:00', end: '18:00', locationId: 1 },
+            actorId: 42,
+        })).toBe(false);
+    });
+    it('rejects already assigned shifts without replace request', () => {
+        expect((0, user_session_permissions_1.isTakingOpenUserSession)({
+            session: { ...openSession, userId: 7, needReplace: false },
+            dto: { userId: 42, start: '10:00', end: '18:00', locationId: 1 },
+            actorId: 42,
+        })).toBe(false);
+    });
+});
+describe('getUserSessionEditDenial', () => {
+    it('still requires author for non-manager edit of someone else\'s unassigned shift', () => {
+        expect((0, user_session_permissions_1.getUserSessionEditDenial)({
+            session: { hold: false, authorId: 1, date: '2099-01-01' },
+            role: {
+                totalAccess: false,
+                canEditWorkedHours: false,
+                canEditOwnWorkedHours: true,
+            },
+            userId: 42,
+        })).toBe(user_session_permissions_1.USER_SESSION_ERRORS_EN.notShiftAuthor);
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@escapenavigator/utils",
-  "version": "2.0.33",
+  "version": "2.0.34",
   "publishConfig": {
     "access": "public"
   },
@@ -14,7 +14,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@escapenavigator/types": "^2.0.31",
+    "@escapenavigator/types": "^2.0.32",
     "axios": "^0.21.4",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.13.2",
@@ -29,5 +29,5 @@
     "ts-jest": "^29.1.1",
     "typescript": "^5.6"
   },
-  "gitHead": "c70307e434bfcba7595d6b2ed88c6b85b3114021"
+  "gitHead": "e7c356a5eb4bdb5d606be29aa0e8571073d0c531"
 }