@loomcore/api 0.1.80 → 0.1.84

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

@@ -19,15 +19,18 @@ import { setBaseApiConfig, config } from '../config/index.js';
 import { entityUtils } from '@loomcore/common/utils';
 import { getTestMetaOrgUserPerson, getTestOrgUser, getTestOrgUserPerson, setTestMetaOrgUserPersonId, setTestOrgUserPersonId } from './test-objects.js';
 import { TestEmailClient } from './test-email-client.js';
+import { PersonService } from '../services/person.service.js';
 let deviceIdCookie;
 let authService;
 let organizationService;
+let personService;
 const JWT_SECRET = 'test-secret';
 const newUser1Email = 'one@test.com';
 const newUser1Password = 'testone';
 const constDeviceIdCookie = crypto.randomBytes(16).toString('hex');
 function initialize(database) {
     authService = new AuthService(database);
+    personService = new PersonService(database);
     organizationService = new OrganizationService(database);
     deviceIdCookie = constDeviceIdCookie;
 }
@@ -90,7 +93,7 @@ async function setupTestUsers() {
     }
 }
 async function createTestUsers() {
-    if (!authService || !organizationService) {
+    if (!authService || !organizationService || !personService) {
         throw new Error('Database not initialized. Call initialize() first.');
     }
     try {
@@ -110,15 +113,23 @@ async function createTestUsers() {
         else {
             setTestOrgId(existingTestOrg._id);
         }
-        const createdTestOrgUser = await authService.createUser(getTestOrgUserContext(), getTestOrgUser(), getTestOrgUserPerson());
-        const createdMetaOrgUser = await authService.createUser(getTestMetaOrgUserContext(), getTestMetaOrgUser(), getTestMetaOrgUserPerson());
+        const createdTestOrgUserPerson = await personService.create(getTestOrgUserContext(), getTestOrgUserPerson());
+        if (!createdTestOrgUserPerson) {
+            throw new Error('Failed to create test organization user person');
+        }
+        setTestOrgUserPersonId(createdTestOrgUserPerson._id);
+        const createdMetaOrgUserPerson = await personService.create(getTestMetaOrgUserContext(), getTestMetaOrgUserPerson());
+        if (!createdMetaOrgUserPerson) {
+            throw new Error('Failed to create meta organization user person');
+        }
+        setTestMetaOrgUserPersonId(createdMetaOrgUserPerson._id);
+        const createdTestOrgUser = await authService.createUser(getTestOrgUserContext(), getTestOrgUser());
+        const createdMetaOrgUser = await authService.createUser(getTestMetaOrgUserContext(), getTestMetaOrgUser());
         if (!createdTestOrgUser || !createdMetaOrgUser) {
             throw new Error('Failed to create test user');
         }
         setTestMetaOrgUserId(createdMetaOrgUser._id);
-        setTestMetaOrgUserPersonId(createdMetaOrgUser.personId);
         setTestOrgUserId(createdTestOrgUser._id);
-        setTestOrgUserPersonId(createdTestOrgUser.personId);
         return { metaOrgUser: createdMetaOrgUser, testOrgUser: createdTestOrgUser };
     }
     catch (error) {

package/dist/__tests__/postgres-test-migrations/postgres-test-schema.js

@@ -93,35 +93,6 @@ export const getPostgresTestSchema = (config) => {
             await pool.query('DROP TABLE IF EXISTS "testItems"');
         }
     });
-    migrations.push({
-        name: '00000000000105_schema-persons',
-        up: async ({ context: pool }) => {
-            const orgColumnDef = isMultiTenant ? '"_orgId" INTEGER,' : '';
-            await pool.query(`
-        CREATE TABLE IF NOT EXISTS "persons" (
-          "_id" INTEGER GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
-          ${orgColumnDef}
-          "external_id" VARCHAR UNIQUE,
-          "is_agent" BOOLEAN NOT NULL DEFAULT FALSE,
-          "is_client" BOOLEAN NOT NULL DEFAULT FALSE,
-          "is_employee" BOOLEAN NOT NULL DEFAULT FALSE,
-          "first_name" VARCHAR NOT NULL,
-          "middle_name" VARCHAR,
-          "date_of_birth" DATE,
-          "last_name" VARCHAR NOT NULL,
-          "_created" TIMESTAMPTZ NOT NULL,
-          "_createdBy" INTEGER NOT NULL,
-          "_updated" TIMESTAMPTZ NOT NULL,
-          "_updatedBy" INTEGER NOT NULL,
-          "_deleted" TIMESTAMPTZ,
-          "_deletedBy" INTEGER
-)
-      `);
-        },
-        down: async ({ context: pool }) => {
-            await pool.query('DROP TABLE IF EXISTS "persons"');
-        }
-    });
     migrations.push({
         name: '00000000000105_5_schema-agents',
         up: async ({ context: pool }) => {

package/dist/__tests__/test-express-app.d.ts

@@ -6,7 +6,6 @@ export declare class TestExpressApp {
     private static database;
     private static testDatabase;
     private static initPromise;
-    private static databaseName;
     static init(useMongoDb?: boolean): Promise<{
         app: Application;
         database: IDatabase;

package/dist/__tests__/test-express-app.js

@@ -13,7 +13,6 @@ export class TestExpressApp {
     static database;
     static testDatabase;
     static initPromise = null;
-    static databaseName = 'test-db';
     static async init(useMongoDb) {
         if (useMongoDb === undefined) {
             const testDb = process.env.TEST_DATABASE;

package/dist/__tests__/test-objects.js

@@ -41,23 +41,21 @@ export function getTestMetaOrgUser() {
     };
 }
 export function getTestMetaOrgUserPerson() {
-    return {
+    const person = {
         _id: TEST_META_ORG_USER_PERSON_ID,
         _orgId: getTestMetaOrg()._id,
         externalId: 'test-meta-org-user-person-external-id',
-        middleName: null,
         firstName: 'Test',
         lastName: 'User',
         isAgent: false,
         isClient: false,
         isEmployee: false,
-        dateOfBirth: null,
-        extendedTypes: 0,
         _created: new Date(),
         _createdBy: 'system',
         _updated: new Date(),
         _updatedBy: 'system',
     };
+    return person;
 }
 export function getTestMetaOrgUserContext() {
     return {
@@ -120,14 +118,11 @@ export function getTestOrgUserPerson() {
         _id: TEST_ORG_USER_PERSON_ID,
         _orgId: getTestOrg()._id,
         externalId: 'test-org-user-person-external-id',
-        middleName: null,
         firstName: 'Test',
         lastName: 'User',
         isAgent: false,
         isClient: false,
         isEmployee: false,
-        dateOfBirth: null,
-        extendedTypes: 0,
         _created: new Date(),
         _createdBy: 'system',
         _updated: new Date(),

package/dist/controllers/auth.controller.js

@@ -36,8 +36,10 @@ export class AuthController {
         const body = req.body;
         let validationErrors = this.authService.validate(body.user);
         entityUtils.handleValidationResult(validationErrors, 'AuthController.registerUser');
-        validationErrors = this.personService.validate(body.person);
-        entityUtils.handleValidationResult(validationErrors, 'AuthController.registerUser');
+        if (body.person) {
+            validationErrors = this.personService.validate(body.person);
+            entityUtils.handleValidationResult(validationErrors, 'AuthController.registerUser');
+        }
         const user = await this.authService.createUser(userContext, body.user, body.person);
         apiUtils.apiResponse(res, 201, { data: user || undefined }, UserSpec, PublicUserSpec);
     }

package/dist/databases/mongo-db/migrations/mongo-initial-schema.js

@@ -184,14 +184,11 @@ export const getMongoInitialSchema = (config) => {
                     _id: personId,
                     _orgId: systemUserContext.organization?._id,
                     externalId: 'admin-user-person-external-id',
-                    middleName: null,
                     firstName: 'Admin',
                     lastName: 'User',
                     isAgent: false,
                     isClient: false,
                     isEmployee: false,
-                    dateOfBirth: null,
-                    extendedTypes: 0,
                     _created: new Date(),
                     _createdBy: 'system',
                     _updated: new Date(),

package/dist/databases/postgres/migrations/postgres-initial-schema.js

@@ -58,7 +58,7 @@ export const getPostgresInitialSchema = (config) => {
             "isAgent" BOOLEAN NOT NULL DEFAULT FALSE,
             "isClient" BOOLEAN NOT NULL DEFAULT FALSE,
             "isEmployee" BOOLEAN NOT NULL DEFAULT FALSE,
-            "extendedTypes" INTEGER NOT NULL DEFAULT 0,
+            "extendedTypes" INTEGER,
             "_created" TIMESTAMPTZ NOT NULL,
             "_createdBy" INTEGER NOT NULL,
             "_updated" TIMESTAMPTZ NOT NULL,

package/dist/services/auth.service.d.ts

@@ -23,7 +23,7 @@ export declare class AuthService extends MultiTenantApiService<IUser> {
         userContext: IUserContext;
     } | null>;
     getUserByEmail(email: string): Promise<IUser | null>;
-    createUser(userContext: IUserContext, user: Partial<IUser>, person: Partial<IPersonModel>): Promise<IUser | null>;
+    createUser(userContext: IUserContext, user: Partial<IUser>, person?: Partial<IPersonModel>): Promise<IUser | null>;
     requestTokenUsingRefreshToken(refreshToken: string, deviceId: string): Promise<ITokenResponse | null>;
     changeLoggedInUsersPassword(userContext: IUserContext, body: any): Promise<UpdateResult>;
     changePassword(userContext: IUserContext, queryObject: any, password: string): Promise<UpdateResult>;

package/dist/services/auth.service.js

@@ -100,13 +100,16 @@ export class AuthService extends MultiTenantApiService {
         }
         let personId = user.personId;
         if (personId && person) {
-            const updatePersonResult = await this.personService.partialUpdateById(userContext, personId, person);
+            await this.personService.partialUpdateById(userContext, personId, person);
         }
-        if (!personId) {
+        if (!personId && person) {
             const newPerson = await this.personService.create(userContext, person);
             if (newPerson) {
                 personId = newPerson._id;
             }
+            else {
+                throw new ServerError('authService.createUser: Failed to create person');
+            }
         }
         user.personId = personId;
         return await this.create(userContext, user);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loomcore/api",
-  "version": "0.1.80",
+  "version": "0.1.84",
   "private": false,
   "description": "Loom Core Api - An opinionated Node.js api using Typescript, Express, and MongoDb or PostgreSQL",
   "scripts": {
@@ -57,7 +57,7 @@
     "qs": "^6.14.1"
   },
   "peerDependencies": {
-    "@loomcore/common": "^0.0.46",
+    "@loomcore/common": "^0.0.49",
     "@sinclair/typebox": "0.34.33",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",