@fabriktor/fx 0.0.123 → 0.0.125

package/dist/src/payrolls/workspace.d.ts

@@ -1,5 +1,5 @@
 import type { BillableOperator, PayrollsOperator, QueryOptions } from "@fabriktor/client";
-import { ColPayrollsPayrolls, ColPayrollsHourBanks, ColPayrollsPayables, ColPayrollsAdjustments, ColPayrollsAdjustmentFolders, ColPayrollsPayConfigs, ColPayrollsEmployeePayConfigs, ColPayrollsAdjustmentRecords, ColPayrollsAdjustmentAggregates, ColPayrollsPayrollPrograms, type Payroll, type HourBank, type Payable, type Adjustment, type AdjustmentFolder, type PayConfig, type EmployeePayConfig, type AdjustmentRecord, type AdjustmentAggregate, type PayrollProgram, type InPayroll, type InAdjustment, type InAdjustmentFolder, type InPayConfig, type InEmployeePayConfig, type InPayrollProgram, type InAdjustmentAggregate, type PLPayrollsGeneratePayrollFromEntities, type InDate, type Period } from "@fabriktor/schema";
+import { ColPayrollsPayrolls, ColPayrollsHourBanks, ColPayrollsPayables, ColPayrollsAdjustments, ColPayrollsAdjustmentFolders, ColPayrollsPayConfigs, ColPayrollsEmployeePayConfigs, ColPayrollsAdjustmentRecords, ColPayrollsAdjustmentAggregates, ColPayrollsPayrollPrograms, type Payroll, type HourBank, type Payable, type Adjustment, type AdjustmentFolder, type PayConfig, type EmployeePayConfig, type AdjustmentRecord, type AdjustmentAggregate, type PayrollProgram, type InPayroll, type InAdjustment, type InAdjustmentFolder, type InPayConfig, type InEmployeePayConfig, type InPayrollProgram, type InAdjustmentAggregate, type PLPayrollsGeneratePayrollFromEntities, type InDate, type Period, type Folder } from "@fabriktor/schema";
 import type { EmploymentActor, EmploymentReadContext } from "../contacts/scope.js";
 import { type SearchOptions, type SearchPage } from "../core/search.js";
 import type { MultiCreateAttempt } from "../core/multi-create.js";
