@managemint-solutions/sdk 0.45.0 → 0.50.0

package/dist/users/dto.js

@@ -94,6 +94,8 @@ class GetUsersQueryDto {
     page_size = 10;
     // Comma-joined booleans on the wire, e.g. "true,false". Absent = all users.
     active_in;
+    // Still v4: a manager is a `users.mms_id`, which is the GoTrue auth uid (see UserIdDto).
+    manager_id;
 }
 exports.GetUsersQueryDto = GetUsersQueryDto;
 __decorate([
@@ -126,6 +128,12 @@ __decorate([
     (0, class_validator_1.IsBoolean)({ each: true, message: 'Active filter values must be booleans' }),
     __metadata("design:type", Object)
 ], GetUsersQueryDto.prototype, "active_in", void 0);
+__decorate([
+    (0, class_validator_1.IsOptional)(),
+    (0, validators_1.IsNullable)(),
+    (0, class_validator_1.IsUUID)('4', { message: 'Invalid manager ID format' }),
+    __metadata("design:type", Object)
+], GetUsersQueryDto.prototype, "manager_id", void 0);
 class UpdateUserDto {
     name;
     surname;
@@ -138,6 +146,7 @@ class UpdateUserDto {
     job_title;
     manager_id;
     secondary_manager_id;
+    working_days;
     social_facebook;
     social_linkedin;
     social_twitter;
@@ -216,6 +225,17 @@ __decorate([
     (0, class_validator_1.IsUUID)('4', { message: 'Invalid secondary manager ID format' }),
     __metadata("design:type", Object)
 ], UpdateUserDto.prototype, "secondary_manager_id", void 0);
+__decorate([
+    (0, class_validator_1.IsOptional)(),
+    (0, class_validator_1.IsArray)({ message: 'Working days must be a list of weekdays' }),
+    (0, class_validator_1.ArrayMinSize)(1, { message: 'Choose at least one working day' }),
+    (0, class_validator_1.ArrayMaxSize)(7, { message: 'A week has seven days' }),
+    (0, class_validator_1.ArrayUnique)({ message: 'Each working day may appear once' }),
+    (0, class_validator_1.IsInt)({ each: true, message: 'Working days are weekday numbers' }),
+    (0, class_validator_1.Min)(1, { each: true, message: 'Working days run from 1 (Monday) to 7 (Sunday)' }),
+    (0, class_validator_1.Max)(7, { each: true, message: 'Working days run from 1 (Monday) to 7 (Sunday)' }),
+    __metadata("design:type", Array)
+], UpdateUserDto.prototype, "working_days", void 0);
 __decorate([
     (0, class_validator_1.IsOptional)(),
     (0, validators_1.EmptyToNull)(),

package/dist/users/index.d.ts

@@ -5,6 +5,13 @@ import type { TypedSupabaseClient } from '../client';
 import type { GetUsersQueryDto } from './dto';
 export * from './dto';
 export * from './paths';
+/** What leave needs to know about someone's employment. Dates are Johannesburg calendar dates. */
+export type UserEmploymentRow = UserIdentity & {
+    active: boolean;
+    start_date: string;
+    end_date: string | null;
+    working_days: number[];
+};
 /** The full users row. The api resolves its manager/created_by/last_updated_by ids into identities. */
 export type UserRow = Record<string, unknown> & {
     mms_id: string;
@@ -33,8 +40,11 @@ export declare class UsersResource {
      * `active` is not consulted: a deactivated report's history stays visible to their manager.
      */
     idsManagedBy(managerId: string): Promise<string[]>;
-    /** The ids of every active member - who the leave rollover grants a new period to. */
-    activeIds(): Promise<string[]>;
+    /**
+     * Employment details for leave: start and end as calendar dates in Johannesburg (the columns
+     * are timestamps), and the working week. Everyone in the organization, or just `userIds`.
+     */
+    employment(userIds?: string[]): Promise<UserEmploymentRow[]>;
     /** Seats in use. Counts rows rather than fetching them. */
     activeCount(): Promise<number>;
     isActive(userId: string): Promise<boolean>;

package/dist/users/index.js

@@ -16,6 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UsersResource = void 0;
 const enum_1 = require("@managemint-solutions/entities/audit-trail/enum");
+const working_days_1 = require("../leave/working-days");
 const audit_1 = require("../audit");
 const errors_1 = require("../errors");
 const paths_1 = require("../supporting-files/paths");
@@ -58,6 +59,10 @@ class UsersResource {
         if (trimmedSearch) {
             usersQuery = usersQuery.or((0, transforms_1.orIlike)(['name', 'surname', 'email'], trimmedSearch));
         }
+        // Either manager line, as `idsManagedBy` reads it. PostgREST ANDs this with the search.
+        if (query.manager_id) {
+            usersQuery = usersQuery.or(`manager_id.eq.${query.manager_id},secondary_manager_id.eq.${query.manager_id}`);
+        }
         const { data, error, count } = await usersQuery;
         if (error)
             throw (0, errors_1.mapPostgrestError)(error);
@@ -107,16 +112,26 @@ class UsersResource {
             throw (0, errors_1.mapPostgrestError)(error);
         return (data ?? []).map((row) => row.mms_id);
     }
-    /** The ids of every active member - who the leave rollover grants a new period to. */
-    async activeIds() {
-        const { data, error } = await this.supabase
+    /**
+     * Employment details for leave: start and end as calendar dates in Johannesburg (the columns
+     * are timestamps), and the working week. Everyone in the organization, or just `userIds`.
+     */
+    async employment(userIds) {
+        let employmentQuery = this.supabase
             .from('users')
-            .select('mms_id')
-            .eq('organization_id', this.auth.organization_id)
-            .eq('active', true);
+            .select('mms_id, name, surname, email, profile_image, active, start_date, end_date, working_days')
+            .eq('organization_id', this.auth.organization_id);
+        if (userIds) {
+            employmentQuery = employmentQuery.in('mms_id', userIds);
+        }
+        const { data, error } = await employmentQuery;
         if (error)
             throw (0, errors_1.mapPostgrestError)(error);
-        return (data ?? []).map((row) => row.mms_id);
+        return (data ?? []).map((row) => ({
+            ...row,
+            start_date: (0, working_days_1.todayInJohannesburg)(new Date(row.start_date)),
+            end_date: row.end_date ? (0, working_days_1.todayInJohannesburg)(new Date(row.end_date)) : null,
+        }));
     }
     /** Seats in use. Counts rows rather than fetching them. */
     async activeCount() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@managemint-solutions/sdk",
-  "version": "0.45.0",
+  "version": "0.50.0",
   "description": "Typed Supabase data-access SDK for ManageMint Solutions",
   "license": "UNLICENSED",
   "author": "Scott Bebington <scottbebington@gmail.com>",
@@ -51,7 +51,7 @@
     "testEnvironment": "node"
   },
   "dependencies": {
-    "@managemint-solutions/entities": "^1.28.0"
+    "@managemint-solutions/entities": "^1.33.0"
   },
   "peerDependencies": {
     "@nestjs/common": "^11.0.0",