@simitgroup/simpleapp-generator 1.6.4-d-alpha → 1.6.4-f-alpha

package/templates/nest/src/simpleapp/generate/commons/user.context.ts.eta

@@ -210,7 +210,7 @@ export class UserContext {
           },
           {
             $unwind: '$currentTenant',
-          }          
+          },
         ],
       },
     };
@@ -219,12 +219,11 @@ export class UserContext {
 
     if (this.tenantId > 0) {
       pipeline.push(joinpermission);
-      pipeline.push({$unwind:'$permissions'})
-
+      pipeline.push({ $unwind: '$permissions' });
     }
     // console.log("obtainProfileFromDbobtainProfileFromDb ",pipeline)
     // const users = await usermodel.find(filter)
-    const users = await this.usermodel.aggregate(pipeline);    
+    const users = await this.usermodel.aggregate(pipeline);
     this.logger.verbose(
       `aggregate user profile from database`,
       'obtainProfileFromDb',
@@ -241,7 +240,7 @@ export class UserContext {
 
         if (myperm && myperm.groups) {
           userinfo.groups = myperm.groups;
-          userinfo.roles = [] as Role[];
+          userinfo.roles = [Role.Everyone, Role.User] as Role[];
           for (let g = 0; g < userinfo.groups.length; g++) {
             const roles: Role[] = rolegroups[userinfo.groups[g]]();
             for (let r = 0; r < roles.length; r++) {
@@ -608,7 +607,6 @@ export class UserContext {
         },
       } as PipelineStage;
 
-
       const permission: PipelineStage = {
         $lookup: {
           from: 'permission',
@@ -639,12 +637,19 @@ export class UserContext {
       };
 
       const pipelines: PipelineStage[] = [
-        { $match: { uid: this.uid, tenantId: { $gt: 0 }}},
-        { $lookup: { from: 'tenant', localField: 'tenantId', foreignField: 'tenantId',as: 'tenant'}},
+        { $match: { uid: this.uid, tenantId: { $gt: 0 } } },
+        {
+          $lookup: {
+            from: 'tenant',
+            localField: 'tenantId',
+            foreignField: 'tenantId',
+            as: 'tenant',
+          },
+        },
         permission,
       ];
       // const users=[]
-      this.logger.warn(pipelines, 'pipelines');
+      // this.logger.warn(pipelines, 'pipelines');
       const users = await this.usermodel.aggregate(pipelines);
 
       if (users) {

package/templates/nest/src/simpleapp/generate/processors/simpleapp.processor.ts.eta

@@ -367,7 +367,6 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
       dbsession.startTransaction();
     }
 
-
     this.logger.debug(
       'this.withDocNumberFormat :' +
         this.withDocNumberFormat +
@@ -379,7 +378,6 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
       await this.genNewDocNo(appuser, data);
     }
 
-    
     let isolationFilter: any = { ...appuser.getCreateFilter() };
     isolationFilter = this.polishIsolationFilter(isolationFilter, data);
 
@@ -623,14 +621,14 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
           `You submit older version data "v${data.__v}"" but latest version = "v${existingdata.__v}"`,
         );
       }
-      this.logger.debug('warn1', existingdata);
+      // this.logger.debug('warn1', existingdata);
       data.__v = existingdata.__v + 1;
       // if (!existingdata) {
       //   throw new NotFoundException(`${id} not found`, 'not found');
       // }
-      this.logger.debug('warn2');
+      // this.logger.debug('warn2');
       if (this.hooks.beforeUpdate)
-        await this.hooks.beforeUpdate(appuser, id, data, existingdata);
+        await this.hooks.beforeUpdate(appuser, id,  existingdata,data);
 
       const dbsession = appuser.getDBSession();
       if (dbsession && !dbsession.inTransaction()) {
@@ -693,7 +691,7 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
     data.__v = existingdata.__v + 1;
 
     if (this.hooks.beforeUpdate)
-      await this.hooks.beforeUpdate(appuser, id, data, existingdata);
+      await this.hooks.beforeUpdate(appuser, id,existingdata, data);
 
     const dbsession = appuser.getDBSession();
     if (dbsession && !dbsession.inTransaction()) {

package/templates/nest/src/simpleapp/generate/processors/webhook.processor.ts.eta

@@ -0,0 +1,224 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2024-02-23
+ * Author: Ks Tan
+ */
+import { UserContext } from '../commons/user.context';
+import * as sharelibs from '../sharelibs';
+import { Injectable,  InternalServerErrorException, } from '@nestjs/common';
+import { InjectModel } from '@nestjs/mongoose';
+import * as jsonpath from 'jsonpath';
+import { Model } from 'mongoose';
+import { WebhookJsonSchema } from '../jsonschemas/webhook.jsonschema';
+import { SimpleAppService } from './simpleapp.processor';
+import * as types from '../types';
+import { DocNumberFormatGenerator } from '../commons/docnogenerator.service';
+import {
+  WebhookBasicAuth,
+  WebhookHeaders,
+  Webhook,
+} from '../types/webhook.type';
+import {
+  DefaultWebhookBasicAuth,
+  DefaultWebhookHeaders,
+  DefaultWebhook,
+} from '../defaults/webhook.default';
+
+@Injectable()
+export class WebhookProcessor extends SimpleAppService<Webhook> {
+  protected documentIdentityCode = 'title';
+  protected documentIdentityLabel = 'title';
+  private webhookApiKey = process.env.WEBHOOK_SERVER_APIKEY
+  private webhookAppId=process.env.WEBHOOK_SERVER_APP_ID
+  private webhookurl = process.env.WEBHOOK_SERVER_URL;
+  private webhookprefix = process.env.PROJECT_CODE+'.'
+  private  webhooksubscribtionurl = `${process.env.WEBHOOK_SERVER_URL}/subscriptions/`;
+
+  protected hooks: types.WebhookHooks = {
+    beforeCreate: async (appuser: UserContext, data: types.Webhook) =>
+      this.beforeCreate(appuser, data),
+    beforeUpdate: async (
+      appuser: UserContext,
+      id: string,
+      prevdata: types.Webhook,
+      newdata: types.Webhook,
+    ) => this.beforeUpdate(appuser, id, prevdata, newdata),
+    afterDelete: async (
+      appuser: UserContext,
+      result: types.DeleteResultType<types.Webhook>,
+      id: string,
+    ) => this.afterDelete(appuser, result, id),
+  };
+
+
+  protected foreignkeys = {};
+  constructor(mydoc: Model<Webhook>) {
+    super('WEBHOOK', 'webhook', mydoc, types.IsolationType.tenant);
+    this.setSchema(WebhookJsonSchema);
+    this.setData(DefaultWebhook(crypto.randomUUID()));
+  }
+
+  reCalculateValue(data: Webhook) {
+    //console.log('trigger new recalculate')
+    const $data = data;
+    const jsopbj = new jsonpath['JSONPath']();
+  }
+
+  async beforeCreate(appuser: UserContext, data: types.Webhook) {
+    const createResult = await this.addRemoteWebhook(appuser, data);
+    if (!createResult['subscription_id'])
+      throw new InternalServerErrorException(
+        'syncronize webhook server failed',
+      );
+    data.serverSubscriptionId = createResult.subscription_id;
+    data.serverSubscriptionSecret = createResult.secret;
+    // throw new BadRequestException("fail purposely")
+  }
+
+  async beforeUpdate(
+    appuser: UserContext,
+    id: string,
+    prevdata: types.Webhook,
+    newdata: types.Webhook,
+  ) {
+
+    if(!prevdata.serverSubscriptionId){
+        const createResult = await this.addRemoteWebhook(appuser, newdata);
+        if (!createResult['subscription_id'])
+          throw new InternalServerErrorException(
+            'syncronize webhook server failed',
+           );
+        newdata.serverSubscriptionId = createResult.subscription_id;
+        newdata.serverSubscriptionSecret = createResult.secret;
+    }else{
+      await this.updateRemoteWebhook(appuser,newdata)
+    }
+  }
+
+  async afterDelete(
+    appuser: UserContext,
+    result: types.DeleteResultType<types.Webhook>,
+    id: string,
+  ) {
+    await this.removeRemoteWebhook(appuser,result,id)         
+  }
+
+  async removeRemoteWebhook(
+    appuser: UserContext,
+    result: types.DeleteResultType<types.Webhook>,
+    id: string,
+  ){
+    const options = {
+      method: 'DELETE',
+      headers: {Authorization: this.webhookApiKey}
+    };
+
+
+    const subscriptionId=result.data.serverSubscriptionId
+    if(!subscriptionId)return 
+
+    try{
+      const res = await fetch(
+          `${this.webhooksubscribtionurl}/${subscriptionId}?application_id=${this.webhookAppId}`,
+          options)            
+    }catch(e){
+      throw new InternalServerErrorException(e)
+    }
+
+  }
+  async addRemoteWebhook(appuser: UserContext, data: types.Webhook) {
+    const headers = {};
+    data.headers.forEach((h) => {
+      headers[h.name] = h.value;
+    });
+
+    const options = {
+      method: 'POST',
+      headers: {
+        Authorization: this.webhookApiKey,
+        accept: 'application/json',
+        'content-type': 'application/json',
+      },
+      body: JSON.stringify({
+        application_id: this.webhookAppId,
+        description: data.title,
+        metadata: {
+          tenantId: data.tenantId.toString(),
+          creator: appuser.getUname(),
+        },
+        is_enabled: data.active,
+        event_types: data.eventTypes.map(
+          (item) => this.webhookprefix + item,
+        ),
+        label_key: 'tenantId',
+        label_value: data.tenantId.toString(),
+        target: {
+          headers: headers,
+          type: 'http',
+          method: data.requestMethod.toUpperCase(),
+          url: data.url,
+        },
+      }),
+    };
+    try {
+      const res = await fetch(this.webhooksubscribtionurl, options);
+      return await res.json();
+      if (res.status >= 300) {
+        this.logger.error(res.statusText, 'create webhook failed');
+        throw new InternalServerErrorException('create webhook failed');
+      }
+    } catch (e) {
+      throw new InternalServerErrorException(e);
+    }
+  }
+
+  async updateRemoteWebhook(appuser: UserContext, data: types.Webhook) {
+    const headers = {};
+    data.headers.forEach((h) => {
+      headers[h.name] = h.value;
+    });
+
+    const options = {
+      method: 'PUT',
+      headers: {
+        Authorization: this.webhookApiKey,
+        accept: 'application/json',
+        'content-type': 'application/json',
+      },
+      body: JSON.stringify({
+        application_id: this.webhookAppId,
+        description: data.title,
+        metadata: {
+          tenantId: data.tenantId.toString(),
+          creator: appuser.getUname(),
+        },
+        is_enabled: data.active,
+        event_types: data.eventTypes.map(
+          (item) => this.webhookprefix + item,
+        ),
+        label_key: 'tenantId',
+        label_value: data.tenantId.toString(),
+        target: {
+          headers: headers,
+          type: 'http',
+          method: data.requestMethod.toUpperCase(),
+          url: data.url,
+        },
+      }),
+    };
+    try {
+      const subscriptionId = data.serverSubscriptionId
+      const res = await fetch(`${this.webhooksubscribtionurl}/${subscriptionId}`, options);
+      return await res.json();
+      if (res.status >= 300) {
+        this.logger.error(res.statusText, 'updateRemoteWebhook webhook failed');
+        throw new InternalServerErrorException('update webhook failed');
+      }
+    } catch (e) {
+      throw new InternalServerErrorException(e);
+    }
+  }
+
+  /***************************** additional execute *****************************************/
+}

package/templates/nest/src/simpleapp/profile/profile.controller.ts.eta

@@ -67,7 +67,6 @@ export class ProfileController {
     }
   }
 
-
   @Get('session')
   @Roles(Role.Everyone, Role.User)
   @ApiOperation({
@@ -80,15 +79,15 @@ export class ProfileController {
     description: 'Success',
   })
   @ApiResponse({ status: 401, type: Object, description: 'Expired' })
-  async getSession(@AppUser() appuser: UserContext) {   
-    const result = await this.profileservice.getSession(appuser);    
+  async getSession(@AppUser() appuser: UserContext) {
+    const result = await this.profileservice.getSession(appuser);
     if (result) {
       return result;
     } else {
       throw new HttpException('Forbidden', HttpStatus.FORBIDDEN);
     }
   }
-  
+
   @Get('/tenants')
   @Roles(Role.Everyone, Role.User)
   @ApiOperation({
@@ -127,9 +126,16 @@ export class ProfileController {
     @AppUser() appuser: UserContext,
     @Body('tenantName') tenantName: string,
     @Body('timeZone') timeZone: string,
-    @Body('utcOffset') utcOffset:number
+    @Body('utcOffset') utcOffset: number,
+    @Body('businessType') businessType: string,
   ) {
-    const result = await this.profileservice.createTenant(appuser, tenantName,timeZone,utcOffset);
+    const result = await this.profileservice.createTenant(
+      appuser,
+      tenantName,
+      timeZone,
+      utcOffset,
+      businessType,
+    );
     if (result) {
       return result;
     } else {
@@ -170,9 +176,11 @@ export class ProfileController {
   async runTourComplete(
     @AppUser() appuser: UserContext,
     @Param('guidename') guidename: string,
-    
   ) {
-    const result = await this.profileservice.runTourComplete(appuser,guidename,);
+    const result = await this.profileservice.runTourComplete(
+      appuser,
+      guidename,
+    );
     if (result) {
       return result;
     } else {

package/templates/nest/src/simpleapp/profile/profile.service.ts.eta

@@ -92,6 +92,7 @@ export class ProfileService {
     tenantName: string,
     timeZone: string,
     utcOffset: number,
+    businessType: string,
   ) {
     // try{
     const timezonedata = countrytimezone.getCountriesForTimezone(timeZone)[0];
@@ -103,10 +104,11 @@ export class ProfileService {
     const tenantdata: Tenant = {
       tenantId: 1,
       tenantName: tenantName,
-      clientSetting: {        
-              auditTrail:false,
-              webhook:false,
-              support:false,        
+      businessType: businessType,
+      clientSetting: {
+        auditTrail: false,
+        webhook: false,
+        support: false,
       },
       active: true,
       owner: {

package/templates/nuxt/components/calendar/CalendarSmall.vue.eta

@@ -1,129 +1,132 @@
-<template>
-  <ClientOnly>
-    <VueCal
-      :id="id"
-      class="w-full"
-      hide-view-selector
-      click-to-navigate
-      :time="false"
-      today-button
-      active-view="month"
-      :disable-views="['week', 'day']"
-      :selected-date="selectedDate"
-      events-count-on-year-view
-      @view-change="viewChange"
-      :events="allevents"
-      @cell-focus="chooseDate"
-      xsmall
-    >
-      <template #today-button>
-        <!-- Using Vuetify (but we prefer Wave UI 🤘) -->
-        <div @click="chooseDate(new Date(), true)">{{ t("today") }}</div>
-      </template>
-      <template #cell-content="{ cell, events }">
-        <div>
-          <div>
-            <s
-              v-if="isHoliday(cell.formattedDate)"
-              v-tooltip="getHolidayName(new Date(cell.formattedDate))"
-              class="text text-red-400 dark:text-red-400 font-bold"
-              >{{ cell.content }}</s
-            >
-            <div v-else-if="isOffDay(cell)" class="text-gray-400">
-              <s v-tooltip="t('offDay')">{{ cell.content }}</s>
-            </div>
-            <span v-else>{{ cell.content }} </span>
-          </div>
+<template>    
+  <Calendar 
+      v-model="selectedDate"
+      inline            
+      @update:modelValue="chooseDate"
+      :pt="{root:{class:'w-full'}}" 
+      @month-change="viewChange"
+      @year-change="viewChange"
+      class="smallcalendar">
+      <template #footer>
+          <div class="p-2 flex flex-row justify-between">
+              <ButtonPrimary @click="goToday()">{{ t('today') }}</ButtonPrimary>
+              <TextSubsubtitle class="text-right"
+                  >{{ items.length }} {{ t("records") }}</TextSubsubtitle>
 
-          <div>
-            <slot name="default" :cell="cell" :events="events">
+          </div>
+      </template>
+      <template #date="{date}">
+          <div class="flex flex-col text-center" >            
+              <s v-if="isHoliday(date)" class="text-red-600">
+                  {{ date.day }}                     
+              </s>
+              <span v-else-if="isOffDay(date)" class="text-gray-400">
+                  {{ date.day }}
+              </span>
+              <template v-else>
+                  {{ date.day }}
+              </template>
               <Badge
-                v-if="events.length > 0"
-                @contextmenu="
-                  (mouseevent) => onRightClickDate(mouseevent, cell)
-                "
-                severity="info"
-                :value="events.length"
+                  v-if="getEventQty(date) > 0"                
+                  severity="info"
+                  :value="getEventQty(date)"
               />
-            </slot>
           </div>
-        </div>
       </template>
-    </VueCal>
-  </ClientOnly>
+  </Calendar>
 </template>
-<script lang="ts" setup generic="T">
-/**
- * This file was automatically generated by simpleapp generator during initialization.
- * IT IS NOT CHANGABLE
- * last change 2024-02-22
- * author: Ks Tan
- */
-//, { Event, SplitDaysAttributes }
-import VueCal from "vue-cal";
-import "vue-cal/dist/vuecal.css";
+<script setup lang="ts" generic="T">
+import { CalendarDateSlotOptions,CalendarMonthChangeEvent } from "primevue/calendar";
+
 import {
-  CalEventType,
-  CalRightClickEvent,
-  OffDay,
-  CalViewChange,
+CalEventType,
+CalRightClickEvent,
+OffDay,
+CalViewChange,
 } from "~/types";
-const viewStatus = ref<CalViewChange>();
+
 const props = defineProps<{
-  id: string;
-  items: CalEventType<T>[];
-  holidays: OffDay[];
+id: string;
+items: CalEventType<T>[];
+holidays: OffDay[];
 }>();
-const offdays = ref<string[]>([]);
-const emits = defineEmits(["chooseDate", "rightClick","viewChange"]);
-// const allholidays = computed(() => props.holidays.map((item) => item.date));
+const emits = defineEmits(["chooseDate", "viewChange"]);
+
+
 const selectedDate = defineModel<Date>({ required: true });
-const getHolidayName = (date: Date) =>
-  props.holidays.find((item) => item.date.getTime() == date.getTime())?.title;
-const allevents = computed(() => {
-  const list = props.items.map((item) => {
-    if (item.start instanceof Date)
-      item.start = item.start.format("YYYY-MM-DD HH:mm");
-    else if (typeof item.start == "string") {
-      item.start = item.start.substring(0, 16).replace("T", " ");
-    }
-    if (item.end instanceof Date)
-      item.end = item.end.format("YYYY-MM-DD HH:mm");
-    else if (typeof item.end == "string") {
-      item.end = item.end.substring(0, 16).replace("T", " ");
-    }
-    return item;
-  });
-  return list;
-});
-const viewChange = (event: CalViewChange) => {
-  viewStatus.value = event;
-  emits('viewChange',event)
-};
+const offdays = ref<string[]>([]);
+type DateType = {
+  day: number
+  month : number
+  otherMonth: boolean
+  selectable : boolean
+  today : boolean
+  year: number
+}
 
-const isHoliday = (datestr: string) => {
-  return props.holidays.find(
-    (item) => item.date.format("YYYY-MM-DD") == datestr,
-  );
-};
-const isOffDay = (cell: any) => {
-  const dayname: string = new Date(cell.formattedDate)
-    .toLocaleString("en", { weekday: "short" })
-    .toLowerCase();
-  if (offdays.value.includes(dayname)) return true;
-  else return false;
-};
-const chooseDate = (date1: Date, force?: boolean) => {
-  if (force || !viewStatus.value || viewStatus.value.view == "month") {
-    selectedDate.value = date1;
-    emits("chooseDate", date1);
+const disableDays=computed(()=>{
+  return offdays.value.map(item=>{
+      if(item=='sun')return 0
+      else if(item=='mon')return 1
+      else if(item=='tue')return 2
+      else if(item=='wed')return 3
+      else if(item=='thu')return 4
+      else if(item=='fri')return 5
+      else if(item=='sat')return 6
+  })
+})
+
+function isHoliday(date:CalendarDateSlotOptions){
+
+  for(let i = 0 ; i<props.holidays.length;i++){
+      const item = props.holidays[i]
+      const currenyday = getDayJs()(item.date).date()
+      const currentmonth = getDayJs()(item.date).month()
+      const currentyear = getDayJs()(item.date).year()
+      if(currenyday==date.day && currentmonth==date.month && currentyear==date.year){
+          return true
+      }
   }
+  return false   
+}
+function goToday(){
+  selectedDate.value= new Date(today())
+  chooseDate(new Date(today()))
+}
+function chooseDate(date: string | string[] | Date | Date[] | undefined){
+  emits('chooseDate',date)
+}
+
+const isOffDay = (date:CalendarDateSlotOptions) => {    
+const dayname: string = new Date(date.year,date.month, date.day)
+
+  .toLocaleString("en", { weekday: "short" })
+  .toLowerCase();
+if (offdays.value.includes(dayname)) return true;
+else return false;
 };
-const onRightClickDate = (e: MouseEvent, cell: CalRightClickEvent) => {
-  emits("rightClick", e, cell);
+
+const getEventQty = (date:CalendarDateSlotOptions)=>{
+  const checkdate = dateToISOWithoutConvert(new Date(date.year,date.month, date.day)).substring(0,10)    
+  const recordlength =  props.items.filter(item=>item.start==checkdate).length
+  return recordlength
+}
+const viewChange = (event: CalendarMonthChangeEvent) => {    
+emits("viewChange", event);
 };
 
+
 onMounted(() => {
-  offdays.value = getCurrentBranch()?.branch.offdays ?? [];
+offdays.value = getCurrentBranch()?.branch.offdays ?? [];
 });
 </script>
+<style >
+.smallcalendar td {   
+ height: 3rem;
+ border: solid 1px #ccc;   
+}
+.smallcalendar .p-datepicker table td > span {
+  widows: initial !important;
+  height: initial  !important;
+}
+</style>