@simitgroup/simpleapp-generator 1.1.7 → 1.1.9

package/README.md

@@ -26,7 +26,7 @@ SimpleApp generator is a typescript code generator for convert jsonschemas becom
 1. [jsonschemas](./docs/jsonschema.md)
 2. [backend walk through](./docs/backend.md)
 3. [frontend walk through](./docs/frontend.md)
-
+4. [End to End test](./docs/test.md)
 
 
 # Quick start

package/dist/generate.js

@@ -124,6 +124,7 @@ const processSchema = async (schemaname, jsondata) => {
     // log.warn(`Load `+clc.yellow(file) + ` but it is not supported`)
     // }      
 };
+const isGenerateTest = (data) => data.autocompletecode && data.autocompletename;
 /**
  * generate frontend nuxt and backend nest codes.
  *
@@ -208,9 +209,10 @@ const generateSchema = (docname, doctype, rendertype, allmodels) => {
                         (0, fs_1.writeFileSync)(targetfile, filecontent);
                     }
                 }
-                else if (filecategory == 'test') {
-                    const targetfolder = `${backendFolder}/documents/${docname}`;
+                else if (filecategory == 'test' && isGenerateTest(variables)) {
+                    const targetfolder = `${backendFolder}/test/documents/${docname}`;
                     const targetfile = `${targetfolder}/${docname}.e2e-spec.ts`;
+                    log.warn("test file: ", targetfile);
                     // `${backendServiceFolder}/${doctype}.${filecategory}.${filetype}`
                     if (!(0, fs_1.existsSync)(targetfolder)) {
                         (0, fs_1.mkdirSync)(targetfolder, { recursive: true });
@@ -219,6 +221,11 @@ const generateSchema = (docname, doctype, rendertype, allmodels) => {
                         log.info("process: ", targetfile);
                         const filecontent = eta.render(templatepath, variables);
                         (0, fs_1.writeFileSync)(targetfile, filecontent);
+                        //create stub files
+                        (0, fs_1.mkdirSync)(`${targetfolder}/stub`, { recursive: true });
+                        (0, fs_1.writeFileSync)(`${targetfolder}/stub/id1.create.ts`, 'export default () => ({_id:"",})');
+                        (0, fs_1.writeFileSync)(`${targetfolder}/stub/id1.update.ts`, 'export default () => ({_id:"",})');
+                        (0, fs_1.writeFileSync)(`${targetfolder}/stub/id2.create.ts`, 'export default () => ({_id:"",})');
                     }
                 }
             }

package/dist/generate.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate.js","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generate.js","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":"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"}

package/docs/test.md

@@ -0,0 +1,46 @@
+# Test
+simple app will auto create template of CRUD test case and you can modify it to complete the test case.
+
+The simplest standalone resource step (no foreignkey) workflow of prepare test as below:
+1. Add sample data in `stubs` at `backend/test/yourResource/stub`
+2. modify sample's `_id` according `backend/test/yourResource/yourResource.e2e-spec.ts`
+3. modify `yourResource.e2e-spec.ts` according your need such as autocomplete search text or add more test
+
+
+
+## Prepare Simple Test
+1. Start backend and frontend server, access your `category` page 
+2. Try add new record, fill in sample data and save it. 
+3. Obtain the sample json data from debug data component.
+4. Put content into stub:
+    a. edit `backend/test/category/stub/id1.create.ts`
+    b. replace json content with copied record but remain `id:"00000000-0000-0000-0000-000000000001"` unchange
+5. repeat sample step `backend/test/category/stub/id1.update.ts`, but you may change the data slightly like change `categoryName` from "Category 1" to "Category 1-updated"
+6. Go back to frontend, add new record and fill in sample data which not pass the input validation (safe failed)
+7. Copy the data into stub
+    a. edit `backend/test/category/stub/id2.create.ts`
+    b. replace json content with copied record but remain `id:"00000000-0000-0000-0000-000000000002"` unchange
+8. After added 3 sample data into stub, you may modify `backend/test/category/category.e2e-spec.ts`:
+    a. change `existAutoCompleteKeyword` to match partial of your sample data. Example your value `categoryName` is `Category 1`, you can define as `existAutoCompleteKeyword='Cat'`(It only search `categoryCode` and `CategoryName`)
+    b. you can add more sample/test by refer example in this file
+9. You may remove all others folder in `backend/test/documents/*` and remain only `category` so we can have success test
+10. execute test by run command  `npm run test:e2e` in your backend
+
+
+## Prepare Test For Data with Dependency
+Every test shall implement independently, in the case of `product` which depends on category records, we can:
+1. copy/modify partial of record from `backend/test/category/category.e2e-spec.ts` into `backend/test/product/product.e2e-spec.ts`
+2. execute insert `category` using `beforeAll`, you may refer: 
+    a. [nestjs test documentation](https://docs.nestjs.com/fundamentals/testing)
+    b. [jest test order](https://jestjs.io/docs/setup-teardown#order-of-execution)
+
+
+
+
+## Test guide line
+1. Test shall implement in empty database cause we don't want primary key crash
+2. put sample data in stub cause we don't want our code accidentally modify the sample data
+3. default test is simplest approach, every additional api require additional test
+4. every test shall:
+    a. test http status
+    b. when data effect database, shall continue verify result using subsequent step `then`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simitgroup/simpleapp-generator",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "description": "frontend nuxtjs and backend nests code generator using jsonschema",
   "main": "dist/index.js",
   "scripts": {

package/src/generate.ts

@@ -102,6 +102,9 @@ const processSchema= async (schemaname:string,jsondata:JSONSchema7)=>{
     // }      
 }
   
+
+const isGenerateTest = (data:TypeGenerateDocumentVariable) => data.autocompletecode && data.autocompletename
+  
 /**
  * generate frontend nuxt and backend nest codes.
  * 
@@ -167,10 +170,11 @@ const generateSchema = ( docname: string,
       const generateTemplatefolder = `${constants.templatedir}/basic/${foldertype}`    
       const allfiles = readdirSync(generateTemplatefolder,{recursive:true})      
       for(let j=0; j<allfiles.length;j++){
+        
         const filename:string = String(allfiles[j])      
         const templatepath = `${generateTemplatefolder}/${filename}`        
         
-        if(_.last(filename.split('.'))!='eta'){
+        if(_.last(filename.split('.'))!='eta'){        
           // log.warn("skip file: ",filename)
           continue;
         }
@@ -201,10 +205,11 @@ const generateSchema = ( docname: string,
               writeFileSync(targetfile,filecontent);
             }
             
-          }else if(filecategory=='test'){
-            const targetfolder = `${backendFolder}/documents/${docname}`
+          }else if(filecategory=='test' && isGenerateTest(variables)){            
+
+            const targetfolder = `${backendFolder}/test/documents/${docname}`
             const targetfile = `${targetfolder}/${docname}.e2e-spec.ts`
-            
+            log.warn("test file: ",targetfile)
             // `${backendServiceFolder}/${doctype}.${filecategory}.${filetype}`
             if(!existsSync(targetfolder)){
               mkdirSync(targetfolder,{recursive:true})
@@ -213,6 +218,12 @@ const generateSchema = ( docname: string,
               log.info("process: ",targetfile)
               const filecontent = eta.render(templatepath, variables)     
               writeFileSync(targetfile,filecontent);
+              //create stub files
+              mkdirSync(`${targetfolder}/stub`,{recursive:true})
+              writeFileSync(`${targetfolder}/stub/id1.create.ts`,'export default () => ({_id:"00000000-0000-0000-0000-000000000001",})');
+              writeFileSync(`${targetfolder}/stub/id1.update.ts`,'export default () => ({_id:"00000000-0000-0000-0000-000000000001",})');
+              writeFileSync(`${targetfolder}/stub/id2.create.ts`,'export default () => ({_id:"00000000-0000-0000-0000-000000000002",})');
+              
             }
           }
                

package/templates/basic/nest/controller.ts.eta

@@ -18,7 +18,8 @@ import {
   Res,
   Req,
   HttpStatus,
-  HttpCode
+  HttpCode,
+  NotFoundException
 } from '@nestjs/common';
 import { SimpleAppAbstractController } from './simpleapp.controller';
 import { <%= it.typename %>Service } from '../../services/<%= it.doctype %>.service';
@@ -211,7 +212,12 @@ export class <%= it.typename %>Controller extends SimpleAppAbstractController<
   @ApiResponse({ status: 500, description: 'Internal error' })
   @ApiOperation({ operationId: 'runFindOne' })
   async findOne(@AppUser() appuser: UserContext,@Param('id') id: string) {    
-    return await this._findOne(appuser,id);
+    const data = await this._findOne(appuser, id);
+     if(!data ){
+        throw new NotFoundException(`${id} not found`,"not found")
+     }else{
+      return data
+     }
   }
   
 

package/templates/basic/nest/test.ts.eta

@@ -1,47 +1,104 @@
-import {getServer,getSupertest,token,emptyxorg,getXorg} from '../../setting'
-import success_93a88515_d2ee_49b4_b22c_b11b16f92d1f from './201/id-93a88515-d2ee-49b4-b22c-b11b16f92d1f.json'
+/**
+ * This file was automatically generated by simpleapp generator.
+ * Once this file exists whole test regarding '<%=it.name%>' will not override
+ * last change 2023-11-27
+ * Author: Ks Tan
+ */
 