@@ -87,12 +87,12 @@ export declare const payrollPolicies: {
         report: boolean;
     };
     adjustment_folders: {
+        archive: false;
+        remove: true;
         filters: "is_archived"[];
         employee_read: boolean;
         searchable: boolean;
         create: boolean;
-        archive: boolean;
-        remove: boolean;
         report: boolean;
     };
     pay_configs: {
@@ -204,6 +204,7 @@ export declare class PayrollsWorkspace {
     private adjustments;
     private config;
     private validateCommand;
+    updateFolder(actor: EmploymentActor, id: string, input: Folder): Promise<AdjustmentFolder>;
     setArchived(actor: EmploymentActor, resource: PayrollResource, record: PayrollRecord, value: boolean): Promise<void>;
     setEnabled(actor: EmploymentActor, record: PayrollProgram, is_enabled: boolean): Promise<void>;
     remove(actor: EmploymentActor, resource: PayrollResource, record: PayrollRecord): Promise<void>;

package/dist/src/payrolls/workspace.js

@@ -1,6 +1,6 @@
 import { isHTTPClientErr } from "@fabriktor/client";
 import { ColPayrollsPayrolls, ColPayrollsHourBanks, ColPayrollsPayables, ColPayrollsAdjustments, ColPayrollsAdjustmentFolders, ColPayrollsPayConfigs, ColPayrollsEmployeePayConfigs, ColPayrollsAdjustmentRecords, ColPayrollsAdjustmentAggregates, ColPayrollsPayrollPrograms, UserTypeEmployer, UserTypeEmployee, AdjustmentTypeRate, AdjustmentTypePerHour, AdjustmentTypePerPeriod, PayTypeFixed, PayTypePerHour, RecurrenceTypeDaily, RecurrenceTypeWeekly, RecurrenceTypeMonthly, RecurrenceTypeYearly, } from "@fabriktor/schema";
-import { employmentCanRead, employmentCatalogOwnerIDs, } from "../contacts/scope.js";
+import { employmentCanRead, employmentCatalogOwnerIDs, employmentOwnsRecord, } from "../contacts/scope.js";
 import { normalizeIDs, requiredOperationID } from "../core/id.js";
 import { runOwnerScopeQuery } from "../core/query.js";
 import { runOwnerScopeSearch, emptySearchPage, } from "../core/search.js";
@@ -31,7 +31,7 @@ const catalog = {
     create: true,
     archive: true,
 };
-// The service README and record Rules() define this capability/filter table.
+// Service routes, record behavior and Rules() define this capability/filter table.
 // A generic CRUD method in the client is not permission to edit an immutable record.
 export const payrollPolicies = {
     [PayrollResource.Payrolls]: {
@@ -82,7 +82,12 @@ export const payrollPolicies = {
             "is_archived",
         ],
     },
-    [PayrollResource.Folders]: { ...catalog, filters: ["is_archived"] },
+    [PayrollResource.Folders]: {
+        ...catalog,
+        archive: false,
+        remove: true,
+        filters: ["is_archived"],
+    },
     [PayrollResource.PayConfigs]: {
         ...catalog,
         filters: ["type", "name", "currency", "is_archived"],
@@ -137,6 +142,9 @@ export const payrollRecurrenceTypes = [
 ];
 // record/config.go pctMoney uses basis.X100000. A displayed percentage is 100 times the fraction.
 export const payrollPercentageScale = 1000;
+// Validation and access denials reject these transactional generation requests.
+// A 409 can also come from idempotency middleware, so it cannot release a request.
+const payrollGenerationRejectionStatuses = [400, 403];
 export class PayrollWorkflowError extends Error {
     reason;
     constructor(reason) {
@@ -152,7 +160,7 @@ function requirePayroll(value, reason) {
 export function payrollCanManage(actor, record) {
     return (employmentCanRead(actor) &&
         actor.active_mode === UserTypeEmployer &&
-        (!record || record.owner_id === actor.owner_id));
+        (!record || employmentOwnsRecord(actor, record)));
 }
 export function payrollCanRead(actor, resource) {
     return (employmentCanRead(actor) &&
@@ -341,12 +349,13 @@ export class PayrollsWorkspace {
                     return p.insertOnePayrollProgram({ in: command.input, ...request });
             }
         })().catch((error) => {
-            // These three handlers roll back their transaction on validation failure.
-            // Other responses remain uncertain and retain request/source checkpoints.
-            const transactional = command.resource === PayrollResource.Payrolls ||
-                command.resource === PayrollResource.HourBanks ||
-                command.resource === PayrollResource.Payables;
-            if (transactional && isHTTPClientErr(error) && error.status === 400) {
+            // Generation from configurations, hour banks and payables returns a payroll.
+            // A rejection on retry does not settle an earlier ambiguous submission.
+            if (!previous &&
+                resource === PayrollResource.Payrolls &&
+                isHTTPClientErr(error) &&
+                error.status !== undefined &&
+                payrollGenerationRejectionStatuses.includes(error.status)) {
                 this.submitted.delete(attempt.idempotency_key);
                 for (const key of sourceKeys)
                     this.sourceRequests.delete(key);
@@ -479,6 +488,19 @@ export class PayrollsWorkspace {
                 break;
         }
     }
+    async updateFolder(actor, id, input) {
+        await this.owned(actor, PayrollResource.Folders, id);
+        const folder_name = input.folder_name.trim();
+        requirePayroll(folder_name, "invalid");
+        await this.payrolls.replaceOneAdjustmentFolder({
+            id,
+            in: {
+                folder_name,
+                folder_description: input.folder_description.trim(),
+            },
+        });
+        return this.owned(actor, PayrollResource.Folders, id);
+    }
     async setArchived(actor, resource, record, value) {
         requirePayroll(payrollCanManage(actor, record) && payrollPolicies[resource].archive, "access");
         await this.owned(actor, resource, record.id);
@@ -487,9 +509,6 @@ export class PayrollsWorkspace {
             case PayrollResource.Adjustments:
                 await this.payrolls.replaceOneAdjustment(opts);
                 break;
-            case PayrollResource.Folders:
-                await this.payrolls.replaceOneAdjustmentFolder(opts);
-                break;
             case PayrollResource.PayConfigs:
                 await this.payrolls.replaceOnePayConfig(opts);
                 break;
@@ -514,5 +533,7 @@ export class PayrollsWorkspace {
             await this.payrolls.deleteOnePayroll({ id: record.id });
         else if (resource === PayrollResource.Programs)
             await this.payrolls.deleteOnePayrollProgram({ id: record.id });
+        else if (resource === PayrollResource.Folders)
+            await this.payrolls.deleteOneAdjustmentFolder({ id: record.id });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fabriktor/fx",
-  "version": "0.0.123",
+  "version": "0.0.125",
   "description": "![Fabriktor Logo](./img/fabriktor-character.gif)",
   "type": "module",
   "exports": {