fix: Some template bugs with other secjs packages

SecJS · Oct 9, 2021 · d7a7ae8 · d7a7ae8
1 parent 8b95a19
commit d7a7ae8
Show file tree

Hide file tree

Showing 11 changed files with 48 additions and 22 deletions.
diff --git a/app/templates/nestjsMongoose/E2E/__name__/update.spec.ts.txt b/app/templates/nestjsMongoose/E2E/__name__/update.spec.ts.txt
@@ -11,7 +11,7 @@ describe('\n[E2E] <%= namePascal %> 🛠', () => {
 
     const status = 200
     const method = 'PUT'
-    const path = `/<%= namePluralCamel %>/${<%= nameCamel %>.id}?apiKey=${apiKey}`
+    const path = `/<%= namePluralCamel %>/${<%= nameCamel %>.id}`
 
     const payload = {
       name: 'test',
@@ -31,7 +31,7 @@ describe('\n[E2E] <%= namePascal %> 🛠', () => {
   it('should throw a not found error when can not find <%= nameCamel %>', async () => {
     const status = 404
     const method = 'PUT'
-    const path = `/<%= namePluralCamel %>/507f1f77bcf86cd799439011?apiKey=${apiKey}`
+    const path = `/<%= namePluralCamel %>/507f1f77bcf86cd799439011`
 
     const { body } = await request(app.server.getHttpServer())
       .put(path)

diff --git a/app/templates/nestjsMongoose/__name__.ts.txt b/app/templates/nestjsMongoose/__name__.ts.txt
@@ -1,9 +1,17 @@
 import * as mongoose from 'mongoose'
-import { Schema, SchemaFactory } from '@nestjs/mongoose'
+import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose'
 
 @Schema({ timestamps: true })
 export class <%= namePascal %> {
-  // <%= namePascal %> props goes in here
+  @Prop({ type: String, default: 'pendent' })
+  status: 'pendent' | 'canceled' | 'active' | 'deleted'
+
+  @Prop({ type: Date, default: null })
+  deletedAt?: Date
+
+  createdAt: Date
+
+  updatedAt: Date
 }
 
 export type <%= namePascal %>Document = <%= namePascal %> & mongoose.Document

diff --git a/app/templates/nestjsMongoose/__name__Repository.ts.txt b/app/templates/nestjsMongoose/__name__Repository.ts.txt
@@ -2,13 +2,13 @@ import { Model } from 'mongoose'
 import { Injectable } from '@nestjs/common'
 import { InjectModel } from '@nestjs/mongoose'
 import { <%= namePascal %>, <%= namePascal %>Document } from 'app/Schemas/<%= namePascal %>'
-import { MongooseRepository } from '@secjs/core/base/Repositories/MongooseRepository'
+import { MongooseRepository } from '@secjs/base/Repositories/MongooseRepository'
 
 @Injectable()
 export class <%= namePascal %>Repository extends MongooseRepository<<%= namePascal %>Document> {
-   protected wheres: []
-   protected relations: []
+   wheres = []
+   relations = []
 
    @InjectModel(<%= namePascal %>.name)
-   protected Model = Model<<%= namePascal %>Document>
+   model: Model<<%= namePascal %>Document>
 }
diff --git a/app/templates/nestjsMongoose/__name__Resource.ts.txt b/app/templates/nestjsMongoose/__name__Resource.ts.txt
@@ -21,12 +21,18 @@ export class <%= namePascal %>Resource {
        deletedAt: model.deletedAt,
      }
 
+     // For OneToMany relation
      // if (model.relations && isArrayOfObjects(model.relations)) {
      //   json.relations = new YourRelationResource().toArray(
      //     model.relations,
      //   )
      // }
 
+     // For ManyToOne relation
+     // if (document.project?.toJSON()?._id) {
+     //   json.relation = new YourRelationResource().toJson(document.relation)
+     // }
+
      return json
    }
 

diff --git a/app/templates/nestjsPrismaOrm/E2E/__name__/update.spec.ts.txt b/app/templates/nestjsPrismaOrm/E2E/__name__/update.spec.ts.txt
@@ -11,7 +11,7 @@ describe('\n[E2E] <%= namePascal %> 🛠', () => {
 
     const status = 200
     const method = 'PUT'
-    const path = `/<%= namePluralCamel %>/${<%= nameCamel %>.id}?apiKey=${apiKey}`
+    const path = `/<%= namePluralCamel %>/${<%= nameCamel %>.id}`
 
     const payload = {
       name: 'test',
@@ -31,7 +31,7 @@ describe('\n[E2E] <%= namePascal %> 🛠', () => {
   it('should throw a not found error when can not find <%= nameCamel %>', async () => {
     const status = 404
     const method = 'PUT'
-    const path = `/<%= namePluralCamel %>/507f1f77bcf86cd799439011?apiKey=${apiKey}`
+    const path = `/<%= namePluralCamel %>/507f1f77bcf86cd799439011`
 
     const { body } = await request(app.server.getHttpServer())
       .put(path)

diff --git a/app/templates/nestjsPrismaOrm/__name__Repository.ts.txt b/app/templates/nestjsPrismaOrm/__name__Repository.ts.txt
@@ -5,14 +5,14 @@ import { PrismaRepository } from '@secjs/base/repositories/PrismaRepository'
 
 @Injectable()
 export class <%= namePascal %>Repository extends PrismaRepository<<%= namePascal %>> {
-  protected wheres: []
-  protected relations: []
+  wheres = []
+  relations = []
 
-  protected Model: any
+  model: any
 
   constructor(private prisma: PrismaService) {
     super()
 
-    this.Model = this.prisma.<%= nameCamel %>
+    this.model = this.prisma.<%= nameCamel %>
   }
 }
diff --git a/app/templates/nestjsPrismaOrm/__name__Resource.ts.txt b/app/templates/nestjsPrismaOrm/__name__Resource.ts.txt
@@ -20,12 +20,18 @@ export class <%= namePascal %>Resource {
        deletedAt: model.deletedAt,
      }
 
+     // For OneToMany relation
      // if (model.relations && isArrayOfObjects(model.relations)) {
      //   json.relations = new YourRelationResource().toArray(
      //     model.relations,
      //   )
      // }
 
+     // For ManyToOne relation
+     // if (model.relation?.id) {
+     //   json.relation = new YourRelationResource().toJson(model.relation)
+     // }
+
      return json
    }
 

diff --git a/app/templates/nestjsTypeOrm/E2E/__name__/update.spec.ts.txt b/app/templates/nestjsTypeOrm/E2E/__name__/update.spec.ts.txt
@@ -11,7 +11,7 @@ describe('\n[E2E] <%= namePascal %> 🛠', () => {
 
     const status = 200
     const method = 'PUT'
-    const path = `/<%= namePluralCamel %>/${<%= nameCamel %>.id}?apiKey=${apiKey}`
+    const path = `/<%= namePluralCamel %>/${<%= nameCamel %>.id}`
 
     const payload = {
       name: 'test',
@@ -31,7 +31,7 @@ describe('\n[E2E] <%= namePascal %> 🛠', () => {
   it('should throw a not found error when can not find <%= nameCamel %>', async () => {
     const status = 404
     const method = 'PUT'
-    const path = `/<%= namePluralCamel %>/507f1f77bcf86cd799439011?apiKey=${apiKey}`
+    const path = `/<%= namePluralCamel %>/507f1f77bcf86cd799439011`
 
     const { body } = await request(app.server.getHttpServer())
       .put(path)

diff --git a/app/templates/nestjsTypeOrm/__name__Repository.ts.txt b/app/templates/nestjsTypeOrm/__name__Repository.ts.txt
@@ -1,11 +1,11 @@
+import { EntityRepository } from 'typeorm'
 import { <%= namePascal %> } from 'app/Models/<%= namePascal %>'
-import { Injectable } from '@nestjs/common'
 import { TypeOrmRepository } from '@secjs/base/repositories/TypeOrmRepository'
 
-@Injectable()
+@EntityRepository(<%= namePascal %>)
 export class <%= namePascal %>Repository extends TypeOrmRepository<<%= namePascal %>> {
-  protected wheres: []
-  protected relations: []
+  wheres = []
+  relations = []
 
-  protected Model = <%= namePascal %>
+  model = <%= namePascal %>.name
 }
diff --git a/app/templates/nestjsTypeOrm/__name__Resource.ts.txt b/app/templates/nestjsTypeOrm/__name__Resource.ts.txt
@@ -20,12 +20,18 @@ export class <%= namePascal %>Resource {
        deletedAt: model.deletedAt,
      }
 
+     // For OneToMany relation
      // if (model.relations && isArrayOfObjects(model.relations)) {
      //   json.relations = new YourRelationResource().toArray(
      //     model.relations,
      //   )
      // }
 
+     // For ManyToOne relation
+     // if (model.relation?.id) {
+     //   json.relation = new YourRelationResource().toJson(model.relation)
+     // }
+
      return json
    }
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "generator-secjs",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "🧬 Generator for any NodeJS Project or Framework",
   "main": "app/index.js",
   "scripts": {