-describe('Create record & validation', () => {
-   it('/ (POST)', async () => {    
-      await getSupertest(getServer()).post('/<%=it.name%>')
-         .send(success_93a88515_d2ee_49b4_b22c_b11b16f92d1f)
-         .set('Authorization',token)
-         .set('x-org', getXorg())
-         .expect(200);
-      await getSupertest(getServer()).get('/<%=it.name%>/93a88515-d2ee-49b4-b22c-b11b16f92d1f')
-         .set('Authorization',token)
-         .set('x-org', getXorg())
-         .expect(200);
-      await getSupertest(getServer()).delete('/<%=it.name%>/93a88515-d2ee-49b4-b22c-b11b16f92d1f')
-         .set('Authorization',token)
-         .set('x-org', getXorg())
-         .expect(200);
-    });
-})
-// describe('Fetch created record', () => {
 
-// })
-// describe('Update record & validation', () => {
+import {
+  getServer,
+  getSupertest,
+  token,
+  getXorg,
+} from '../../setting';
+import createsuccess_id1 from './stub/id1.create'; //define accepted data
+import updatesuccess_id1 from './stub/id1.update'; //define accepted data
+import createsuccess_id2 from './stub/id2.create'; //define rejected data
 
-// })
-// describe('Fetch updated record', () => {
 
