@apso/cli 0.7.1 → 0.7.3

package/dist/lib/templates/entities/entity.eta

@@ -56,6 +56,10 @@ export class <%= it.name %> {
     @Column({ type: 'uuid' })
     @PrimaryColumn()
     id: string;
+    <% } else if (it.primaryKeyType === 'text') { %>
+    @Column({ type: 'text' })
+    @PrimaryColumn()
+    id: string;
     <% } else { %>
     @PrimaryGeneratedColumn()
     id!: number;

package/dist/lib/templates/rest/dto-rest.eta

@@ -7,6 +7,10 @@ import * as enums from '../../enums';
 <% } %>
 
 export class <%= it.entityName %>Create {
+<% if (it.addDefaultPKProperty && (it.primaryKeyType === 'uuid' || it.primaryKeyType === 'text')) { %>
+    @ApiProperty()
+    id: string;
+<% } %>
 <% it.columns.forEach((field) => { %>
     @ApiProperty()
   <%if (field.dataType.includes("Enum")) {%>
@@ -36,7 +40,7 @@ export class <%= it.entityName %>Create {
 export class <%= it.entityName %> {
 <% if (it.addDefaultPKProperty) { %>
     @ApiProperty()
-    id: <%= it.primaryKeyType === 'uuid' ? 'string' : 'number' %>;
+    id: <%= (it.primaryKeyType === 'uuid' || it.primaryKeyType === 'text') ? 'string' : 'number' %>;
 <% } %>
 <% it.columns.forEach((field) => { %>
     @ApiProperty()

package/dist/lib/templates/rest/service-rest-spec.eta

@@ -1,39 +1,78 @@
 <%~ includeFile('./header.eta') %>
 
 import { Test, TestingModule } from '@nestjs/testing';
+import { getRepositoryToken } from '@nestjs/typeorm';
 import { <%= it.svcName %> } from './<%= it.entityName %>.service';
-import { TypeOrmModule } from '@nestjs/typeorm';
 import { <%= it.entityName %> } from './<%= it.entityName %>.entity';
-<% it.allRelatedEntities.forEach(function(entity) { if (entity !== it.entityName) { %>
-import { <%= entity %> } from '../<%= entity %>/<%= entity %>.entity';
-<% }}); %>
-
-// All related entities (including the main entity) are included below to ensure TypeORM can resolve relationships for this service's entity and its graph.
 
 describe('<%= it.svcName %>', () => {
   let service: <%= it.svcName %>;
   let mockRepository: any;
 
   beforeEach(async () => {
+    // Mock query builder chain
+    const mockQueryBuilder = {
+      where: jest.fn().mockReturnThis(),
+      andWhere: jest.fn().mockReturnThis(),
+      orWhere: jest.fn().mockReturnThis(),
+      orderBy: jest.fn().mockReturnThis(),
+      addOrderBy: jest.fn().mockReturnThis(),
+      skip: jest.fn().mockReturnThis(),
+      take: jest.fn().mockReturnThis(),
+      select: jest.fn().mockReturnThis(),
+      addSelect: jest.fn().mockReturnThis(),
+      leftJoin: jest.fn().mockReturnThis(),
+      leftJoinAndSelect: jest.fn().mockReturnThis(),
+      innerJoin: jest.fn().mockReturnThis(),
+      innerJoinAndSelect: jest.fn().mockReturnThis(),
+      getMany: jest.fn().mockResolvedValue([]),
+      getOne: jest.fn().mockResolvedValue(null),
+      getManyAndCount: jest.fn().mockResolvedValue([[], 0]),
+      getCount: jest.fn().mockResolvedValue(0),
+      getRawMany: jest.fn().mockResolvedValue([]),
+      getRawOne: jest.fn().mockResolvedValue(null),
+    };
+
+    // Mock repository with manager.connection for TypeOrmCrudService
     mockRepository = {
       find: jest.fn().mockResolvedValue([]),
-      findOne: jest.fn().mockResolvedValue({}),
-      save: jest.fn().mockResolvedValue({}),
-      create: jest.fn().mockReturnValue({}),
-      update: jest.fn().mockResolvedValue({}),
-      delete: jest.fn().mockResolvedValue({}),
+      findOne: jest.fn().mockResolvedValue(null),
+      findOneBy: jest.fn().mockResolvedValue(null),
+      save: jest.fn().mockImplementation((entity) => Promise.resolve({ id: 'mock-id', ...entity })),
+      create: jest.fn().mockImplementation((dto) => dto),
+      update: jest.fn().mockResolvedValue({ affected: 1 }),
+      delete: jest.fn().mockResolvedValue({ affected: 1 }),
+      remove: jest.fn().mockResolvedValue({}),
+      count: jest.fn().mockResolvedValue(0),
+      createQueryBuilder: jest.fn(() => mockQueryBuilder),
+      target: <%= it.entityName %>,
+      metadata: {
+        columns: [],
+        relations: [],
+        primaryColumns: [{ propertyName: 'id' }],
+        connection: { options: { type: 'postgres' } },
+      },
+      manager: {
+        connection: {
+          options: { type: 'postgres' },
+          getMetadata: jest.fn().mockReturnValue({
+            columns: [],
+            relations: [],
+            primaryColumns: [{ propertyName: 'id' }],
+          }),
+        },
+        transaction: jest.fn().mockImplementation((cb) => cb(mockRepository.manager)),
+      },
     };
 
     const module: TestingModule = await Test.createTestingModule({
-      imports: [
-        TypeOrmModule.forRoot({
-          // ...database config (provide your test DB config here)
-          entities: [<%= [it.entityName, ...it.allRelatedEntities.filter(e => e !== it.entityName)].join(', ') %>],
-          synchronize: true,
-        }),
-        TypeOrmModule.forFeature([<%= it.entityName %>]),
+      providers: [
+        <%= it.svcName %>,
+        {
+          provide: getRepositoryToken(<%= it.entityName %>),
+          useValue: mockRepository,
+        },
       ],
-      providers: [<%= it.svcName %>],
     }).compile();
 
     service = module.get<<%= it.svcName %>>(<%= it.svcName %>);

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.7.1",
+  "version": "0.7.3",
   "commands": {
     "server:new": {
       "id": "server:new",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apso/cli",
-  "version": "0.7.1",
+  "version": "0.7.3",
   "description": "Apso CLI",
   "author": "Apso by Mavric - @mavric",
   "bin": {