refactor

zgwnu · Sep 25, 2017 · e73b444 · e73b444
1 parent 2acf5ca
commit e73b444
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 38 deletions.
diff --git a/bdm/zgwnu-bonita-business-data-mapping.ts b/bdm/zgwnu-bonita-business-data-mapping.ts
@@ -0,0 +1,23 @@
+// ZGWNU Ng Bonita Module Imports
+import { ZgwnuBonitaBusinessDataObjectInterface } from './zgwnu-bonita-business-data-object.interface'
+import { ZgwnuBonitaBusinessDataObjectListInterface } from './zgwnu-bonita-business-data-object-list.interface'
+
+export function ZgwnuBonitaMapBusinessObject<T extends ZgwnuBonitaBusinessDataObjectInterface>(dataObject: Object, businessDataObject: T): void {
+    for (let dataObjectKey in dataObject) {
+        console.log('dataObjectKey', dataObjectKey)
+        let dataObjectType: string = typeof dataObjectKey
+        console.log('dataObjectType', dataObjectType)
+        switch(dataObjectType) {
+          // direct mapping object to object
+          case 'string' || 'number' || 'boolean': 
+            businessDataObject[dataObjectKey] = dataObject[dataObjectKey]
+            break
+          // indirect mapping of custom objects (that need a specific constructor)
+          case 'object': 
+            businessDataObject.mapObject(dataObjectKey, dataObject[dataObjectKey])
+            break
+          default:
+            console.log('dataProperty not mapped = ', dataObject[dataObjectKey])
+          }
+        }
+}
diff --git a/bdm/zgwnu-bonita-business-data-object.ts b/bdm/zgwnu-bonita-business-data-object.ts
@@ -8,6 +8,7 @@ export abstract class ZgwnuBonitaBusinessDataObject implements ZgwnuBonitaBusine
   persistenceVersion_string?: string
 
   mapObject(objectKey: string, objectValue: Object) {
-    console.log(objectKey, objectValue)
+    // switch default => map Date Object
+    this[objectKey] = new Date(<string>objectValue)    
   }
 }
diff --git a/bdm/zgwnu-bonita-business-data.service.ts b/bdm/zgwnu-bonita-business-data.service.ts
@@ -16,7 +16,7 @@ import 'rxjs/add/operator/catch'
 // ZGWNU Ng Bonita Module Imports
 import { ZgwnuBonitaConfigService } from '../rest-api/zgwnu-bonita-config.service'
 import { ZgwnuBonitaResponseMapService } from '../rest-api/zgwnu-bonita-response-map.service'
-import { ZgwnuBonitaDataObjectMapService } from './zgwnu-bonita-data-object-map.service'
+import { ZgwnuBonitaMapBusinessObject } from './zgwnu-bonita-business-data-mapping'
 import { ZgwnuBonitaBusinessDataQueryParms } from './zgwnu-bonita-business-data-query-parms'
 import { ZgwnuBonitaBusinessDataContext } from './zgwnu-bonita-business-data-context'
 import { ZgwnuSingleBusinessDataRefence } from './zgwnu-single-business-data-reference'
@@ -36,7 +36,6 @@ export class ZgwnuBonitaBusinessDataService {
         private httpClient: HttpClient,  
         private configService: ZgwnuBonitaConfigService, 
         private responseMapService: ZgwnuBonitaResponseMapService,  
-        private dataObjectMapService: ZgwnuBonitaDataObjectMapService,  
     )
     {
         this.businessDataResourceUrl = configService.bonitaUrls.apiUrl + this.BUSSINESS_DATA_RESOURCE_PATH
@@ -56,7 +55,7 @@ export class ZgwnuBonitaBusinessDataService {
             this.businessDataResourceUrl + '/' + 
             this.configService.businessDataModelPackage + '.' + businessDataType + 
                 '/' + persistenceId.toString())
-            .map(body => this.dataObjectMapService.mapObject<T>(body, businessDataObject))
+            .map(body => ZgwnuBonitaMapBusinessObject<T>(body, businessDataObject))
             .catch(this.responseMapService.catchBonitaError)
     }
 

diff --git a/bdm/zgwnu-bonita-data-object-map.service.ts b/bdm/zgwnu-bonita-data-object-map.service.ts
diff --git a/index.ts b/index.ts
@@ -61,7 +61,7 @@ export { ZgwnuBonitaFileUploadProgress } from './file-upload/zgwnu-bonita-file-u
 
 // BDM Api Classes
 export { ZgwnuBonitaBusinessDataService } from './bdm/zgwnu-bonita-business-data.service'
-export { ZgwnuBonitaDataObjectMapService } from './bdm/zgwnu-bonita-data-object-map.service'
+export { ZgwnuBonitaMapBusinessObject } from './bdm/zgwnu-bonita-business-data-mapping'
 export { ZgwnuBonitaBusinessDataQueryParms } from './bdm/zgwnu-bonita-business-data-query-parms'
 export { ZgwnuBonitaBusinessDataObjectInterface } from './bdm/zgwnu-bonita-business-data-object.interface'
 export { ZgwnuBonitaBusinessDataObject } from './bdm/zgwnu-bonita-business-data-object'

diff --git a/zgwnu-ng-bonita.module.ts b/zgwnu-ng-bonita.module.ts
@@ -18,7 +18,6 @@ import { ZgwnuBonitaBpmUserTaskService } from './bpm/user-task/zgwnu-bonita-bpm-
 import { ZgwnuBonitaBpmDataService } from './bpm/data/zgwnu-bonita-bpm-data.service'
 import { ZgwnuBonitaBpmDocumentService } from './bpm/document/zgwnu-bonita-bpm-document.service'
 import { ZgwnuBonitaFileUploadService } from './file-upload/zgwnu-bonita-file-upload.service'
-import { ZgwnuBonitaDataObjectMapService } from './bdm/zgwnu-bonita-data-object-map.service'
 import { ZgwnuBonitaBusinessDataService } from './bdm/zgwnu-bonita-business-data.service'
 
 @NgModule({
@@ -44,7 +43,6 @@ import { ZgwnuBonitaBusinessDataService } from './bdm/zgwnu-bonita-business-data
     ZgwnuBonitaBpmDataService,  
     ZgwnuBonitaBpmDocumentService,  
     ZgwnuBonitaFileUploadService,  
-    ZgwnuBonitaDataObjectMapService, 
     ZgwnuBonitaBusinessDataService,  
   ]
 })