-// })
-// describe('search all records', () => {
+const prefix = '<%=it.doctype%>';
+const id1 = '00000000-0000-0000-0000-000000000001';
+const id2 = '00000000-0000-0000-0000-000000000002';
+const existAutoCompleteKeyword = 'C';
+describe(`Execute test /${prefix}:`,()=>{
+  
+    /**
+     * t1: simple crud test for success flow using id1
+     *  create
+     *    -> search
+     *       -> autocomplete
+     *       -> update
+     *          -> delete
+     *             --> search
+     * 
+    */
+  it(`Basic /${prefix} CRUD with ${id1}`, async()=>{
+      await getSupertest(getServer())
+        .post(`/${prefix}`)
+        .send(createsuccess_id1())
+        .set('Authorization', token)
+        .set('x-org', getXorg())
+        .expect(201)
+        .then(async (res)=>{
+          expect(res.body._id).toBe(id1)
+          // console.log("after created, try search")
+          //verify record by id
+          await getSupertest(getServer())
+              .get(`/${prefix}/${id1}`)
+              .set('Authorization', token)
+              .set('x-org', getXorg())
+              .expect(200)
+              .then(async(res)=>{
+                
+                //verify after record exists
+                expect(res.body._id).toBe(id1)
+                await getSupertest(getServer())
+                  .get(`/${prefix}/autocomplete?keyword=${existAutoCompleteKeyword}`)
+                  .set('Authorization', token)
+                  .set('x-org', getXorg())
+                  .expect(200)
+                  .then((res) => {
+                    expect(res.body[0]._id).toBe(id1)                    
+                  }); //ensure autocomplete ok
 
-// })
-// describe('perform others api test', () => {
+                await getSupertest(getServer())
+                  .put(`/${prefix}/${id1}`)
+                  .send(updatesuccess_id1())
+                  .set('Authorization', token)
+                  .set('x-org', getXorg())
+                  .expect(200)
+                  .then(async(res) => {
+                    expect(res.body._id).toBe(id1)                    
+                    await getSupertest(getServer())
+                      .delete(`/${prefix}/${id1}`)
+                      .set('Authorization', token)
+                      .set('x-org', getXorg())
+                      .expect(200)
+                      .then(async(res)=>{
+                        expect(res.body.result.deletedCount).toBe(1)
+                        expect(res.body.data._id).toBe(id1)                        
+                        await getSupertest(getServer())
+                          .get(`/${prefix}/${id1}`)
+                          .set('Authorization', token)
+                          .set('x-org', getXorg())
+                          .expect(404)                          
+                      })//end delete      
+                  })//end update id1              
+              }) //verify id exists
+        })// after create                
+  })//end simple crud test id1 
 
-// })
-// describe('delete record', () => {
 
-// })
-
-
-// describe('Try search all tenants', () => {
-//     it('/tenant/search (POST)', async () => {    
-//        await getSupertest(getServer()).post('/tenant/search')
-//        .send({fields:['tenantId']}).set('Authorization',token).set('x-org', emptyxorg)
-//        .expect(200)       
-//     });
-//   })
+  /**
+   * t2: test block record
+   */
+  it(`test /${prefix} with reject ${id2}`, async()=>{
+    await getSupertest(getServer())
+        .post(`/${prefix}`)
+        .send(createsuccess_id2())
+        .set('Authorization', token)
+        .set('x-org', getXorg())
+        .expect(400)
+  })
+})

