@tstdl/base 0.92.130 → 0.92.131

package/document-management/server/drizzle/meta/_journal.json

@@ -5,15 +5,8 @@
     {
       "idx": 0,
       "version": "7",
-      "when": 1741038401158,
-      "tag": "0000_cool_victor_mancha",
-      "breakpoints": true
-    },
-    {
-      "idx": 1,
-      "version": "7",
-      "when": 1741944761924,
-      "tag": "0001_concerned_quentin_quire",
+      "when": 1747907526660,
+      "tag": "0000_magical_madame_hydra",
       "breakpoints": true
     }
   ]

package/document-management/server/index.d.ts

@@ -1,3 +1,4 @@
+export * from './api/index.js';
 export * from './module.js';
 export * as schemas from './schemas.js';
 export * from './services/index.js';

package/document-management/server/index.js

@@ -1,3 +1,4 @@
+export * from './api/index.js';
 export * from './module.js';
 export * as schemas from './schemas.js';
 export * from './services/index.js';

package/document-management/server/schemas.d.ts

@@ -1,4 +1,4 @@
-import { Document, DocumentAssignmentScope, DocumentAssignmentTask, DocumentCategory, DocumentCollection, DocumentCollectionAssignment, DocumentFile, DocumentProperty, DocumentPropertyValue, DocumentRequest, DocumentRequestCollection, DocumentRequestsTemplate, DocumentRequestSubmission, DocumentRequestTemplate, DocumentType, DocumentTypeProperty, DocumentTypeValidation, DocumentValidationDefinition, DocumentValidationExecution, DocumentValidationExecutionRelatedDocument, DocumentWorkflow } from '../models/index.js';
+import { Document, DocumentAssignmentScope, DocumentAssignmentTask, DocumentCategory, DocumentCollection, DocumentCollectionAssignment, DocumentFile, DocumentProperty, DocumentPropertyValue, DocumentRequest, DocumentRequestCollectionAssignment, DocumentRequestsTemplate, DocumentRequestSubmission, DocumentRequestTemplate, DocumentType, DocumentTypeProperty, DocumentTypeValidation, DocumentValidationDefinition, DocumentValidationExecution, DocumentValidationExecutionRelatedDocument, DocumentWorkflow } from '../models/index.js';
 export declare const documentManagementSchema: import("../../orm/server/database-schema.js").DatabaseSchema<"document_management">;
 export declare const aocumentApproval: import("drizzle-orm/pg-core").PgEnum<["pending", "approved", "rejected"]>;
 export declare const documentAssignmentCollectionTarget: import("drizzle-orm/pg-core").PgEnum<["request", "collection"]>;
@@ -6,6 +6,7 @@ export declare const documentPropertyDataType: import("drizzle-orm/pg-core").PgE
 export declare const documentRequestState: import("drizzle-orm/pg-core").PgEnum<["open", "closed", "fulfilled"]>;
 export declare const documentValidationExecutionState: import("drizzle-orm/pg-core").PgEnum<["pending", "error", "running", "completed"]>;
 export declare const documentValidationResultStatus: import("drizzle-orm/pg-core").PgEnum<["warning", "failed", "passed"]>;
+export declare const documentWorkflowFailReason: import("drizzle-orm/pg-core").PgEnum<["no-suitable-collection", "no-suitable-request"]>;
 export declare const documentWorkflowState: import("drizzle-orm/pg-core").PgEnum<["pending", "error", "running", "completed", "failed"]>;
 export declare const documentWorkflowStep: import("drizzle-orm/pg-core").PgEnum<["classification", "extraction", "assignment", "validation"]>;
 export declare const document: import("../../orm/server/types.js").PgTableFromType<typeof Document, "document_management">;
@@ -18,7 +19,7 @@ export declare const documentFile: import("../../orm/server/types.js").PgTableFr
 export declare const documentProperty: import("../../orm/server/types.js").PgTableFromType<typeof DocumentProperty, "document_management">;
 export declare const documentPropertyValue: import("../../orm/server/types.js").PgTableFromType<typeof DocumentPropertyValue, "document_management">;
 export declare const documentRequest: import("../../orm/server/types.js").PgTableFromType<typeof DocumentRequest, "document_management">;
