@loomcore/api 0.0.37 → 0.0.39

package/dist/__tests__/common-test.utils.d.ts

@@ -32,10 +32,12 @@ export interface IProduct extends IEntity, IAuditable {
     category?: ICategory;
 }
 export declare const CategorySchema: import("@sinclair/typebox").TObject<{
+    _id: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     name: import("@sinclair/typebox").TString;
 }>;
 export declare const CategorySpec: import("@loomcore/common/models").IModelSpec<import("@sinclair/typebox").TSchema>;
 export declare const ProductSchema: import("@sinclair/typebox").TObject<{
+    _id: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     name: import("@sinclair/typebox").TString;
     description: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     internalNumber: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;

package/dist/__tests__/common-test.utils.js

@@ -2,6 +2,7 @@ import { ObjectId } from 'mongodb';
 import crypto from 'crypto';
 import jwt from 'jsonwebtoken';
 import { Type } from '@sinclair/typebox';
+import { TypeboxObjectId } from '@loomcore/common/validation';
 import { JwtService } from '../services/jwt.service.js';
 import { passwordUtils } from '../utils/password.utils.js';
 import { AuthService } from '../services/auth.service.js';
@@ -174,14 +175,16 @@ function verifyToken(token) {
     return JwtService.verify(token, JWT_SECRET);
 }
 export const CategorySchema = Type.Object({
+    _id: Type.Optional(TypeboxObjectId()),
     name: Type.String(),
 });
 export const CategorySpec = entityUtils.getModelSpec(CategorySchema);
 export const ProductSchema = Type.Object({
+    _id: Type.Optional(TypeboxObjectId()),
     name: Type.String(),
     description: Type.Optional(Type.String()),
     internalNumber: Type.Optional(Type.String()),
-    categoryId: Type.String({ format: 'objectid' }),
+    categoryId: TypeboxObjectId({ title: 'Category ID' }),
 });
 export const ProductSpec = entityUtils.getModelSpec(ProductSchema, { isAuditable: true });
 export const PublicProductSchema = Type.Omit(ProductSpec.fullSchema, ['internalNumber']);

package/dist/services/generic-api.service.js

@@ -195,6 +195,16 @@ export class GenericApiService {
         const entities = await this.onBeforeUpdate(userContext, preparedEntities);
         const operations = [];
         const entityIds = [];
+        console.log('--- DIAGNOSTICS: Entities received in batchUpdate ---');
+        entities.forEach((entity, index) => {
+            const entityWithId = entity;
+            if (entityWithId && entityWithId._id) {
+                console.log(`  [${index}]: ID is ${entityWithId._id.toString()}, Type is ${entityWithId._id.constructor.name}`);
+            }
+            else {
+                console.log(`  [${index}]: Entity has no _id or is null.`);
+            }
+        });
         for (const entity of entities) {
             const { _id, ...updateData } = entity;
             if (!_id || !(_id instanceof ObjectId)) {
@@ -407,12 +417,29 @@ export class GenericApiService {
         }
         let cleanedEntity = preparedEntity;
         if (this.modelSpec) {
+            let entityId = null;
+            if (allowId) {
+                console.log(`_id is present and equals ${preparedEntity._id}`);
+                entityId = preparedEntity._id;
+            }
             cleanedEntity = this.modelSpec.decode(preparedEntity);
+            if (allowId && entityId) {
+                console.log(`after decode, restoring _id to ${entityId}`);
+                cleanedEntity._id = entityId;
+            }
         }
         if (!this.modelSpec?.fullSchema) {
             throw new ServerError(`Cannot prepare entity: No model specification with schema provided for ${this.pluralResourceName}`);
         }
-        return dbUtils.convertStringsToObjectIds(cleanedEntity, this.modelSpec.fullSchema);
+        const finalEntity = dbUtils.convertStringsToObjectIds(cleanedEntity, this.modelSpec.fullSchema);
+        const finalEntityWithId = finalEntity;
+        if (finalEntityWithId && finalEntityWithId._id) {
+            console.log(`--- DIAGNOSTICS: In prepareEntity, after conversion, ID is ${finalEntityWithId._id.toString()}, Type is ${finalEntityWithId._id.constructor.name} ---`);
+        }
+        else {
+            console.log('--- DIAGNOSTICS: In prepareEntity, after conversion, entity has no _id or is null. ---');
+        }
+        return finalEntity;
     }
     prepareQuery(userContext, query) {
         return query;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loomcore/api",
-  "version": "0.0.37",
+  "version": "0.0.39",
   "private": false,
   "description": "Loom Core Api - An opinionated Node.js api using Typescript, Express, and MongoDb",
   "scripts": {