@solidstarters/solid-core 1.2.98 → 1.2.100

package/src/subscribers/created-by-updated-by.subscriber.ts

@@ -0,0 +1,54 @@
+import { Injectable } from "@nestjs/common";
+import { InjectDataSource } from "@nestjs/typeorm";
+import { User } from "src/entities/user.entity";
+import { ActiveUserData } from "src/interfaces/active-user-data.interface";
+import { RequestContextService } from "src/services/request-context.service";
+import { DataSource, EntitySubscriberInterface, EventSubscriber, InsertEvent, UpdateEvent } from "typeorm";
+
+@Injectable()
+@EventSubscriber()
+export class CreatedByUpdatedBySubscriber implements EntitySubscriberInterface {
+    constructor(
+        @InjectDataSource()
+        private readonly dataSource: DataSource,
+        private readonly requestContextService: RequestContextService,
+    ) {
+        this.dataSource.subscribers.push(this);
+    }
+
+    async beforeInsert(event: InsertEvent<any>) {
+        await this.stampUserField(event, true);
+    }
+
+    async beforeUpdate(event: UpdateEvent<any>) {
+        await this.stampUserField(event, false);
+    }
+
+    private async stampUserField(event: InsertEvent<any> | UpdateEvent<any>, isInsert: boolean){
+        if (!event.entity) {
+            return;
+        }
+        // Get the current active user details from the request context
+        const activeUserOrUndefined = this.requestContextService.getActiveUser();
+        if (!activeUserOrUndefined) {
+            return;
+        }
+
+        const loadedUser = await this.loadUser(activeUserOrUndefined as unknown as ActiveUserData);
+        if (isInsert) {
+            event.entity.createdBy = loadedUser;
+            event.entity.updatedBy = loadedUser; // For insert, we set both createdBy and updatedBy to the same user
+        }
+        else {
+            event.entity.updatedBy = loadedUser;
+        }
+    }
+
+    private async loadUser(activeUser: ActiveUserData): Promise<User> {
+        const userRepo = this.dataSource.getRepository(User); // Assuming 'User' is the entity name for users in your application
+        const loadedUser = await userRepo.findOne({
+            where: { id: activeUser.sub }, // Assuming 'sub' is the user ID in the JWT token
+        });
+        return loadedUser;;
+    }
+}

package/src/subscribers/model.subscriber.ts

@@ -1,9 +1,9 @@
-import { DataSource, EntitySubscriberInterface, EventSubscriber, InsertEvent, UpdateEvent } from 'typeorm';
-import { ModelMetadata } from '../entities/model-metadata.entity';
-import { FieldMetadata } from '../entities/field-metadata.entity';
 import { Injectable, Logger, NotFoundException } from '@nestjs/common';
 import { InjectDataSource } from '@nestjs/typeorm';
-import { RemoveFieldsCommand } from '../commands/remove-fields.command';
+import { ModelMetadataHelperService } from 'src/helpers/model-metadata-helper.service';
+import { DataSource, EntitySubscriberInterface, EventSubscriber, InsertEvent } from 'typeorm';
+import { FieldMetadata } from '../entities/field-metadata.entity';
+import { ModelMetadata } from '../entities/model-metadata.entity';
 
 @EventSubscriber()
 @Injectable()
@@ -13,7 +13,7 @@ export class ModelSubscriber implements EntitySubscriberInterface<ModelMetadata>
   constructor(
     @InjectDataSource()
     private readonly dataSource: DataSource,
-
+    private readonly modelHelperService: ModelMetadataHelperService,
   ) {
     this.dataSource.subscribers.push(this);
   }