-export declare const documentRequestCollection: import("../../orm/server/types.js").PgTableFromType<typeof DocumentRequestCollection, "document_management">;
+export declare const documentRequestCollectionAssignment: import("../../orm/server/types.js").PgTableFromType<typeof DocumentRequestCollectionAssignment, "document_management">;
 export declare const documentRequestsTemplate: import("../../orm/server/types.js").PgTableFromType<typeof DocumentRequestsTemplate, "document_management">;
 export declare const documentRequestSubmission: import("../../orm/server/types.js").PgTableFromType<typeof DocumentRequestSubmission, "document_management">;
 export declare const documentRequestTemplate: import("../../orm/server/types.js").PgTableFromType<typeof DocumentRequestTemplate, "document_management">;

package/document-management/server/schemas.js

@@ -1,5 +1,5 @@
 import { databaseSchema } from '../../orm/server/database-schema.js';
-import { Document, DocumentApproval, DocumentAssignmentScope, DocumentAssignmentTarget, DocumentAssignmentTask, DocumentCategory, DocumentCollection, DocumentCollectionAssignment, DocumentFile, DocumentProperty, DocumentPropertyDataType, DocumentPropertyValue, DocumentRequest, DocumentRequestCollection, DocumentRequestState, DocumentRequestsTemplate, DocumentRequestSubmission, DocumentRequestTemplate, DocumentType, DocumentTypeProperty, DocumentTypeValidation, DocumentValidationDefinition, DocumentValidationExecution, DocumentValidationExecutionRelatedDocument, DocumentValidationExecutionState, DocumentValidationResultStatus, DocumentWorkflow, DocumentWorkflowState, DocumentWorkflowStep } from '../models/index.js';
+import { Document, DocumentApproval, DocumentAssignmentScope, DocumentAssignmentTarget, DocumentAssignmentTask, DocumentCategory, DocumentCollection, DocumentCollectionAssignment, DocumentFile, DocumentProperty, DocumentPropertyDataType, DocumentPropertyValue, DocumentRequest, DocumentRequestCollectionAssignment, DocumentRequestState, DocumentRequestsTemplate, DocumentRequestSubmission, DocumentRequestTemplate, DocumentType, DocumentTypeProperty, DocumentTypeValidation, DocumentValidationDefinition, DocumentValidationExecution, DocumentValidationExecutionRelatedDocument, DocumentValidationExecutionState, DocumentValidationResultStatus, DocumentWorkflow, DocumentWorkflowFailReason, DocumentWorkflowState, DocumentWorkflowStep } from '../models/index.js';
 export const documentManagementSchema = databaseSchema('document_management');
 export const aocumentApproval = documentManagementSchema.getEnum(DocumentApproval);
 export const documentAssignmentCollectionTarget = documentManagementSchema.getEnum(DocumentAssignmentTarget);
