@simitgroup/simpleapp-generator 2.0.0-n-alpha → 2.0.0-o-alpha

package/ReleaseNote.md

@@ -1,3 +1,7 @@
+[2.0.0o-alpha]
+1. Fix create many bugs
+2. support request multiple number
+
 [2.0.0n-alpha]
 1. fix bugs on declare generator version
 2. show generator version on swagger ui

package/package.json

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

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

@@ -27,7 +27,7 @@ async function bootstrap() {
 
   const config = new DocumentBuilder()
     .setTitle(process.env.PROJECT_NAME)
-    .addServer(process.env.BACKEND_URL)
+    .addServer(process.env.APP_SWAGGER_SERVER_URL)
     .setDescription(`${process.env.PROJECT_DESCRIPTION} (generator: ${generatorVersion})`)
     .setVersion(process.env.PROJECT_VERSION)
     .addApiKey(

package/templates/nest/src/simple-app/_core/features/document-no-format/document-no-format.service.ts.eta

@@ -186,4 +186,33 @@ export class SimpleAppDocumentNoFormatService {
     Object.assign(filter, isolationFilter);
     return await this.docformat.find<DocumentNoFormat>(filter, null, { session: appUser.getDBSession() });
   }
+
+  async requestMultipleNumbers(appUser: UserContext, doctype: string, quantity:number, id: string = '') {
+    doctype = doctype.toUpperCase();
+    const documentNumbers: string[] = []
+    const filter = { docNoType: doctype, active: true };
+    if (id) {
+      filter['_id'] = id;
+    }
+    //
+    Object.assign(filter, appUser.getBranchFilter());
+    const result = await this.docformat.find(filter).session(appUser.getDBSession());
+    if (result && result.length > 0) {
+      const d: DocumentNoFormat = result[0];
+      const recordId = d._id;      
+      
+      for(let i=0;i<quantity;i++){
+        d.nextNumber++
+        const newdocno = SimpleAppDocumentNoFormatService.previewDocNo(d);
+        documentNumbers.push(newdocno)
+
+      }      
+      const updatedata = { nextNumber: d.nextNumber+1 } as DocumentNoFormat;
+      const updateresult = await this.docformat.findByIdAndUpdate(recordId, updatedata).session(appUser.getDBSession());
+
+      return documentNumbers
+    } else {
+      throw new BadRequestException(`No active document number found for ${doctype}. Please update in Settings > Document Numbering Format`);
+    }
+  }
 }

package/templates/nest/src/simple-app/_core/framework/base/simple-app.service.ts.eta

@@ -16,15 +16,13 @@ import addFormats from 'ajv-formats';
 import { FilterQuery, Model, PipelineStage, mongo } from 'mongoose';
 // import { CloudApiService } from 'src/cloudapi/cloudapi.service';
 import { foreignkeys } from '../../features/foreign-key/foreignkeys.dict';
-import { CustomException } from '../custom-exception';
 
 import { camelToKebab } from 'src/simple-app/_core/utils/string-utils';
 import { SimpleAppDocumentNoFormatService } from '../../features/document-no-format/document-no-format.service';
+import { SimpleAppLogService } from '../../features/log/log.service';
 import { UserContext } from '../../features/user-context/user.context';
 import { RunWebhookService } from '../../features/webhook/run-webhook.service';
-import { UniqueKeyExistResponse, DeleteResultType, IsolationType, MoreProjectionType, SchemaFields, TextSearchBody, PatchManyRequest } from '../schemas';
-import { SimpleAppLogService } from '../../features/log/log.service';
-import { ProcessErrorException } from 'src/simple-app/features/exception/process-error.exception';
+import { DeleteResultType, IsolationType, MoreProjectionType, PatchManyRequest, SchemaFields, TextSearchBody, UniqueKeyExistResponse } from '../schemas';
 
 @Injectable()
 export class SimpleAppService<T extends SchemaFields> {
@@ -108,7 +106,7 @@ export class SimpleAppService<T extends SchemaFields> {
   public isReadOnly(): boolean {
     return false;
   }
-  reCalculateValue(data: T) {}
+  reCalculateValue(data: T) { }
   getIsolationFilter = (appuser: UserContext) => {
     let isolationFilter = {};
     switch (this.isolationtype) {
@@ -483,6 +481,10 @@ export class SimpleAppService<T extends SchemaFields> {
       try {
         const result = await this.doc.insertMany(datas, { session: dbsession });
         await this.addManyAuditEvents(appuser, this.documentName, 'createMany', datas);
+        for (const data of datas) {
+          appuser.addInsertedRecordId(this.documentName, data._id);
+        }
+
         return result;
       } catch (e) {
         throw e;
@@ -902,7 +904,7 @@ export class SimpleAppService<T extends SchemaFields> {
 
       //patch not suitable trigger afterupdate
       // if (this.hooks.beforeUpdate) await this.hooks.beforeUpdate(appuser, id, existingdata, data);
-      await this.runEvent(appuser, this.setHookName('beforePatch'), { id: id, patchData: data,prevData:existingdata }, false);
+      await this.runEvent(appuser, this.setHookName('beforePatch'), { id: id, patchData: data, prevData: existingdata }, false);
       const dbsession = appuser.getDBSession();
       if (dbsession && !dbsession.inTransaction()) {
         dbsession.startTransaction({ readPreference: 'primary' });
@@ -935,7 +937,7 @@ export class SimpleAppService<T extends SchemaFields> {
         await this.addAuditEvent(appuser, this.documentName, id, 'patch', data);
       }
       appuser.addUpdatedRecordId(this.documentName, data._id);
-      await this.runEvent(appuser, this.setHookName('afterPatch'), { id: id, patchData: data, prevData:existingdata }, false);
+      await this.runEvent(appuser, this.setHookName('afterPatch'), { id: id, patchData: data, prevData: existingdata }, false);
       return result; //await this.findById(appuser, id);
     } catch (err) {
       this.logger.error(err.message, 'findIdThenPath error');
@@ -1090,13 +1092,12 @@ export class SimpleAppService<T extends SchemaFields> {
    * @param      {any}          data       The data
    * @return     {Promise}      { description_of_the_return_value }
    */
-  async runEvent(appuser: UserContext, eventName: string, payloads: any, enforce: boolean = true) {    
+  async runEvent(appuser: UserContext, eventName: string, payloads: any, enforce: boolean = true) {
     try {
       if (enforce && !this.eventEmitter.hasListeners(eventName)) {
         throw new InternalServerErrorException(`${eventName} seems no listener`);
       } else if (this.eventEmitter.hasListeners(eventName)) {
-
-        console.log("run eventName",eventName)
+        console.log('run eventName', eventName);
         const res = await this.eventEmitter.emitAsync(eventName, appuser, payloads);
 
         if (!res) {

package/templates/nuxt/components/select/SelectTemplate.vue._eta

@@ -1,7 +1,7 @@
 <template>
   <div class="w-full">
     <div class="flex flex-row">
-      <label v-if="!hideLabel" :for="fieldid">
+      <label v-if="!hideLabel" :for="fieldid" class="mr-2 text-xs text-gray-400">
         {{ t(documentName) }}
       </label>
       <div