package/templates/nest/.env._eta

@@ -32,3 +32,4 @@ AUTH_ORIGIN=http://localhost:8080
 ADMIN_EMAIL= 
 TEST_OAUTH2_USERNAME=
 TEST_OAUTH2_PASSWORD=
+TEST_SERVER=http://localhost:8000

package/templates/nest/src/main.ts.eta

@@ -23,7 +23,7 @@ async function bootstrap() {
 
   // app.enableCors();
   const httpAdapter = app.get(HttpAdapterHost);
-  app.useGlobalFilters(new SimpleAppExceptionFilter(httpAdapter));
+  // app.useGlobalFilters(new SimpleAppExceptionFilter(httpAdapter));
 
   const config = new DocumentBuilder()
     .setTitle(process.env.PROJECT_NAME)

package/templates/nest/src/simpleapp/generate/apischemas/index.ts.eta

@@ -11,10 +11,10 @@ export class ApiKeyValuePair {
     field1: any
 }
 export class ApiSearchBody{            
-    @ApiProperty({"type":Object,"required":false,"examples":['{"field1":"1"}'],"default":[{"field1":"ok","field2":true,}]} )
+    @ApiProperty({ "type":Object, "required":false, "examples":['{"field1":"1"}'] ,"default":{"field1":"ok","field2":true,}} )
     filter:  Object;
-    @ApiProperty({"type":[Object],"required":true,"examples":['["field1","field2"]'],"default":[["field1","field2"]]} )
+    @ApiProperty({"type":[Object],"required":true,"examples":['["field1","field2"]'],"default":["field1","field2"]} )
     fields:  [Object];
-    @ApiProperty({"type":()=>[Object],"required":true,"examples":['[{"field1":"asc"}]'],"default":[[{"field1":"asc"}]]} )
+    @ApiProperty({"type":()=>[Object],"required":true,"examples":['[[ "field1", "asc" ]]'],"default":[[ 'field1', 'asc' ]]} )
     sorts:  [Object];
 }

package/templates/nest/src/simpleapp/generate/commons/exceptions/SimpleAppExceptionFilter.ts.eta

@@ -15,53 +15,62 @@ import { HttpAdapterHost } from '@nestjs/core';
 import { ClientSession } from 'mongoose';
 @Catch()
 export class SimpleAppExceptionFilter implements ExceptionFilter {
-  constructor(
-    private readonly httpAdapterHost: HttpAdapterHost) {}
+  constructor(private readonly httpAdapterHost: HttpAdapterHost) {}
 
-  catch(exception, host: ArgumentsHost): void {
+ async catch(exception, host: ArgumentsHost) {
     // In certain situations `httpAdapter` might not be available in the
     // constructor method, thus we should resolve it here.
     const { httpAdapter } = this.httpAdapterHost;
     const ctx = host.switchToHttp();
     const request = ctx.getRequest<Request>();
-    
-    if(request['sessionuser']){
-      const session:ClientSession = request['sessionuser'].getDBSession()
-      if(session.inTransaction())session.abortTransaction()      
+
+    if (request['sessionuser']) {
+      const session: ClientSession = request['sessionuser'].getDBSession();
+      if (session.inTransaction()) {
+        await session.abortTransaction()//.then(()=>session.endSession());
+        session.endSession()
+      }
     }
     // console.log('exceptionexception',typeof exception,Object.keys(exception),exception)
-    let errordata
-    let finalstatus
-    let msg
-    if(Object.keys(exception).length>0){
-      msg = exception.message      
-      errordata = (exception.response && exception.response.options) ? exception.response.options : exception.options
-      finalstatus = ( exception.response &&  exception.response.status) ? exception.response.status : exception.status
-    }else{
-      msg = String(exception)      
-      finalstatus = 500
+    let errordata;
+    let finalstatus;
+    let msg;
+    if (Object.keys(exception).length > 0) {
+      msg = exception.message;
+      errordata =
+        exception.response && exception.response.options
+          ? exception.response.options
+          : exception.options;
+      finalstatus =
+        exception.response && exception.response.status
+          ? exception.response.status
+          : exception.status;
+    } else {
+      msg = String(exception);
+      finalstatus = 500;
     }
 
     const responseBody = {
       message: msg,
-      timestamp: new Date().toISOString(),      
+      timestamp: new Date().toISOString(),
       path: httpAdapter.getRequestUrl(ctx.getRequest()),
-      error:errordata
+      error: errordata,
     };
-    
-    const eventObj = request['eventObj']
-    if(eventObj){    
-      eventObj.statusCode=finalstatus
-      eventObj.errMsg=responseBody.message
-      const endtime =new Date()
-      eventObj.updated = endtime.toISOString()
-      eventObj.data = request.body
-      eventObj.errData = responseBody.error
-      eventObj.status="NG"
-      eventObj.duration =  endtime.getTime() - new Date(eventObj.created).getTime()
-      eventObj.save()
+
+    const eventObj = request['eventObj'];
+    if (eventObj) {
+      eventObj.statusCode = finalstatus;
+      eventObj.errMsg = responseBody.message;
+      const endtime = new Date();
+      eventObj.updated = endtime.toISOString();
+      eventObj.data = request.body;
+      eventObj.errData = responseBody.error;
+      eventObj.status = 'NG';
+      eventObj.duration =
+        endtime.getTime() - new Date(eventObj.created).getTime();
+      eventObj.save();
     }
-    
-    httpAdapter.reply(ctx.getResponse(), responseBody,finalstatus);
+
+    httpAdapter.reply(ctx.getResponse(), responseBody, finalstatus);
   }
-}
+}