@@ -7,6 +7,7 @@ export const documentPropertyDataType = documentManagementSchema.getEnum(Documen
 export const documentRequestState = documentManagementSchema.getEnum(DocumentRequestState);
 export const documentValidationExecutionState = documentManagementSchema.getEnum(DocumentValidationExecutionState);
 export const documentValidationResultStatus = documentManagementSchema.getEnum(DocumentValidationResultStatus);
+export const documentWorkflowFailReason = documentManagementSchema.getEnum(DocumentWorkflowFailReason);
 export const documentWorkflowState = documentManagementSchema.getEnum(DocumentWorkflowState);
 export const documentWorkflowStep = documentManagementSchema.getEnum(DocumentWorkflowStep);
 export const document = documentManagementSchema.getTable(Document);
@@ -19,7 +20,7 @@ export const documentFile = documentManagementSchema.getTable(DocumentFile);
 export const documentProperty = documentManagementSchema.getTable(DocumentProperty);
 export const documentPropertyValue = documentManagementSchema.getTable(DocumentPropertyValue);
 export const documentRequest = documentManagementSchema.getTable(DocumentRequest);
-export const documentRequestCollection = documentManagementSchema.getTable(DocumentRequestCollection);
+export const documentRequestCollectionAssignment = documentManagementSchema.getTable(DocumentRequestCollectionAssignment);
 export const documentRequestsTemplate = documentManagementSchema.getTable(DocumentRequestsTemplate);
 export const documentRequestSubmission = documentManagementSchema.getTable(DocumentRequestSubmission);
 export const documentRequestTemplate = documentManagementSchema.getTable(DocumentRequestTemplate);

package/document-management/server/services/document-category-type.service.d.ts

@@ -4,6 +4,8 @@ import type { DocumentCategoryView } from '../../service-models/index.js';
 export declare const enumTypeKey = "enum-type";
 export declare class DocumentCategoryTypeService extends Transactional {
     #private;
+    readonly categoryRepository: import("../../../orm/server/repository.js").EntityRepository<DocumentCategory>;
+    readonly typeRepository: import("../../../orm/server/repository.js").EntityRepository<DocumentType>;
     loadCategory(id: string): Promise<DocumentCategory>;
     loadType(id: string): Promise<DocumentType>;
     createCategory(label: string, parentId: string | null, enumKey?: string): Promise<DocumentCategory>;

package/document-management/server/services/document-category-type.service.js

@@ -1,4 +1,11 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 var _a;
+var DocumentCategoryTypeService_1;
 import { inject } from '../../../injector/inject.js';
 import { Logger } from '../../../logger/logger.js';
 import { Transactional } from '../../../orm/server/index.js';
@@ -6,31 +13,32 @@ import { injectRepository } from '../../../orm/server/repository.js';
 import { groupToMap } from '../../../utils/iterable-helpers/group-to-map.js';
 import { isUndefined } from '../../../utils/type-guards.js';
 import { DocumentCategory, DocumentType } from '../../models/index.js';
+import { DocumentManagementSingleton } from './singleton.js';
 export const enumTypeKey = 'enum-type';
-export class DocumentCategoryTypeService extends Transactional {
-    #documentCategoryRepository = injectRepository(DocumentCategory);
-    #documentTypeRepository = injectRepository(DocumentType);
-    #logger = inject(Logger, _a.name);
+let DocumentCategoryTypeService = DocumentCategoryTypeService_1 = class DocumentCategoryTypeService extends Transactional {
+    #logger = inject(Logger, DocumentCategoryTypeService_1.name);
+    categoryRepository = injectRepository(DocumentCategory);
+    typeRepository = injectRepository(DocumentType);
     async loadCategory(id) {
-        return this.#documentCategoryRepository.load(id);
+        return this.categoryRepository.load(id);
     }
     async loadType(id) {
-        return this.#documentTypeRepository.load(id);
+        return this.typeRepository.load(id);
     }
     async createCategory(label, parentId, enumKey) {
-        return this.#documentCategoryRepository.insert({ label, parentId, metadata: { attributes: { [enumTypeKey]: enumKey } } });
+        return this.categoryRepository.insert({ label, parentId, metadata: { attributes: { [enumTypeKey]: enumKey } } });
     }
     async createType(label, categoryId, enumKey) {
-        return this.#documentTypeRepository.insert({ label, categoryId, metadata: { attributes: { [enumTypeKey]: enumKey } } });
+        return this.typeRepository.insert({ label, categoryId, metadata: { attributes: { [enumTypeKey]: enumKey } } });
     }
     async updateCategory(id, update) {
-        return this.#documentCategoryRepository.update(id, update);
+        return this.categoryRepository.update(id, update);
     }
     async updateType(id, update) {
-        return this.#documentTypeRepository.update(id, update);
+        return this.typeRepository.update(id, update);
     }
     async loadCategoryGraph(categoryId) {
-        const category = await this.#documentCategoryRepository.load(categoryId);
+        const category = await this.categoryRepository.load(categoryId);
         if (category.parentId == null) {
             return [category];
         }
@@ -39,8 +47,8 @@ export class DocumentCategoryTypeService extends Transactional {
     }
     async loadCategoriesAndTypes() {
         const [categories, types] = await Promise.all([
-            this.#documentCategoryRepository.loadManyByQuery({}, { order: 'label' }),
-            this.#documentTypeRepository.loadManyByQuery({}, { order: 'label' }),
+            this.categoryRepository.loadManyByQuery({}, { order: 'label' }),
+            this.typeRepository.loadManyByQuery({}, { order: 'label' }),
         ]);
         return { categories, types };
     }
@@ -54,8 +62,11 @@ export class DocumentCategoryTypeService extends Transactional {
         }
         return rootCategories.map((category) => getView(category, categoryChildrenMap, categoryTypesMap));
     }
-}
-_a = DocumentCategoryTypeService;
+};
+DocumentCategoryTypeService = DocumentCategoryTypeService_1 = __decorate([
+    DocumentManagementSingleton()
+], DocumentCategoryTypeService);
+export { DocumentCategoryTypeService };
 function getView(category, categoryChildrenMap, categoryTypesMap) {
     const childCategories = categoryChildrenMap.get(category.id) ?? [];
     return {

package/document-management/server/services/document-collection.service.js

@@ -1,3 +1,9 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 import { and, eq, sql } from 'drizzle-orm';
 import { TRANSACTION_TIMESTAMP } from '../../../orm/index.js';
 import { Transactional } from '../../../orm/server/index.js';
@@ -5,7 +11,8 @@ import { injectRepository } from '../../../orm/server/repository.js';
 import { toArray } from '../../../utils/array/index.js';
 import { Document, DocumentCollection, DocumentCollectionAssignment } from '../../models/index.js';
 import { document, documentCollectionAssignment } from '../schemas.js';
-export class DocumentCollectionService extends Transactional {
+import { DocumentManagementSingleton } from './singleton.js';
+let DocumentCollectionService = class DocumentCollectionService extends Transactional {
     #documentRepository = injectRepository(Document);
     #documentCollectionAssignmentRepository = injectRepository(DocumentCollectionAssignment);
     repository = injectRepository(DocumentCollection);
@@ -38,4 +45,8 @@ export class DocumentCollectionService extends Transactional {
     async archiveDocument(documentId, collectionIds) {
         await this.#documentCollectionAssignmentRepository.withSession(this.session).updateManyByQuery({ collectionId: { $in: toArray(collectionIds) }, documentId, archiveTimestamp: null }, { archiveTimestamp: TRANSACTION_TIMESTAMP });
     }
-}
+};
+DocumentCollectionService = __decorate([
+    DocumentManagementSingleton()
+], DocumentCollectionService);
+export { DocumentCollectionService };

package/document-management/server/services/document-file.service.js

@@ -1,3 +1,9 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
     if (value !== null && value !== void 0) {
         if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
@@ -51,6 +57,7 @@ var __disposeResources = (this && this.__disposeResources) || (function (Suppres
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 });
 var _a;
+var DocumentFileService_1;
 import sharp, {} from 'sharp';
 import { match } from 'ts-pattern';
 import { AiService } from '../../../ai/ai.service.js';
@@ -70,13 +77,14 @@ import { isDefined, isUint8Array } from '../../../utils/type-guards.js';
 import { millisecondsPerMinute } from '../../../utils/units.js';
 import { Document, DocumentFile } from '../../models/index.js';
 import { DocumentManagementConfig } from '../module.js';
-export class DocumentFileService extends Transactional {
+import { DocumentManagementSingleton } from './singleton.js';
+let DocumentFileService = DocumentFileService_1 = class DocumentFileService extends Transactional {
     #documentFileRepository = injectRepository(DocumentFile);
     #documentRepository = injectRepository(Document);
     #aiService = inject(AiService);
     #fileObjectStorage = inject(ObjectStorage, inject(DocumentManagementConfig).fileObjectStorageModule);
     #filePreviewObjectStorage = inject(ObjectStorage, inject(DocumentManagementConfig).filePreviewObjectStorageModule);
-    #logger = inject(Logger, _a.name);
+    #logger = inject(Logger, DocumentFileService_1.name);
     #aiFilePartCache = new Map();
     async load(id) {
         return this.#documentFileRepository.load(id);
@@ -184,8 +192,11 @@ export class DocumentFileService extends Transactional {
             'Response-Content-Disposition': `${disposition}; filename = "${encodeURIComponent(filename)}"`,
         });
     }
-}
-_a = DocumentFileService;
+};
+DocumentFileService = DocumentFileService_1 = __decorate([
+    DocumentManagementSingleton()
+], DocumentFileService);
+export { DocumentFileService };
 function getDocumentFileKey(id) {
     return `${id.slice(0, 2)}/${id.slice(0, 4)}/${id}`;
 }

package/document-management/server/services/document-management-ai.service.js

@@ -1,3 +1,9 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
     if (value !== null && value !== void 0) {
         if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
@@ -51,6 +57,7 @@ var __disposeResources = (this && this.__disposeResources) || (function (Suppres
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 });
 var _a;
+var DocumentManagementAiService_1;
 import { and, isNull as drizzleIsNull, eq, inArray } from 'drizzle-orm';
 import { P, match } from 'ts-pattern';
 import { AiService } from '../../../ai/index.js';
@@ -65,12 +72,13 @@ import { dateObjectToNumericDate, numericDateToDateObject } from '../../../utils
 import { fromEntries, objectEntries } from '../../../utils/object/object.js';
 import { assertDefined, assertDefinedPass, assertNotNull, isNotNull, isNull, isUndefined } from '../../../utils/type-guards.js';
 import { Document, DocumentProperty, DocumentRequestState, DocumentTypeProperty } from '../../models/index.js';
-import { documentCategory, documentRequest, documentRequestCollection, documentType } from '../schemas.js';
+import { documentCategory, documentRequest, documentRequestCollectionAssignment, documentType } from '../schemas.js';
 import { DocumentCategoryTypeService } from './document-category-type.service.js';
 import { DocumentFileService } from './document-file.service.js';
 import { DocumentManagementAncillaryService } from './document-management-ancillary.service.js';
 import { DocumentPropertyService } from './document-property.service.js';
-export class DocumentManagementAiService {
+import { DocumentManagementSingleton } from './singleton.js';
+let DocumentManagementAiService = DocumentManagementAiService_1 = class DocumentManagementAiService {
     #documentManagementAncillaryService = inject(DocumentManagementAncillaryService);
     #documentCategoryTypeService = inject(DocumentCategoryTypeService);
     #documentFileService = inject(DocumentFileService);
@@ -79,7 +87,7 @@ export class DocumentManagementAiService {
     #documentPropertyRepository = injectRepository(DocumentProperty);
     #documentRepository = injectRepository(Document);
     #documentTypePropertyRepository = injectRepository(DocumentTypeProperty);
-    #logger = inject(Logger, _a.name);
+    #logger = inject(Logger, DocumentManagementAiService_1.name);
     async classifyDocumentType(documentId) {
         const env_1 = { stack: [], error: void 0, hasError: false };
         try {
@@ -278,16 +286,16 @@ Ordne das Dokument unter "document" einer oder mehreren passenden Collection unt
         const openRequestsWithoutDocument = await session
             .select({
             id: documentRequest.id,
-            collectionIds: arrayAgg(documentRequestCollection.collectionId),
+            collectionIds: arrayAgg(documentRequestCollectionAssignment.collectionId),
             documentCategory: documentCategory.label,
             documentType: documentType.label,
             comment: documentRequest.comment,
         })
             .from(documentRequest)
-            .innerJoin(documentRequestCollection, eq(documentRequestCollection.requestId, documentRequest.id))
+            .innerJoin(documentRequestCollectionAssignment, eq(documentRequestCollectionAssignment.requestId, documentRequest.id))
             .innerJoin(documentType, eq(documentType.id, documentRequest.typeId))
             .innerJoin(documentCategory, eq(documentCategory.id, documentType.categoryId))
-            .where(and(inArray(documentRequestCollection.collectionId, collectionIds), eq(documentRequest.typeId, document.typeId), eq(documentRequest.state, DocumentRequestState.Open), drizzleIsNull(documentRequest.documentId)))
+            .where(and(inArray(documentRequestCollectionAssignment.collectionId, collectionIds), eq(documentRequest.typeId, document.typeId), eq(documentRequest.state, DocumentRequestState.Open), drizzleIsNull(documentRequest.documentId)))
             .groupBy(documentRequest.id, documentCategory.label, documentType.label, documentRequest.comment);
         const requestsCollectionIds = distinct(openRequestsWithoutDocument.flatMap((request) => request.collectionIds));
         const collectionNamesMap = await this.#documentManagementAncillaryService.resolveMetadataMap(...requestsCollectionIds);
@@ -333,8 +341,11 @@ Ordne das Dokument unter "document" der passenden Anforderungen unter "requests"
         });
         return result.json.requestId;
     }
-}
-_a = DocumentManagementAiService;
+};
+DocumentManagementAiService = DocumentManagementAiService_1 = __decorate([
+    DocumentManagementSingleton()
+], DocumentManagementAiService);
+export { DocumentManagementAiService };
 function getDescriptiveTypeLabels(categories, prefix = 'Category: ') {
     return categories.flatMap((category) => [...category.types.map((type) => ({ id: type.id, label: `${prefix}${category.label} | Type: ${type.label}` }), ...getDescriptiveTypeLabels(category.children, `${prefix}${category.label} -> `))]);
 }

package/document-management/server/services/document-management-ancillary.service.d.ts

@@ -19,12 +19,19 @@ export declare abstract class DocumentManagementAncillaryService<Token = unknown
         [K in keyof T]: DocumentCollectionMetadata;
     }>;
     resolveMetadataMap(...collectionsOrIds: (DocumentCollection | string)[]): Promise<Record<string, DocumentCollectionMetadata>>;
+    canReadDocument(documentId: string, token?: Token): Promise<boolean>;
+    canManageRequest(requestId: string, token?: Token): Promise<boolean>;
     /**
      * Resolves application-specific metadata for a list of document collections.
      * @param collections An array of DocumentCollection entities.
      * @returns A promise that resolves to an array of DocumentCollectionMetadata, corresponding to the input collections.
      */
     abstract _resolveMetadata(collections: DocumentCollection[]): DocumentCollectionMetadata[] | Promise<DocumentCollectionMetadata[]>;
+    /**
+     * Gets the user ID from the request token.
+     * @param token The token of the request
+     */
+    abstract getUserId(token?: Token): string | Promise<string>;
     /**
      * Checks if a user can read/view a specific document collection and its documents.
      * @param collectionId The ID of the document collection.
@@ -32,13 +39,19 @@ export declare abstract class DocumentManagementAncillaryService<Token = unknown
      */
     abstract canReadCollection(collectionId: string, token?: Token): boolean | Promise<boolean>;
     /**
-     * Checks if a user can write to/modify a specific document collection.
-     * This could include changing collection metadata or managing documents within it,
-     * such as adding documents or creating document requests for this collection.
+     * Checks if a user can create new *unassigned* documents (lands in "inbox", which then require assigning to request/collection) in a specific collection.
      * @param collectionId The ID of the document collection.
-     * @param token The token of the request
+     * @param token The token of the request.
      */
-    abstract canWriteCollection(collectionId: string, token?: Token): boolean | Promise<boolean>;
+    abstract canCreateDocuments(collectionId: string, token?: Token): boolean | Promise<boolean>;
+    abstract canUpdateDocuments(collectionId: string, token?: Token): boolean | Promise<boolean>;
+    abstract canDeleteDocuments(collectionId: string, token?: Token): boolean | Promise<boolean>;
+    /**
+     * Checks if a user can assign documents to requests in the collection or directly to the collection.
+     * @param collectionId The ID of the document collection.
+     * @param token The token of the request.
+     */
+    abstract canAssignDocuments(collectionId: string, token?: Token): boolean | Promise<boolean>;
     /**
      * Checks if a user can approve a specific document. This implicitly allows fulfilling document requests by approving their linked document.
      * This is usually a privileged action for staff members.
@@ -56,20 +69,11 @@ export declare abstract class DocumentManagementAncillaryService<Token = unknown
      */
     abstract canRejectDocument(documentId: string, token?: Token): boolean | Promise<boolean>;
     /**
-     * Checks if a user can read/view a specific document request.
-     * @param requestId The ID of the document request.
-     * @param token The token of the request
-     */
-    abstract canReadDocumentRequest(requestId: string, token?: Token): boolean | Promise<boolean>;
-    /**
-     * Checks if a user can assign an existing document to a document request.
-     * This links the document to the request, usually before final fulfillment.
-     * @param requestId The ID of the document request.
-     * @param documentId The ID of the document to be assigned.
+     * Checks if a user can create, update, delete requests and assign documents to them in a collection.
+     * @param collectionId The ID of the document collection.
      * @param token The token of the request
-     * @returns A promise that resolves to true if assignment is allowed, false otherwise.
      */
-    abstract canAssignDocumentToRequest(requestId: string, documentId: string, token?: Token): boolean | Promise<boolean>;
+    abstract canManageRequests(collectionId: string, token?: Token): boolean | Promise<boolean>;
     /**
      * Checks if a user can manage document categories, types and their properties (create, update, delete).
      * Typically an administrator function.
@@ -87,29 +91,6 @@ export declare abstract class DocumentManagementAncillaryService<Token = unknown
      * @param token The token of the request.
      */
     abstract canManageDocumentRequestsTemplates(token?: Token): boolean | Promise<boolean>;
-    /**
-     * Checks if a user can create/upload a new unassigned document (which then requires assigning to request/collection).
-     * @param token The token of the request.
-     */
-    abstract canCreateUnassignedDocument(token?: Token): boolean | Promise<boolean>;
-    /**
-     * Checks if a user can create/upload a new document assigned to an request.
-     * @param token The token of the request.
-     */
-    abstract canCreateRequestAssignedDocument(token?: Token): boolean | Promise<boolean>;
-    /**
-     * Checks if a user can delete a document.
-     * This might be restricted (e.g., only for documents not yet approved, or by administrators).
-     * @param documentId The ID of the document.
-     * @param token The token of the request.
-     * @returns A promise that resolves to true if deletion is allowed, false otherwise.
-     */
-    abstract canDeleteDocument(documentId: string, token?: Token): boolean | Promise<boolean>;
-    /**
-     * Checks if a user can create and close document requests.
-     * @param token The token of the request.
-     */
-    abstract canManageDocumentRequest(token?: Token): boolean | Promise<boolean>;
     /**
      * Checks if a user can manage document validation definitions and their assignment to types.
      * Typically an administrator function.

package/document-management/server/services/document-management-ancillary.service.js

@@ -1,16 +1,11 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-import { Singleton } from '../../../injector/index.js';
 import { injectRepository } from '../../../orm/server/index.js';
 import { fromEntries } from '../../../utils/object/index.js';
 import { assertDefinedPass, isString } from '../../../utils/type-guards.js';
-import { DocumentCollection } from '../../models/index.js';
-let DocumentManagementAncillaryService = class DocumentManagementAncillaryService {
+import { DocumentCollection, DocumentCollectionAssignment, DocumentRequestCollectionAssignment } from '../../models/index.js';
+export class DocumentManagementAncillaryService {
     #documentCollectionRepository = injectRepository(DocumentCollection);
+    #documentCollectionAssignmentRepository = injectRepository(DocumentCollectionAssignment);
+    #documentRequestCollectionAssignmentRepository = injectRepository(DocumentRequestCollectionAssignment);
     async resolveMetadata(...collectionsOrIds) {
         if (collectionsOrIds.length == 0) {
             return [];
@@ -30,8 +25,24 @@ let DocumentManagementAncillaryService = class DocumentManagementAncillaryServic
         const entries = collectionsOrIds.map((collectionOrId, index) => [isString(collectionOrId) ? collectionOrId : collectionOrId.id, names[index]]);
         return fromEntries(entries);
     }
-};
-DocumentManagementAncillaryService = __decorate([
-    Singleton()
-], DocumentManagementAncillaryService);
-export { DocumentManagementAncillaryService };
+    async canReadDocument(documentId, token) {
+        const assignments = await this.#documentCollectionAssignmentRepository.loadManyByQuery({ documentId });
+        for (const assignment of assignments) {
+            const canReadCollection = await this.canReadCollection(assignment.collectionId, token);
+            if (canReadCollection) {
+                return true;
+            }
+        }
+        return false;
+    }
+    async canManageRequest(requestId, token) {
+        const assignments = await this.#documentRequestCollectionAssignmentRepository.loadManyByQuery({ requestId });
+        for (const assignment of assignments) {
+            const canManageRequest = await this.canManageRequests(assignment.collectionId, token);
+            if (!canManageRequest) {
+                return false;
+            }
+        }
+        return true;
+    }
+}

package/document-management/server/services/document-management.service.d.ts

@@ -6,7 +6,7 @@ export declare class DocumentManagementService extends Transactional {
     #private;
     loadData(collectionIds: string[]): Promise<DocumentManagementData>;
     loadDocumentRequestsTemplateData(): Promise<DocumentRequestsTemplateData>;
-    initializeCategoriesAndTypes<CategoryKey extends string, TypeKey extends string>(categoryNames: Record<CategoryKey, string>, categoryParents: Record<CategoryKey, CategoryKey | null>, typeNames: Record<TypeKey, string>, typeCategories: Record<TypeKey, CategoryKey>): Promise<{
+    initializeCategoriesAndTypes<CategoryKey extends string, TypeKey extends string>(categoryLabels: Record<CategoryKey, string>, categoryParents: Record<CategoryKey, CategoryKey | null>, typeLabels: Record<TypeKey, string>, typeCategories: Record<TypeKey, CategoryKey>): Promise<{
         categories: Record<CategoryKey, DocumentCategory>;
         types: Record<TypeKey, DocumentType>;
     }>;