Merge pull request forcedotcom#268 from forcedotcom/develop

Code cleanup

Author: hknokh

README.md

@@ -14,7 +14,7 @@
 
 ```bash
 ### ------------------------------------------- ###
-### - *** Latest version: v3.9.3          *** - ###
+### - *** Latest version: v3.9.4          *** - ###
 ### ------------------------------------------- ###
 ### - *** Make sure, that you have        *** - ###
 ### - *** the latest version installed    *** - ###

package.json

@@ -1,7 +1,7 @@
 {
     "name": "sfdmu",
     "description": "The Salesforce Data Loader SFDX Plugin (SFDMU) will help you to populate your org (scratch / dev / sandbox / production) with data imported from another org or CSV files. It supports all important CRUD operations (Insert/Update/Upsert/Delete) also for multiple related sObjects.",
-    "version": "3.9.3",
+    "version": "3.9.4",
     "author": "Haim Knokh",
     "bugs": "https://github.com/forcedotcom/SFDX-Data-Move-Utility/issues",
     "dependencies": {

src/modules/components/common_components/common.ts

@@ -999,36 +999,10 @@ export class Common {
     */
     public static getRecordValue(thisSobjectName: string, record: any, propName: string, sObjectName?: string, sFieldName?: string): any {
         if (!record) return null;
-        let value = record[sFieldName || propName];
-        if (!value) return value;
-        //sObjectName = sObjectName || record["SobjectType"];
-        //if (thisSobjectName == CONSTANTS.RECORD_TYPE_SOBJECT_NAME && propName == CONSTANTS.DEFAULT_RECORD_TYPE_ID_EXTERNAL_ID_FIELD_NAME) {
-        //     return String(value).split(CONSTANTS.COMPLEX_FIELDS_SEPARATOR)[0] + CONSTANTS.COMPLEX_FIELDS_SEPARATOR + sObjectName;
-        //} else {
-            return value;
-        //}
-    }
-
-    /**
-     * Parsed value and retrieves clear value.
-     * For example for the field RecordType.DeveloperName: "AccountRT;Account" => "AccountRT"
-     *
-     * @static
-     * @param {string} sObjectName The sObject name
-     * @param {*} rawFieldValue The raw field value to transform
-     * @param {string} fieldName The field name
-     * @returns {string}
-     * @memberof Common
-     */
-    public static getFieldValue(sObjectName: string, rawFieldValue: any, fieldName: string): any {
-        //if (!rawFieldValue) return rawFieldValue;
-        //if (sObjectName == CONSTANTS.RECORD_TYPE_SOBJECT_NAME && fieldName == CONSTANTS.DEFAULT_RECORD_TYPE_ID_EXTERNAL_ID_FIELD_NAME) {
-        //    //"AccountRT;Account" => "AccountRT"
-        //    return String(rawFieldValue).split(CONSTANTS.COMPLEX_FIELDS_SEPARATOR)[0];
-        //}
-        return rawFieldValue;
+        return record[sFieldName || propName];       
     }
 
+   
     /**
      * Returns true if this object is custom
      *

src/modules/components/common_components/sfdx.ts

@@ -241,18 +241,7 @@ export class Sfdx implements IFieldMapping {
             return parsedRecords;
         }
 
-        function ___formatRecords(records: Array<any>, soqlFormat: [string, Map<string, Array<string>>, Array<string>, string]): Array<any> {
-            // Trasnform RecordType.DeveloperName object fields into proper format
-            //let recordTypeExtIdPropName = CONSTANTS.RECORD_TYPE_SOBJECT_NAME + "." + CONSTANTS.DEFAULT_RECORD_TYPE_ID_EXTERNAL_ID_FIELD_NAME;
-            //records.forEach(record => {
-            //    if (record.hasOwnProperty(recordTypeExtIdPropName)) {
-            //        record[recordTypeExtIdPropName] = Common.getRecordValue(CONSTANTS.RECORD_TYPE_SOBJECT_NAME,
-            //            record,
-            //            CONSTANTS.DEFAULT_RECORD_TYPE_ID_EXTERNAL_ID_FIELD_NAME,
-            //            soqlFormat[3],
-            //            recordTypeExtIdPropName);
-            //    }
-            //});
+        function ___formatRecords(records: Array<any>, soqlFormat: [string, Map<string, Array<string>>, Array<string>, string]): Array<any> {          
             // Process complex keys}
             if (soqlFormat[1].size == 0) {
                 return records;

src/modules/models/job_models/migrationJobTask.ts

@@ -355,7 +355,7 @@ export default class MigrationJobTask {
                             return;
                         }
                         // Missing id column but __r column provided.
-                        let desiredExternalIdValue = parentTask.getRecordValue(csvRow, parentExternalId, self.sObjectName, columnName__r);
+                        let desiredExternalIdValue = parentTask.getRecordValue(csvRow, parentExternalId);
                         if (desiredExternalIdValue) {
                             isFileChanged = true;
                             let parentCsvRow = parentCSVRowsMap.get(desiredExternalIdValue);
@@ -447,7 +447,7 @@ export default class MigrationJobTask {
                                 }
                             });
                             [...childFileMap.values()].forEach(csvRow => {
-                                let extIdValue = self.getRecordValue(csvRow, parentOriginalExternalIdColumnName, childTask.sObjectName, columnChildOriginalName__r);
+                                let extIdValue = self.getRecordValue(csvRow, parentOriginalExternalIdColumnName);
                                 if (extIdValue && parentCSVExtIdMap.has(extIdValue)) {
                                     csvRow[columnChildNameId] = parentCSVExtIdMap.get(extIdValue)["Id"];
                                     csvRow[columnChildIdName__r] = csvRow[columnChildNameId];
@@ -480,17 +480,12 @@ export default class MigrationJobTask {
      *     for this sobject
      *
      * @param {*} record The record
-     * @param {string} propName The property name to extract value from the record object
-     * @param {string} [sObjectName] If the current task is RecordType and propName = DeveloperName - 
-     *                               pass here the SobjectType
-     * @param {string} [sFieldName]  If the current task is RecordType and propName = DeveloperName -
-     *                               pass here the property name to extract value from the record object
-     *                               instead of passing it with the "propName" parameter
-     * @returns {*}
+     * @param {string} propName The property name to extract value from the record object        
      * @memberof MigrationJobTask
      */
-    getRecordValue(record: any, propName: string, sObjectName?: string, sFieldName?: string): any {
-        return Common.getRecordValue(this.sObjectName, record, propName, sObjectName, sFieldName);
+    getRecordValue(record: any, propName: string): any {
+        if (!record) return null;
+        return record[propName];             
     }
 
     /**
@@ -1633,7 +1628,7 @@ export default class MigrationJobTask {
                     // For target => |TARGET Account|Name IN (|SOURCE Account|Name....)
                     if (field.isSimple && field.isExternalIdField) {
                         // Only for current object's external id (f.ex.: Name) - not complex and not Id - only simple
-                        fieldsToQueryMap.set(field, [...this.sourceData.extIdRecordsMap.keys()].map(value => Common.getFieldValue(this.sObjectName, value, field.name)));
+                        fieldsToQueryMap.set(field, [...this.sourceData.extIdRecordsMap.keys()]);
                     }
                 }
             });

src/modules/models/script_models/script.ts

@@ -308,19 +308,6 @@ export default class Script {
                             externalId
                         });
 
-                        //if (referencedObjectType == CONSTANTS.RECORD_TYPE_SOBJECT_NAME) {
-                        //    let objectsWithRecordTypeFields = this.objects.filter(x => x.hasRecordTypeIdField).map(x => x.name);
-                        //    thisField.parentLookupObject.parsedQuery = parseQuery(thisField.parentLookupObject.query);
-                        //    thisField.parentLookupObject.parsedQuery.fields.push(getComposedField("SobjectType"));
-                        //    thisField.parentLookupObject.parsedQuery.where = Common.composeWhereClause(thisField.parentLookupObject.parsedQuery.where, "SobjectType", objectsWithRecordTypeFields);
-                        //    thisField.parentLookupObject.parsedQuery.orderBy = <OrderByClause>({
-                        //        field: "SobjectType",
-                        //        order: "ASC"
-                        //    });
-                        //    thisField.parentLookupObject.query = composeQuery(thisField.parentLookupObject.parsedQuery);
-
-                        //}
-
                         isParentLookupObjectAdded = true;
 
                     }