@simitgroup/simpleapp-generator 2.0.1-o-alpha → 2.0.1-q-alpha

package/ReleaseNote.md

@@ -1,3 +1,15 @@
+[2.0.1q-alpha]
+
+1. fixagain delete record cant work in transactions, sharded env
+
+
+
+[2.0.1p-alpha]
+
+1. fix delete record cant work in transactions, sharded env
+
+
+
 [2.0.1o-alpha]
 
 1. fetch branch image url, and fix maintenance mode data

package/package.json

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

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

@@ -357,7 +357,6 @@ export class SimpleAppService<T extends SchemaFields> {
     }
   }
 
- 
   /**
    * create many from array, for performance reason it submit all item in 1 go, so it won't implement hooks
    * @param appuser
@@ -377,7 +376,7 @@ export class SimpleAppService<T extends SchemaFields> {
       }
       const dbsession = appuser.getDBSession();
       if (dbsession && !dbsession.inTransaction()) {
-        dbsession.startTransaction({readConcern:{level:"snapshot"},writeConcern:{w:"majority"}, readPreference: 'primary' });
+        dbsession.startTransaction({ readConcern: { level: 'snapshot' }, writeConcern: { w: 'majority' }, readPreference: 'primary' });
       }
 
       try {
@@ -404,7 +403,7 @@ export class SimpleAppService<T extends SchemaFields> {
     }
     const dbsession = appuser.getDBSession();
     if (dbsession && !dbsession.inTransaction() && !noStartTransaction) {
-      dbsession.startTransaction({readConcern:{level:"snapshot"},writeConcern:{w:"majority"}, readPreference: 'primary' });
+      dbsession.startTransaction({ readConcern: { level: 'snapshot' }, writeConcern: { w: 'majority' }, readPreference: 'primary' });
     }
 
     this.logger.debug('this.withDocNumberFormat :' + this.withDocNumberFormat + '  && ' + '!data[this.documentIdentityCode] ==' + !data[this.documentIdentityCode]);
@@ -550,7 +549,7 @@ export class SimpleAppService<T extends SchemaFields> {
     }
     const dbsession = appuser.getDBSession();
     if (dbsession && !dbsession.inTransaction()) {
-      dbsession.startTransaction({readConcern:{level:"snapshot"},writeConcern:{w:"majority"}, readPreference: 'primary' });
+      dbsession.startTransaction({ readConcern: { level: 'snapshot' }, writeConcern: { w: 'majority' }, readPreference: 'primary' });
     }
 
     let dependency;
@@ -561,7 +560,6 @@ export class SimpleAppService<T extends SchemaFields> {
       // if (this.hooks.beforeDelete) await this.hooks.beforeDelete(appuser, id, deletedata);
       this.logger.debug('delete record', this.documentName, id);
       dependency = await this.getRelatedRecords(appuser, id);
-      //console.log('dependency', dependency);
       if (!dependency) {
         const filterIsolation = this.getIsolationFilter(appuser);
         this.polishIsolationFilter(filterIsolation);
@@ -629,7 +627,7 @@ export class SimpleAppService<T extends SchemaFields> {
 
       const dbsession = appuser.getDBSession();
       if (dbsession && !dbsession.inTransaction() && !noStartTransaction) {
-        dbsession.startTransaction({readConcern:{level:"snapshot"},writeConcern:{w:"majority"}, readPreference: 'primary' });
+        dbsession.startTransaction({ readConcern: { level: 'snapshot' }, writeConcern: { w: 'majority' }, readPreference: 'primary' });
       }
       // try {
       Object.assign(data, appuser.getUpdateFilter());
@@ -688,7 +686,7 @@ export class SimpleAppService<T extends SchemaFields> {
 
       const dbsession = appuser.getDBSession();
       if (dbsession && !dbsession.inTransaction()) {
-        dbsession.startTransaction({readConcern:{level:"snapshot"},writeConcern:{w:"majority"}, readPreference: 'primary' });
+        dbsession.startTransaction({ readConcern: { level: 'snapshot' }, writeConcern: { w: 'majority' }, readPreference: 'primary' });
       }
       // try {
       // Object.assign(data, appuser.getUpdateFilter());
@@ -744,7 +742,7 @@ export class SimpleAppService<T extends SchemaFields> {
       await this.runEvent(appuser, this.setHookName('beforePatch'), { id: id, patchData: data, prevData: existingdata }, false);
       const dbsession = appuser.getDBSession();
       if (dbsession && !dbsession.inTransaction()) {
-        dbsession.startTransaction({readConcern:{level:"snapshot"},writeConcern:{w:"majority"}, readPreference: 'primary' });
+        dbsession.startTransaction({ readConcern: { level: 'snapshot' }, writeConcern: { w: 'majority' }, readPreference: 'primary' });
       }
       // try {
       Object.assign(data, appuser.getUpdateFilter());
@@ -782,7 +780,21 @@ export class SimpleAppService<T extends SchemaFields> {
       throw new InternalServerErrorException(err.message);
     }
   };
-
+  async deleteMany(appUser: UserContext, filter: FilterQuery<T>) {
+    const dbsession = appUser.getDBSession();
+    if (dbsession && !dbsession.inTransaction()) {
+      dbsession.startTransaction({ readConcern: { level: 'snapshot' }, writeConcern: { w: 'majority' }, readPreference: 'primary' });
+    }
+    const searchResult = await this.search(appUser, filter, []);
+    const ids = searchResult.map((row) => row._id);
+    const result = await this.doc.deleteMany({ _id: { $in: ids } });
+    console.log(`Delete ${this.documentName} ids`, ids, result);
+    for (const id of ids) {
+      appUser.addDeletedRecordId(this.documentName, id);
+    }
+    return result;
+    //updateMany(isolationFilter, { $set: patch }, { session: dbsession });
+  }
   async patchMany<T>(appuser: UserContext, data: PatchManyRequest<T>) {
     // filter = {
     //   _id: '7eb2661a-6ea6-406e-b868-2e8b19c4658b',
@@ -799,7 +811,7 @@ export class SimpleAppService<T extends SchemaFields> {
     // Get DB Session
     const dbsession = appuser.getDBSession();
     if (dbsession && !dbsession.inTransaction()) {
-      dbsession.startTransaction({readConcern:{level:"snapshot"},writeConcern:{w:"majority"}, readPreference: 'primary' });
+      dbsession.startTransaction({ readConcern: { level: 'snapshot' }, writeConcern: { w: 'majority' }, readPreference: 'primary' });
     }
 
     const result = await this.doc.updateMany(isolationFilter, { $set: patch }, { session: dbsession });
@@ -836,10 +848,14 @@ export class SimpleAppService<T extends SchemaFields> {
           //not deleted in current session, check from database
           const filter = {};
           filter[fkey] = id;
-          const result = await collection.findOne(filter, {
+          const result:any = await collection.findOne(filter, {
             session: appuser.getDBSession(),
           });
           if (result) {
+            //record deleted but not yet commit, safely ignore
+            if(appuser.searchDeletedRecordId(collectionname, result._id))continue;
+
+
             this.logger.error(result, `related result found in ${collectionname} ${fkey} = ${id}`);
             return result;
           }

package/templates/nuxt/components/simpleApp/SimpleAppAutocomplete.vue.eta

@@ -6,7 +6,7 @@
     <button
       type="button"
       :readonly="readonly"
-      class="cursor-pointer text-primary-600"
+      class="cursor-pointer text-primary-600 line-clamp-1 text-left w-full"
       tabindex="0"
       @click="openViewer(true)"
     >
@@ -22,15 +22,13 @@
       :id="inputId"
       ref="autocompleteinput"
       type="button"
-      class="cursor-pointer text-primary-600 flex-1 text-left"
+      class="cursor-pointer text-primary-600 flex-1 text-left line-clamp-1"
       @click="openViewer(false)"
     >
       {{ modelValue && modelValue.label ? modelValue.label : "-" }}
     </button>
 
-    <div
-      class="text-right text-white align-middle"
-    >
+    <div class="text-right text-white align-middle">
       <button
         type="button"
         class="pi pi-times rounded-full bg-slate-500 p-1 cursor-pointer text-xs"
@@ -78,9 +76,7 @@
     >
       <template #header>
         <slot name="header">
-          <div
-            class="flex flex-row font font-semibold text-sm gap-2 p-2"
-          >
+          <div class="flex flex-row font font-semibold text-sm gap-2 p-2">
             <div class="w w-1/3 line-clamp-1">
               {{ t(codefield) ?? t("code") }}
             </div>
@@ -128,14 +124,14 @@
           <mobile-toolbar>
             <template #start>
               <ButtonText @click="mobileVisible = false">
-                <i class="pi pi-times"/>
+                <i class="pi pi-times" />
               </ButtonText>
             </template>
             <template #center>
               <TextTitle class="text-white">{{ t(docname) }}</TextTitle>
             </template>
             <template #end>
-              <div/>
+              <div />
               <!-- <ButtonText @click="openViewer(false)">
             <i class="pi pi-plus"></i>
             </ButtonText>  -->