@steedos/service-metadata-objects 2.1.52 → 2.1.56

package/src/lookup/LookupActionHandler.ts

@@ -18,6 +18,9 @@ export class LookupActionHandler {
 
     async deleteAll(objectConfig){
         try {
+            if (!objectConfig) {
+                return;
+            }
             await this.deleteAllLookups(objectConfig);
             return true
         } catch (error) {
@@ -63,14 +66,14 @@ export class LookupActionHandler {
         }
     }
 
-    getDetailKey(objectApiName) {
-        return `$steedos.$lookup.#${objectApiName}.detail`
+    getDetailKey(objectApiName, detailApiName) {
+        return `$steedos.$lookup.#${objectApiName}.$detail.${detailApiName}`
     }
 
     async getDetails(objectApiName: string) {
-        let { metadata } = (await this.broker.call('metadata.get', { key: this.getDetailKey(objectApiName) }, { meta: {} })) || {};
         let detailName = [];
-        _.each(metadata, function(item){
+        const detailsInfo = await this.getDetailsInfo(objectApiName);
+        _.each(detailsInfo, function(item){
             if(item && _.isString(item)){
                 const foo = item.split('.');
                 if(foo.length > 0){
@@ -81,39 +84,28 @@ export class LookupActionHandler {
         return _.uniq(detailName);
     }
     async getDetailsInfo(objectApiName: string){
-        let { metadata } = (await this.broker.call('metadata.get', { key: this.getDetailKey(objectApiName) }, { meta: {} })) || {};
-        return metadata || [];
+        const detailsInfo = [];
+        let records = (await this.broker.call('metadata.filter', { key: this.getDetailKey(objectApiName, "*") }, { meta: {} })) || {};
+        for await (const item of records) {
+            const metadata = item?.metadata;
+            if(metadata){
+                detailsInfo.push(metadata);
+            }
+        }
+        return detailsInfo;
     }
 
     async removeDetail(objectApiName: any, detailObjectApiName: string, detailField: any) {
-        let detail = await this.getDetailsInfo(objectApiName);
-        let maps = [];
-        if (detail) {
-            maps = detail;
-        }
         const detailFullName = `${detailObjectApiName}.${detailField.name}`
-        maps = _.difference(maps, [detailFullName]);
-        await this.broker.call('metadata.add', { key: this.getDetailKey(objectApiName), data: maps }, { meta: {} })
-        // this.broker.emit(`@${objectApiName}.detailsChanged`, { objectApiName, detailObjectApiName, detailFieldName: detailField.name, detailFieldReferenceToFieldName: detailField.reference_to_field });
+        await this.broker.call('metadata.delete', { key: this.getDetailKey(objectApiName, detailFullName) }, { meta: {} });
         return true;
     }
 
     async addDetail(objectApiName: any, detailObjectApiName: string, detailField: any) {
-        let detail = await this.getDetailsInfo(objectApiName);
-        let maps = [];
-        if (detail) {
-            maps = detail;
-        }
         const detailFullName = `${detailObjectApiName}.${detailField.name}`
-        let count = _.filter(maps, function(o) { return o.startsWith(`${detailObjectApiName}.`) && o != detailFullName});
-        if (count.length < 1) {
-            maps.push(detailFullName);
-            maps = _.uniq(maps);
-            await this.broker.call('metadata.add', { key: this.getDetailKey(objectApiName), data: maps }, { meta: {} })
-            this.broker.emit(`@${objectApiName}.detailsChanged`, { objectApiName, detailObjectApiName, detailFieldName: detailField.name, detailFieldReferenceToFieldName: detailField.reference_to_field });
-            return true;
-        }
-        return false;
+        await this.broker.call('metadata.add', { key: this.getDetailKey(objectApiName, detailFullName), data: detailFullName }, { meta: {} })
+        this.broker.broadcast(`@${objectApiName}.detailsChanged`, { objectApiName, detailObjectApiName, detailFieldName: detailField.name, detailFieldReferenceToFieldName: detailField.reference_to_field });
+        return true;
     }
 
     // async removeDetail(objectApiName: any, detailObjectApiName: string) {
@@ -126,7 +118,7 @@ export class LookupActionHandler {
     // }
 
     async deleteObjectLookups(objectApiName: string) {
-        await this.broker.call('metadata.delete', { key: this.getDetailKey(objectApiName) }, { meta: {} });
+        await this.broker.call('metadata.fuzzyDelete', { key: this.getDetailKey(objectApiName, '*') }, { meta: {} });
         return true;
     }
 }

package/src/master-detail/masterDetailActionHandler.ts

@@ -79,7 +79,21 @@ export class MasterDetailActionHandler{
         }
         return false
     }
-
+    
+    async deleteAll(objectConfig) {
+        try {
+            if (!objectConfig) {
+                return;
+            }
+            await this.deleteObjectMasterDetails(objectConfig.name);
+            await this.broker.call('metadata.fuzzyDelete', {key: this.getDetailKey('*', objectConfig.name, '*')}, {meta: {}});
+            return true;
+        } catch (error) {
+            this.broker.logger.error(error);
+        }
+        return false;
+    }
+    
     async remove(objectConfig){
         try {
             await this.removeObjectMasterDetails(objectConfig);
@@ -183,15 +197,14 @@ export class MasterDetailActionHandler{
         await this.checkMasterDetails(objectApiName);
     }
 
-
-    getMasterKey(objectApiName){
-        return `$steedos.$masterDetail.#${objectApiName}.master`
+    getMasterKey(objectApiName, masterApiName){
+        return `$steedos.$masterDetail.#${objectApiName}.$master.${masterApiName}`
     }
 
     async getMasters(objectApiName: string){
-        let { metadata } = (await this.broker.call('metadata.get', {key: this.getMasterKey(objectApiName)}, {meta: {}})) || {};
+        let mastersInfo = await this.getMastersInfo(objectApiName);
         let mastersName = [];
-        _.each(metadata, function(item){
+        _.each(mastersInfo, function(item){
             if(item && _.isString(item)){
                 const foo = item.split('.');
                 if(foo.length > 0){
@@ -203,48 +216,37 @@ export class MasterDetailActionHandler{
     }
 
     async getMastersInfo(objectApiName: string){
-        let { metadata } = (await this.broker.call('metadata.get', {key: this.getMasterKey(objectApiName)}, {meta: {}})) || {};
-        return metadata || [];
+        const mastersInfo = [];
+        let records = (await this.broker.call('metadata.filter', { key: this.getMasterKey(objectApiName, "*") }, { meta: {} })) || {};
+        for await (const item of records) {
+            const metadata = item?.metadata;
+            if(metadata){
+                mastersInfo.push(metadata);
+            }
+        }
+        return mastersInfo;
     }
 
     async addMaster(objectApiName: any, masterObjectApiName: string, field: any){
-        let master = await this.getMastersInfo(objectApiName);
-        let maps = [];
-        if(master){
-            maps = master;
-        }
         const masterFullName = `${masterObjectApiName}.${field.name}`
-        let count = _.filter(maps, function(o) { return o.startsWith(`${masterObjectApiName}.`) && o != masterFullName});
-        if (count.length < 1) {
-            maps.push(masterFullName);
-            maps = _.uniq(maps);
-            await this.broker.call('metadata.add', {key: this.getMasterKey(objectApiName), data: maps}, {meta: {}})
-            return true;
-        }
-        console.log(`maps`, maps, masterFullName)
-        return false;
+        await this.broker.call('metadata.add', {key: this.getMasterKey(objectApiName, masterFullName), data: masterFullName}, {meta: {}})
+        return true;
     }
 
     async removeMaster(objectApiName: any, masterObjectApiName: string, masterFieldName: any){
-        let master = await this.getMastersInfo(objectApiName);
-        let maps = [];
-        if (master) {
-            maps = master;
-        }
         const masterFullName = `${masterObjectApiName}.${masterFieldName}`
-        maps = _.difference(maps, [masterFullName]);
-        await this.broker.call('metadata.add', { key: this.getMasterKey(objectApiName), data: maps }, { meta: {} })
+        await this.broker.call('metadata.delete', { key: this.getMasterKey(objectApiName, masterFullName) }, { meta: {} })
         return true;
     }
 
-    getDetailKey(objectApiName){
-        return `$steedos.$masterDetail.#${objectApiName}.detail`
+    getDetailKey(objectApiName, detailObjectApiName, detailFieldName){
+        return `$steedos.$masterDetail.#${objectApiName}.$detail.${detailObjectApiName}.${detailFieldName}`
     }
 
     async getDetails(objectApiName: string){
-        let { metadata } = (await this.broker.call('metadata.get', {key: this.getDetailKey(objectApiName)}, {meta: {}})) || {};
+        let detailsInfo = await this.getDetailsInfo(objectApiName);
         let detailsName = [];
-        _.each(metadata, function(item){
+        _.each(detailsInfo, function(item){
             if(item && _.isString(item)){
                 const foo = item.split('.');
                 if(foo.length > 0){
@@ -256,38 +258,26 @@ export class MasterDetailActionHandler{
     }
 
     async getDetailsInfo(objectApiName: string){
-        let { metadata } = (await this.broker.call('metadata.get', {key: this.getDetailKey(objectApiName)}, {meta: {}})) || {};
-        return metadata || [];
+        const detailsInfo = [];
+        let records = (await this.broker.call('metadata.filter', { key: this.getDetailKey(objectApiName, "*", "*") }, { meta: {} })) || {};
+        for await (const item of records) {
+            const metadata = item?.metadata;
+            if(metadata){
+                detailsInfo.push(metadata);
+            }
+        }
+        return detailsInfo;
     }
 
     async addDetail(objectApiName: any, detailObjectApiName: string, detailField: any){
-        let detail = await this.getDetailsInfo(objectApiName);
-        let maps = [];
-        if(detail){
-            maps = detail;
-        }
         const detailFullName = `${detailObjectApiName}.${detailField.name}`
-        let count = _.filter(maps, function(o) { return o.startsWith(`${detailObjectApiName}.`) && o != detailFullName});
-        if (count.length < 1) {
-            maps.push(detailFullName);
-            maps = _.uniq(maps);
-            await this.broker.call('metadata.add', {key: this.getDetailKey(objectApiName), data: maps}, {meta: {}})
-            this.broker.emit(`@${objectApiName}.detailsChanged`, { objectApiName, detailObjectApiName, detailFieldName: detailField.name, detailFieldReferenceToFieldName: detailField.reference_to_field });
-            return true;
-        }
-        return false;
+        await this.broker.call('metadata.add', {key: this.getDetailKey(objectApiName, detailObjectApiName, detailField.name), data: detailFullName}, {meta: {}})
+        this.broker.broadcast(`@${objectApiName}.detailsChanged`, { objectApiName, detailObjectApiName, detailFieldName: detailField.name, detailFieldReferenceToFieldName: detailField.reference_to_field });
+        return true;
     }
-
     
     async removeDetail(objectApiName: any, detailObjectApiName: string, detailFieldName: any){
-        let detail = await this.getDetailsInfo(objectApiName);
-        let maps = [];
-        if (detail) {
-            maps = detail;
-        }
-        const detailFullName = `${detailObjectApiName}.${detailFieldName}`
-        maps = _.difference(maps, [detailFullName]);
-        await this.broker.call('metadata.add', { key: this.getDetailKey(objectApiName), data: maps }, { meta: {} })
+        await this.broker.call('metadata.delete', { key: this.getDetailKey(objectApiName, detailObjectApiName, detailFieldName)}, { meta: {} })
         return true;
     }
 
@@ -357,8 +347,8 @@ export class MasterDetailActionHandler{
     }
 
     async deleteObjectMasterDetails(objectApiName: string){
-        await this.broker.call('metadata.delete', {key: this.getMasterKey(objectApiName)}, {meta: {}});
-        await this.broker.call('metadata.delete', {key: this.getDetailKey(objectApiName)}, {meta: {}});
+        await this.broker.call('metadata.fuzzyDelete', {key: this.getMasterKey(objectApiName, '*')}, {meta: {}});
+        await this.broker.call('metadata.fuzzyDelete', {key: this.getDetailKey(objectApiName, '*', '*')}, {meta: {}});
         return true;
     }
 }

package/src/objects/index.ts

@@ -22,7 +22,7 @@ async function getBaseObjectConfig(ctx, datasourceName) {
         serviceName,
         metadataType,
         metadataApiName: metadataApiName,
-    });
+    }, {meta: ctx.meta});
     return configs && configs.length > 0 ? configs[0]?.metadata : null;
 }
 
@@ -35,8 +35,9 @@ async function getObjectConfigs(ctx, objectApiName) {
             serviceName,
             metadataType,
             metadataApiName: objectApiName,
-        }
+        }, {meta: ctx.meta}
     );
+    // console.log(`getObjectConfigs ==== `, getObjectConfigs.length);
     return _.compact(_.map(objectConfigs, "metadata"));
 }
 
@@ -105,8 +106,8 @@ export async function refreshObject(ctx, objectApiName) {
     let objectConfig: any = {};
 
     const objectConfigs = await getObjectConfigs(ctx, objectApiName);
-
     if (objectConfigs.length == 0) {
+        // console.log(`refreshObject objectConfigs`, objectConfigs.length)
         return null;
     }
 
@@ -232,7 +233,9 @@ export async function refreshObject(ctx, objectApiName) {
         if (maxSortNoField) {
             objectConfig.fields_serial_number = maxSortNoField.sort_no;
         }
-    } catch (error) {}
+    } catch (error) {
+        console.log(`refreshObject error`, error)
+    }
 
     return objectConfig;
 }

package/src/objects.service.ts

@@ -20,6 +20,12 @@ module.exports = {
     dependencies: ['metadata'],
 
     events: {
+        [`delete.metadata.${METADATA_TYPE}`]: {
+            async handler(ctx) {
+                const { objectApiName } = ctx.params;
+                return await this.objetActionHandlers.handleDeleteObject(ctx, objectApiName);
+            }
+        },
 		[`$METADATA.${METADATA_TYPE}.*`]: {
             async handler(ctx) {
                 return await this.objetActionHandlers.refresh(ctx);
@@ -209,6 +215,9 @@ module.exports = {
             await this.summaryActionHandler.add(objectConfig);
         }, async (objectConfig)=>{
             await this.lookupActionHandler.deleteAll(objectConfig);
+            await this.masterDetailActionHandler.deleteAll(objectConfig);
+            await this.formulaActionHandler.deleteAll(objectConfig);
+            await this.summaryActionHandler.deleteAll(objectConfig);
         }, async (objectConfig)=>{
             /**
              * 重算公式关系链时，可能存在待重算的对象还未进入缓存(但已经过了公式关系链计算过程)。所以进行延时

package/src/summary/summaryActionHandler.ts

@@ -16,6 +16,20 @@ export class SummaryActionHandler {
         this.broker = broker;
     }
 
+    async deleteAll(objectConfig){
+        try {
+            if (!objectConfig) {
+                return;
+            }
+            // console.log(`deleteAll summary`, this.cacherKey(objectConfig.name, '*'))
+            await this.broker.call('metadata.fuzzyDelete', {key: this.cacherKey(objectConfig.name, '*')}, {meta: {}})
+            return true
+        } catch (error) {
+            this.broker.logger.error(error);
+        }
+        return false
+    }
+
     async getObjectConfig(objectApiName: string) {
         const data = await this.broker.call('objects.get', { objectApiName: objectApiName })
         return data ? data.metadata : null;