@mikemajesty/microservice-crud 6.0.8 → 6.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikemajesty/microservice-crud",
-  "version": "6.0.8",
+  "version": "6.0.10",
   "description": "Monorepo CLI",
   "main": "src/cli.js",
   "scripts": {

package/src/templates/mongo/core/entity/entity.js

@@ -11,7 +11,7 @@ const ID = z.string().uuid();
 const Name = z.string().min(1).max(200).trim();
 const CreatedAt = z.date().nullish();
 const UpdatedAt = z.date().nullish();
-const DeletedAt = z.date().default(null).nullish();
+const DeletedAt = z.date().nullish();
 
 export const ${capitalizeFirstLetter(name)}EntitySchema = z.object({
   id: ID,

package/src/templates/mongo/core/use-cases/update.js

@@ -21,11 +21,14 @@ export type ${capitalizeFirstLetter(name)}UpdateInput = Partial<z.infer<typeof $
 export type ${capitalizeFirstLetter(name)}UpdateOutput = ${capitalizeFirstLetter(name)}Entity;
 
 export class ${capitalizeFirstLetter(name)}UpdateUsecase implements IUsecase {
-  constructor(private readonly ${name}Repository: I${capitalizeFirstLetter(name)}Repository, private readonly loggerService: ILoggerAdapter) {}
+  constructor(
+    private readonly ${name}Repository: I${capitalizeFirstLetter(name)}Repository,
+    private readonly loggerService: ILoggerAdapter
+  ) {}
 
   @ValidateSchema(${capitalizeFirstLetter(name)}UpdateSchema)
   async execute(input: ${capitalizeFirstLetter(name)}UpdateInput): Promise<${capitalizeFirstLetter(name)}UpdateOutput> {
-    const ${name} = await this.${name}Repository.findById(input.id);
+    const ${name} = await this.${name}Repository.findById(input.id as string);
 
     if (!${name}) {
       throw new ApiNotFoundException('${name}NotFound');

package/src/templates/mongo/modules/repository.js

@@ -6,14 +6,15 @@ function capitalizeFirstLetter(string) {
 
 const getModuleRepository = (name) => `import { Injectable } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
-import { PaginateModel } from 'mongoose';
+import { FilterQuery, PaginateModel } from 'mongoose';
 
 import { I${capitalizeFirstLetter(name)}Repository } from '@/core/${name}/repository/${name}';
 import { ${capitalizeFirstLetter(name)}ListInput, ${capitalizeFirstLetter(name)}ListOutput } from '@/core/${name}/use-cases/${name}-list';
 import { ${capitalizeFirstLetter(name)}, ${capitalizeFirstLetter(name)}Document } from '@/infra/database/mongo/schemas/${name}';
 import { MongoRepository } from '@/infra/repository';
-import { MongoRepositoryModelSessionType } from '@/utils/mongoose';
 import { ConvertMongooseFilter, SearchTypeEnum, ValidateDatabaseSortAllowed } from '@/utils/decorators';
+import { IEntity } from '@/utils/entity';
+import { MongoRepositoryModelSessionType } from '@/utils/mongoose';
 
 @Injectable()
 export class ${capitalizeFirstLetter(name)}Repository extends MongoRepository<${capitalizeFirstLetter(name)}Document> implements I${capitalizeFirstLetter(name)}Repository {
@@ -24,7 +25,11 @@ export class ${capitalizeFirstLetter(name)}Repository extends MongoRepository<${
   @ConvertMongooseFilter([{ name: 'name', type: SearchTypeEnum.like }])
   @ValidateDatabaseSortAllowed({ name: 'name' }, { name: 'createdAt' })
   async paginate({ limit, page, sort, search }: ${capitalizeFirstLetter(name)}ListInput): Promise<${capitalizeFirstLetter(name)}ListOutput> {
-    const ${pluralize(name)} = await this.entity.paginate(search, { page, limit, sort });
+    const ${pluralize(name)} = await this.entity.paginate(search as FilterQuery<IEntity>, { 
+      page,
+      limit,
+      sort 
+    });
 
     return { docs: ${pluralize(name)}.docs.map((u) => u.toObject({ virtuals: true })), limit, page, total: ${name}s.totalDocs };
   }

package/src/templates/mongo/modules/swagger.js

@@ -12,8 +12,10 @@ import { ${capitalizeFirstLetter(name)}GetByIdOutput } from '@/core/${name}/use-
 import { ${capitalizeFirstLetter(name)}ListOutput } from '@/core/${name}/use-cases/${name}-list';
 import { ${capitalizeFirstLetter(name)}UpdateOutput } from '@/core/${name}/use-cases/${name}-update';
 import { Swagger } from '@/utils/docs/swagger';
+import { TestUtils } from '@/utils/tests';
 
 const input = new ${capitalizeFirstLetter(name)}Entity({
+  id: TestUtils.getMockUUID(),
   name: 'name'
 });
 
@@ -78,7 +80,7 @@ export const SwaggerResponse = {
 };
 
 export const SwaggerRequest = {
-  createBody: Swagger.defaultRequestJSON({ ...input, id: undefined } as ${capitalizeFirstLetter(name)}Entity),
+  createBody: Swagger.defaultRequestJSON(input as ${capitalizeFirstLetter(name)}Entity),
   updateBody: Swagger.defaultRequestJSON(input as ${capitalizeFirstLetter(name)}Entity),
   listQuery: Swagger.defaultRequestListJSON()
 };

package/src/templates/postgres/core/entity/entity.js

@@ -11,7 +11,7 @@ const ID = z.string().uuid();
 const Name = z.string().min(1).max(200).trim();
 const CreatedAt = z.date().nullish();
 const UpdatedAt = z.date().nullish();
-const DeletedAt = z.date().default(null).nullish();
+const DeletedAt = z.date().nullish();
 
 export const ${capitalizeFirstLetter(name)}EntitySchema = z.object({
   id: ID,

package/src/templates/postgres/core/use-cases/update.js

@@ -44,7 +44,7 @@ export class ${capitalizeFirstLetter(name)}UpdateUsecase implements IUsecase {
 
     const updated = await this.${name}Repository.findById(entity.id);
 
-    return new ${capitalizeFirstLetter(name)}Entity(updated as ${capitalizeFirstLetter(name)});
+    return new ${capitalizeFirstLetter(name)}Entity(updated as ${capitalizeFirstLetter(name)}Entity);
   }
 }
 `

package/src/templates/postgres/modules/repository.js

@@ -4,7 +4,7 @@ function capitalizeFirstLetter(string) {
 }
 
 const getModuleRepository = (name) => `import { Injectable } from '@nestjs/common';
-import { FindOptionsWhere, Repository } from 'typeorm';
+import { FindOptionsOrder, FindOptionsWhere, Repository } from 'typeorm';
 
 import { ${capitalizeFirstLetter(name)}Entity } from '@/core/${name}/entity/${name}';
 import { I${capitalizeFirstLetter(name)}Repository } from '@/core/${name}/repository/${name}';
@@ -12,6 +12,7 @@ import { ${capitalizeFirstLetter(name)}ListInput, ${capitalizeFirstLetter(name)}
 import { ${capitalizeFirstLetter(name)}Schema } from '@/infra/database/postgres/schemas/${name}';
 import { TypeORMRepository } from '@/infra/repository/postgres/repository';
 import { ConvertTypeOrmFilter, SearchTypeEnum, ValidateDatabaseSortAllowed } from '@/utils/decorators';
+import { IEntity } from '@/utils/entity';
 import { PaginationUtils } from '@/utils/pagination';
 
 type Model = ${capitalizeFirstLetter(name)}Schema & ${capitalizeFirstLetter(name)}Entity;
@@ -30,8 +31,8 @@ export class ${capitalizeFirstLetter(name)}Repository extends TypeORMRepository<
     const [docs, total] = await this.repository.findAndCount({
       take: input.limit,
       skip,
-      order: input.sort,
-      where: input.search as FindOptionsWhere<unknown>
+      order: input.sort as FindOptionsOrder<IEntity>,
+      where: input.search as FindOptionsWhere<IEntity>
     });
 
     return { docs, total, page: input.page, limit: input.limit };

package/src/templates/postgres/modules/swagger.js

@@ -12,8 +12,10 @@ import { ${capitalizeFirstLetter(name)}GetByIdOutput } from '@/core/${name}/use-
 import { ${capitalizeFirstLetter(name)}ListOutput } from '@/core/${name}/use-cases/${name}-list';
 import { ${capitalizeFirstLetter(name)}UpdateOutput } from '@/core/${name}/use-cases/${name}-update';
 import { Swagger } from '@/utils/docs/swagger';
+import { TestUtils } from '@/utils/tests';
 
 const input = new ${capitalizeFirstLetter(name)}Entity({
+  id: TestUtils.getMockUUID(),
   name: 'name'
 });
 
@@ -78,7 +80,7 @@ export const SwaggerResponse = {
 };
 
 export const SwaggerRequest = {
-  createBody: Swagger.defaultRequestJSON({ ...input, id: undefined } as ${capitalizeFirstLetter(name)}Entity),
+  createBody: Swagger.defaultRequestJSON(input as ${capitalizeFirstLetter(name)}Entity),
   updateBody: Swagger.defaultRequestJSON(input as ${capitalizeFirstLetter(name)}Entity),
   listQuery: Swagger.defaultRequestListJSON()
 };