@@ -25,76 +25,22 @@ export class ModelSubscriber implements EntitySubscriberInterface<ModelMetadata>
   async afterInsert(event: InsertEvent<ModelMetadata>): Promise<void> {
     this.logger.debug(`[ModelSubscriber] getting invoked for insert on model: ${event.entity.singularName}`);
 
-    // const fieldMetadataRepo = event.manager.getRepository(FieldMetadata);
-    // const fieldMetadataRepo = this.dataSource.getRepository(FieldMetadata);
     const transactionManager = event.queryRunner?.manager;
     if (!transactionManager) {
       throw new NotFoundException(`Trnasaction Manager not found`);
-
     }
 
-    const systemFieldsMetadata = [
-      {
-        name: "id",
-        displayName: "Id",
-        type: "int",
-        ormType: "bigint",
-        isSystem: true,
-        model: event.entity,
-      },
-      {
-        name: "createdAt",
-        displayName: "Created At",
-        type: "datetime",
-        ormType: "timestamp",
-        isSystem: true,
-        model: event.entity,
-      },
-      {
-        name: "updatedAt",
-        displayName: "Updated At",
-        type: "datetime",
-        ormType: "timestamp",
-        isSystem: true,
-        model: event.entity,
-      },
-      {
-        name: "deletedAt",
-        displayName: "Deleted At",
-        type: "datetime",
-        ormType: "timestamp",
-        isSystem: true,
-        model: event.entity,
-      },
-      {
-        name: "publishedAt",
-        displayName: "Published At",
-        type: "datetime",
-        ormType: "timestamp",
-        isSystem: true,
-        model: event.entity,
-      },
-      {
-        name: "localeName",
-        displayName: "Locale",
-        type: "shortText",
-        ormType: "varchar",
-        isSystem: true,
-        model: event.entity,
-      },
-      {
-        name: "defaultEntityLocaleId",
-        displayName: "Default Entity Locale Id",
-        type: "int",
-        ormType: "integer",
-        isSystem: true,
-        model: event.entity,
-      }
-    ];
-    await transactionManager.save(FieldMetadata, systemFieldsMetadata);
-    // Save to the database.
-    // fieldMetadataRepo.save(systemFieldsMetadata);
-
+    await transactionManager.save(FieldMetadata, this.systemFieldMetadataToBeAdded(event));
   }
 
+
+  private systemFieldMetadataToBeAdded(event: InsertEvent<ModelMetadata>) {
+    const systemFieldsDefaultMetadata = this.modelHelperService.getSystemFieldsMetadata();
+    // map and add the model as event.entity for the above metadata
+    const systemFieldsMetadata = systemFieldsDefaultMetadata.map(field => ({
+      ...field,
+      model: event.entity,
+    }));
+    return systemFieldsMetadata;
+  }
 }

package/dist/subscribers/softDeleteAwareEventSubscriber.subscriber.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"softDeleteAwareEventSubscriber.subscriber.d.ts","sourceRoot":"","sources":["../../src/subscribers/softDeleteAwareEventSubscriber.subscriber.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,yBAAyB,EAAmB,YAAY,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAGhH,qBAEa,8BAA+B,YAAW,yBAAyB;IAIxE,OAAO,CAAC,QAAQ,CAAC,UAAU;IAH/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmD;gBAGrD,UAAU,EAAE,UAAU;IAK3C,gBAAgB,CAAC,KAAK,EAAE,eAAe,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI;IAclE,aAAa,CAAC,KAAK,EAAE,YAAY,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI;CAM/D"}

package/dist/subscribers/softDeleteAwareEventSubscriber.subscriber.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"softDeleteAwareEventSubscriber.subscriber.js","sourceRoot":"","sources":["../../src/subscribers/softDeleteAwareEventSubscriber.subscriber.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAuE;AACvE,6CAAmD;AACnD,qCAAgH;AAKzG,IAAM,8BAA8B,sCAApC,MAAM,8BAA8B;IAEvC,YAEI,UAAuC;QAAtB,eAAU,GAAV,UAAU,CAAY;QAH1B,WAAM,GAAG,IAAI,eAAM,CAAC,gCAA8B,CAAC,IAAI,CAAC,CAAC;QAKtE,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;IAED,gBAAgB,CAAC,KAA2B;QACxC,IAAI,CAAC,KAAK,CAAC,MAAM;YAAE,OAAO;QAC1B,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAE5B,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;YACpB,MAAM,CAAC,cAAc,GAAG,GAAG,IAAI,IAAI,EAAE,EAAE,CAAC;QAC5C,CAAC;aAAM,CAAC;YACJ,MAAM,CAAC,cAAc,GAAG,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QAClD,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;IAEpE,CAAC;IAED,aAAa,CAAC,KAAwB;QAClC,IAAI,CAAC,KAAK,CAAC,MAAM;YAAE,OAAO;QAC1B,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAC5B,MAAM,CAAC,cAAc,GAAG,aAAa,CAAC;IAC1C,CAAC;CAEJ,CAAA;AA7BY,wEAA8B;yCAA9B,8BAA8B;IAF1C,IAAA,yBAAe,GAAE;IACjB,IAAA,mBAAU,GAAE;IAIJ,WAAA,IAAA,0BAAgB,GAAE,CAAA;qCACU,oBAAU;GAJlC,8BAA8B,CA6B1C"}

package/src/services/pending_import_issues

@@ -1,3 +0,0 @@
-1. fileLocation -> file
-2. Change the import response to return proper shape.
-3. Change the urls to reflect proper semantics.