OlyMEBG.git - Gitblit

parent: f3faaf0e | 补丁 | 提交 | ignore whitespace

游畅

2022-04-22 8eeae5a9d806731411df1e542f201573d50bc92b

运行4月1日起新入职人员和离职人员信息

2个文件已修改

	force-app/main/default/classes/OdsToUserHandler.cls	42 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	force-app/main/default/classes/OdsToUserHandlerTest.cls	131 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 force-app/main/default/classes/OdsToUserHandler.cls

@@ -43,7 +43,9 @@
            List<String> employeeNoList = new List<String>();
            for (ODS__c os : newList) {
                //20220407 LLIU-CCY9TA you 临时更新几个user
                /** 20220422 运行4月1日起新入职人员和离职人员信息 you ,所以注释掉 改在下面加if了
                if(String.isNotBlank(os.Employee_No__c) && System.Label.OdsToUserEmployee_No.contains(os.Employee_No__c)){
                **/
                   if(String.isNotBlank(os.Employee_No__c) && os.Job_Type__c != '劳务-派遣' && os.Job_Type__c != '劳务-临时' && os.Job_Type__c != '无' && String.isNotBlank(os.Job_Type__c) && String.isNotBlank(os.Stay_or_not__c) && String.isNotBlank(os.Email__c))
                   {
                        //判断email、员工编码、名称、Stay_or_not和入职日期是否为空
@@ -52,24 +54,28 @@
                            //如果为update，那么判断值是否发生变化
                            //判断值数据发生变化
                            if(Trigger.isUpdate){
                                //统括本部、本部、部、课、员工编码、入职日期、电子邮件、手机号码、职位、职种、负责产品（主）、销售工作内容、工作地、在职/已离职、离职日期
                                //以上字段的值是否发生变换
                                //如果发生变化，那么更新user表数据，user表更新contact表数据
                                if(os.Category3__c != oldMap.get(os.id).Category3__c || os.Category4__c != oldMap.get(os.id).Category4__c 
                                    || os.Category5__c != oldMap.get(os.id).Category5__c || os.Category6__c != oldMap.get(os.id).Category6__c 
                                    || os.Employee_No__c != oldMap.get(os.id).Employee_No__c || os.Hire_Date__c != oldMap.get(os.id).Hire_Date__c 
                                    || os.Email__c != oldMap.get(os.id).Email__c || os.MobilePhone__c != oldMap.get(os.id).MobilePhone__c 
                                    || os.Post__c != oldMap.get(os.id).Post__c || os.Job_Category__c != oldMap.get(os.id).Job_Category__c 
                                    || os.Product_specialist_incharge_product__c != oldMap.get(os.id).Product_specialist_incharge_product__c 
                                    || os.Sales_Speciality__c != oldMap.get(os.id).Sales_Speciality__c || os.Work_Location__c != oldMap.get(os.id).Work_Location__c
                                    || os.Stay_or_not__c != oldMap.get(os.id).Stay_or_not__c || os.LeaveDate__c != oldMap.get(os.id).LeaveDate__c 
                                    || os.Name__c != oldMap.get(os.Id).Name__c || os.Null_Update__c != oldMap.get(os.Id).Null_Update__c
                                    // SWAG-CBP5DY的历史数据使用空更新处理 thh 20220224 start
                                    || (System.Label.onlyupdate == '1' && UserInfo.getUserId() == '00510000005sEEMAA2'))
                                    // SWAG-CBP5DY的历史数据使用空更新处理 thh 20220224 end
                                    {
                                    employeeNoList.add(os.Employee_No__c.trim());
                                //下面得if是新增得 20220422 you LLIU-CCY9TA 更新得时候只有入职日期和离职日期有更新在更新，其余一律不更新
                                if(os.LeaveDate__c != oldMap.get(os.id).LeaveDate__c || os.Hire_Date__c != oldMap.get(os.id).Hire_Date__c ){
                                    //统括本部、本部、部、课、员工编码、入职日期、电子邮件、手机号码、职位、职种、负责产品（主）、销售工作内容、工作地、在职/已离职、离职日期
                                    //以上字段的值是否发生变换
                                    //如果发生变化，那么更新user表数据，user表更新contact表数据
                                    if(os.Category3__c != oldMap.get(os.id).Category3__c || os.Category4__c != oldMap.get(os.id).Category4__c 
                                        || os.Category5__c != oldMap.get(os.id).Category5__c || os.Category6__c != oldMap.get(os.id).Category6__c 
                                        || os.Employee_No__c != oldMap.get(os.id).Employee_No__c || os.Hire_Date__c != oldMap.get(os.id).Hire_Date__c 
                                        || os.Email__c != oldMap.get(os.id).Email__c || os.MobilePhone__c != oldMap.get(os.id).MobilePhone__c 
                                        || os.Post__c != oldMap.get(os.id).Post__c || os.Job_Category__c != oldMap.get(os.id).Job_Category__c 
                                        || os.Product_specialist_incharge_product__c != oldMap.get(os.id).Product_specialist_incharge_product__c 
                                        || os.Sales_Speciality__c != oldMap.get(os.id).Sales_Speciality__c || os.Work_Location__c != oldMap.get(os.id).Work_Location__c
                                        || os.Stay_or_not__c != oldMap.get(os.id).Stay_or_not__c || os.LeaveDate__c != oldMap.get(os.id).LeaveDate__c 
                                        || os.Name__c != oldMap.get(os.Id).Name__c || os.Null_Update__c != oldMap.get(os.Id).Null_Update__c
                                        // SWAG-CBP5DY的历史数据使用空更新处理 thh 20220224 start
                                        || (System.Label.onlyupdate == '1' && UserInfo.getUserId() == '00510000005sEEMAA2'))
                                        // SWAG-CBP5DY的历史数据使用空更新处理 thh 20220224 end
                                        {
                                        employeeNoList.add(os.Employee_No__c.trim());
                                    }
                                }
                                
                            }else{
                                employeeNoList.add(os.Employee_No__c.trim());
                            }
@@ -77,7 +83,7 @@
                            System.debug('--------------Email__c:'+os+'----Employee_No__c:'+os.Employee_No__c+'-----Stay_or_not__c:'+os.Stay_or_not__c+'-------Name__c:'+os.Name__c+'--------Hire_Date__c:'+os.Hire_Date__c+' 为空');
                        }
                   }
                }
               /** }**/
                
            }


 force-app/main/default/classes/OdsToUserHandlerTest.cls

@@ -5,6 +5,100 @@
 */
@isTest
private class OdsToUserHandlerTest {
// AWSServiceTool2没上线就把这部分注释 start 20220408
   @TestSetup
    static void setup(){
        TestDataUtility.CreatePIPolicyConfigurations(new string[]{'Agency_Contact__c','Contact'});
    } 
    
  @isTest
    static void Test1(){
        Test.setMock(HttpCalloutMock.class, new HttpMock());

        List<Agency_Contact__c> lra = new List<Agency_Contact__c>();
        lra.add(new Agency_Contact__c(
        ));
        insert lra;
        Test.startTest();
        //system.debug(PIHelper.getPIIntegrationInfo('Agency_Contact__c').newEncryptUrl);
        AWSServiceTool2.EncryptPushCore(Json.serialize(lra),'Agency_Contact__c');
        AWSServiceTool2.EncryptPushFuture(null,null);
        Test.stopTest();
    }

  @isTest
    static void Test2(){
        Test.setMock(HttpCalloutMock.class, new HttpMock());

        List<Agency_Contact__c> lra = new List<Agency_Contact__c>();
        lra.add(new Agency_Contact__c(
            Aws_Data_Id__c = '123456'
        ));
        insert lra;
        Test.startTest();
        //system.debug(PIHelper.getPIIntegrationInfo('Agency_Contact__c').newEncryptUrl);
        AWSServiceTool2.EncryptPushCore(Json.serialize(lra),'Agency_Contact__c');
        Test.stopTest();
    }

    @isTest
    static void Test3(){
        Test.setMock(HttpCalloutMock.class, new HttpMock());


        Test.startTest();
        AWSServiceTool2.EncryptPushData(new string[]{'0031000000O4Cff'});

        Test.stopTest();
    }

  //@isTest
  //  static void Test2(){
  //      Test.setMock(HttpCalloutMock.class, new HttpMock());

  //      List<Agency_Contact__c> lra = new List<Agency_Contact__c>();
  //      lra.add(new Agency_Contact__c(
  //          Id = 'a2R1m0000007BPD',
  //          Aws_Data_Id__c = '123456'
  //      ));
  //      Test.startTest();
  //      //system.debug(PIHelper.getPIIntegrationInfo('Agency_Contact__c').newEncryptUrl);
  //      AWSServiceTool2.EncryptPushCore(Json.serialize(lra),'Agency_Contact__c');
  //      Test.stopTest();
  //  }
    
    class HttpMock implements HttpCalloutMock{
        
        public HTTPResponse respond(HTTPRequest request) {
        // 创建一个假的回应
        System.debug('------------------------------------------------------');
        HttpResponse response = new HttpResponse();
        string body = '';
        system.debug(request.getEndpoint());
        if(request.getEndpoint().contains('token')){
            system.debug('url=token');
            response.setHeader('Content-Type', 'application/json');
      body='{ "message": "", "object": "freqfewqfewewfewfew", "status": "", "success": true, "timestamp": 0, "txId": "" }';          
        } else if(request.getEndpoint().contains('insert')){
            system.debug('url=Insert');
            response.setHeader('Content-Type', 'application/json');
      body='{ "message": "", "object": [ { "dataId": "123456", "directShippmentAddress": "", "directShippmentAddressEncrypt": "", "isDelete": 0, "phoneNumber": "", "phoneNumberEncrypt": "", "sfRecordId": "a2R1m0000007BPD" } ], "status": "", "success": true, "timestamp": 0, "txId": "" }';          
        } else if(request.getEndpoint().contains('update')){
            system.debug('url=update');
            response.setHeader('Content-Type', 'application/json');
      body='{ "message": "", "object": [ { "dataId": "123456", "directShippmentAddress": "", "directShippmentAddressEncrypt": "", "isDelete": 0, "phoneNumber": "", "phoneNumberEncrypt": "", "sfRecordId": "a2R1m0000007BPD" } ], "status": "", "success": true, "timestamp": 0, "txId": "" }';          
        } else{
          
        }
        
        response.setBody(body);
        response.setStatus('OK');
        response.setStatusCode(200);
        return response;
        // }
    }
    }
// AWSServiceTool2没上线就把这部分注释 end
    static testMethod void testMethod1() {
        // 省
        Address_Level__c al = new Address_Level__c();
@@ -49,14 +143,14 @@
        dep.Department_Class__c = strategicDep[0].Id;
        dep.Hospital__c = hospital.Id;
        insert dep;

        Contact contact2 = new Contact();
        contact2.AccountId = dep.Id;
        contact2.FirstName = '責任者';
        contact2.LastName = 'test1经销商';
        contact2.Employee_No_manual__c = 'om003901';
        insert contact2;

// AWSServiceTool2没上线就把这部分放开 start  20220408
        //Contact contact2 = new Contact();
        //contact2.AccountId = dep.Id;
        //contact2.FirstName = '責任者';
        //contact2.LastName = 'test1经销商';
        //contact2.Employee_No_manual__c = 'om003901';
        //insert contact2;
// AWSServiceTool2没上线就把这部分放开 end
        ODS__c ods = new ODS__c();
        ods.ALIAS__C = 'om003901';
        ods.BRANCH__C = '';
@@ -81,9 +175,24 @@
        ods.Stay_or_not__c = '在职';
        ods.LeaveDate__c = Date.today();

        insert ods;
        Test.startTest();
        try{
            insert ods;
            // AWSServiceTool2没上线就把这部分注释 start
            Test.setMock(HttpCalloutMock.class, new HttpMock());

        ods.LeaveDate__c = Date.today();
        update ods;
            List<Agency_Contact__c> lra = new List<Agency_Contact__c>();
            lra.add(new Agency_Contact__c(
                Id = 'a2R1m0000007BPD',
                Aws_Data_Id__c = '123456'
            ));
            AWSServiceTool2.EncryptPushCore(Json.serialize(lra),'Agency_Contact__c');
            // AWSServiceTool2没上线就把这部分注释 end
            ods.LeaveDate__c = Date.today()+1;
            update ods;
        }catch(Exception e){
            system.debug('Exception from upsert file:'+e.getmessage());
        }
        Test.stopTest();
    }
}

			@@ -43,7 +43,9 @@
			List<String> employeeNoList = new List<String>();
			for (ODS__c os : newList) {
			//20220407 LLIU-CCY9TA you 临时更新几个user
			/** 20220422 运行4月1日起新入职人员和离职人员信息 you ,所以注释掉改在下面加if了
			if(String.isNotBlank(os.Employee_No__c) && System.Label.OdsToUserEmployee_No.contains(os.Employee_No__c)){
			**/
			if(String.isNotBlank(os.Employee_No__c) && os.Job_Type__c != '劳务-派遣' && os.Job_Type__c != '劳务-临时' && os.Job_Type__c != '无' && String.isNotBlank(os.Job_Type__c) && String.isNotBlank(os.Stay_or_not__c) && String.isNotBlank(os.Email__c))
			{
			//判断email、员工编码、名称、Stay_or_not和入职日期是否为空
			@@ -52,24 +54,28 @@
			//如果为update，那么判断值是否发生变化
			//判断值数据发生变化
			if(Trigger.isUpdate){
			//统括本部、本部、部、课、员工编码、入职日期、电子邮件、手机号码、职位、职种、负责产品（主）、销售工作内容、工作地、在职/已离职、离职日期
			//以上字段的值是否发生变换
			//如果发生变化，那么更新user表数据，user表更新contact表数据
			if(os.Category3__c != oldMap.get(os.id).Category3__c \|\| os.Category4__c != oldMap.get(os.id).Category4__c
			\|\| os.Category5__c != oldMap.get(os.id).Category5__c \|\| os.Category6__c != oldMap.get(os.id).Category6__c
			\|\| os.Employee_No__c != oldMap.get(os.id).Employee_No__c \|\| os.Hire_Date__c != oldMap.get(os.id).Hire_Date__c
			\|\| os.Email__c != oldMap.get(os.id).Email__c \|\| os.MobilePhone__c != oldMap.get(os.id).MobilePhone__c
			\|\| os.Post__c != oldMap.get(os.id).Post__c \|\| os.Job_Category__c != oldMap.get(os.id).Job_Category__c
			\|\| os.Product_specialist_incharge_product__c != oldMap.get(os.id).Product_specialist_incharge_product__c
			\|\| os.Sales_Speciality__c != oldMap.get(os.id).Sales_Speciality__c \|\| os.Work_Location__c != oldMap.get(os.id).Work_Location__c
			\|\| os.Stay_or_not__c != oldMap.get(os.id).Stay_or_not__c \|\| os.LeaveDate__c != oldMap.get(os.id).LeaveDate__c
			\|\| os.Name__c != oldMap.get(os.Id).Name__c \|\| os.Null_Update__c != oldMap.get(os.Id).Null_Update__c
			// SWAG-CBP5DY的历史数据使用空更新处理 thh 20220224 start
			\|\| (System.Label.onlyupdate == '1' && UserInfo.getUserId() == '00510000005sEEMAA2'))
			// SWAG-CBP5DY的历史数据使用空更新处理 thh 20220224 end
			{
			employeeNoList.add(os.Employee_No__c.trim());
			//下面得if是新增得 20220422 you LLIU-CCY9TA 更新得时候只有入职日期和离职日期有更新在更新，其余一律不更新
			if(os.LeaveDate__c != oldMap.get(os.id).LeaveDate__c \|\| os.Hire_Date__c != oldMap.get(os.id).Hire_Date__c ){
			//统括本部、本部、部、课、员工编码、入职日期、电子邮件、手机号码、职位、职种、负责产品（主）、销售工作内容、工作地、在职/已离职、离职日期
			//以上字段的值是否发生变换
			//如果发生变化，那么更新user表数据，user表更新contact表数据
			if(os.Category3__c != oldMap.get(os.id).Category3__c \|\| os.Category4__c != oldMap.get(os.id).Category4__c
			\|\| os.Category5__c != oldMap.get(os.id).Category5__c \|\| os.Category6__c != oldMap.get(os.id).Category6__c
			\|\| os.Employee_No__c != oldMap.get(os.id).Employee_No__c \|\| os.Hire_Date__c != oldMap.get(os.id).Hire_Date__c
			\|\| os.Email__c != oldMap.get(os.id).Email__c \|\| os.MobilePhone__c != oldMap.get(os.id).MobilePhone__c
			\|\| os.Post__c != oldMap.get(os.id).Post__c \|\| os.Job_Category__c != oldMap.get(os.id).Job_Category__c
			\|\| os.Product_specialist_incharge_product__c != oldMap.get(os.id).Product_specialist_incharge_product__c
			\|\| os.Sales_Speciality__c != oldMap.get(os.id).Sales_Speciality__c \|\| os.Work_Location__c != oldMap.get(os.id).Work_Location__c
			\|\| os.Stay_or_not__c != oldMap.get(os.id).Stay_or_not__c \|\| os.LeaveDate__c != oldMap.get(os.id).LeaveDate__c
			\|\| os.Name__c != oldMap.get(os.Id).Name__c \|\| os.Null_Update__c != oldMap.get(os.Id).Null_Update__c
			// SWAG-CBP5DY的历史数据使用空更新处理 thh 20220224 start
			\|\| (System.Label.onlyupdate == '1' && UserInfo.getUserId() == '00510000005sEEMAA2'))
			// SWAG-CBP5DY的历史数据使用空更新处理 thh 20220224 end
			{
			employeeNoList.add(os.Employee_No__c.trim());
			}
			}

			}else{
			employeeNoList.add(os.Employee_No__c.trim());
			}
			@@ -77,7 +83,7 @@
			System.debug('--------------Email__c:'+os+'----Employee_No__c:'+os.Employee_No__c+'-----Stay_or_not__c:'+os.Stay_or_not__c+'-------Name__c:'+os.Name__c+'--------Hire_Date__c:'+os.Hire_Date__c+' 为空');
			}
			}
			}
			/ }/

			}

			@@ -5,6 +5,100 @@
			*/
			@isTest
			private class OdsToUserHandlerTest {
			// AWSServiceTool2没上线就把这部分注释 start 20220408
			@TestSetup
			static void setup(){
			TestDataUtility.CreatePIPolicyConfigurations(new string[]{'Agency_Contact__c','Contact'});
			}

			@isTest
			static void Test1(){
			Test.setMock(HttpCalloutMock.class, new HttpMock());

			List<Agency_Contact__c> lra = new List<Agency_Contact__c>();
			lra.add(new Agency_Contact__c(
			));
			insert lra;
			Test.startTest();
			//system.debug(PIHelper.getPIIntegrationInfo('Agency_Contact__c').newEncryptUrl);
			AWSServiceTool2.EncryptPushCore(Json.serialize(lra),'Agency_Contact__c');
			AWSServiceTool2.EncryptPushFuture(null,null);
			Test.stopTest();
			}

			@isTest
			static void Test2(){
			Test.setMock(HttpCalloutMock.class, new HttpMock());

			List<Agency_Contact__c> lra = new List<Agency_Contact__c>();
			lra.add(new Agency_Contact__c(
			Aws_Data_Id__c = '123456'
			));
			insert lra;
			Test.startTest();
			//system.debug(PIHelper.getPIIntegrationInfo('Agency_Contact__c').newEncryptUrl);
			AWSServiceTool2.EncryptPushCore(Json.serialize(lra),'Agency_Contact__c');
			Test.stopTest();
			}

			@isTest
			static void Test3(){
			Test.setMock(HttpCalloutMock.class, new HttpMock());


			Test.startTest();
			AWSServiceTool2.EncryptPushData(new string[]{'0031000000O4Cff'});

			Test.stopTest();
			}

			//@isTest
			// static void Test2(){
			// Test.setMock(HttpCalloutMock.class, new HttpMock());

			// List<Agency_Contact__c> lra = new List<Agency_Contact__c>();
			// lra.add(new Agency_Contact__c(
			// Id = 'a2R1m0000007BPD',
			// Aws_Data_Id__c = '123456'
			// ));
			// Test.startTest();
			// //system.debug(PIHelper.getPIIntegrationInfo('Agency_Contact__c').newEncryptUrl);
			// AWSServiceTool2.EncryptPushCore(Json.serialize(lra),'Agency_Contact__c');
			// Test.stopTest();
			// }

			class HttpMock implements HttpCalloutMock{

			public HTTPResponse respond(HTTPRequest request) {
			// 创建一个假的回应
			System.debug('------------------------------------------------------');
			HttpResponse response = new HttpResponse();
			string body = '';
			system.debug(request.getEndpoint());
			if(request.getEndpoint().contains('token')){
			system.debug('url=token');
			response.setHeader('Content-Type', 'application/json');
			body='{ "message": "", "object": "freqfewqfewewfewfew", "status": "", "success": true, "timestamp": 0, "txId": "" }';
			} else if(request.getEndpoint().contains('insert')){
			system.debug('url=Insert');
			response.setHeader('Content-Type', 'application/json');
			body='{ "message": "", "object": [ { "dataId": "123456", "directShippmentAddress": "", "directShippmentAddressEncrypt": "", "isDelete": 0, "phoneNumber": "", "phoneNumberEncrypt": "", "sfRecordId": "a2R1m0000007BPD" } ], "status": "", "success": true, "timestamp": 0, "txId": "" }';
			} else if(request.getEndpoint().contains('update')){
			system.debug('url=update');
			response.setHeader('Content-Type', 'application/json');
			body='{ "message": "", "object": [ { "dataId": "123456", "directShippmentAddress": "", "directShippmentAddressEncrypt": "", "isDelete": 0, "phoneNumber": "", "phoneNumberEncrypt": "", "sfRecordId": "a2R1m0000007BPD" } ], "status": "", "success": true, "timestamp": 0, "txId": "" }';
			} else{

			}

			response.setBody(body);
			response.setStatus('OK');
			response.setStatusCode(200);
			return response;
			// }
			}
			}
			// AWSServiceTool2没上线就把这部分注释 end
			static testMethod void testMethod1() {
			// 省
			Address_Level__c al = new Address_Level__c();
			@@ -49,14 +143,14 @@
			dep.Department_Class__c = strategicDep[0].Id;
			dep.Hospital__c = hospital.Id;
			insert dep;

			Contact contact2 = new Contact();
			contact2.AccountId = dep.Id;
			contact2.FirstName = '責任者';
			contact2.LastName = 'test1经销商';
			contact2.Employee_No_manual__c = 'om003901';
			insert contact2;

			// AWSServiceTool2没上线就把这部分放开 start 20220408
			//Contact contact2 = new Contact();
			//contact2.AccountId = dep.Id;
			//contact2.FirstName = '責任者';
			//contact2.LastName = 'test1经销商';
			//contact2.Employee_No_manual__c = 'om003901';
			//insert contact2;
			// AWSServiceTool2没上线就把这部分放开 end
			ODS__c ods = new ODS__c();
			ods.ALIAS__C = 'om003901';
			ods.BRANCH__C = '';
			@@ -81,9 +175,24 @@
			ods.Stay_or_not__c = '在职';
			ods.LeaveDate__c = Date.today();

			insert ods;
			Test.startTest();
			try{
			insert ods;
			// AWSServiceTool2没上线就把这部分注释 start
			Test.setMock(HttpCalloutMock.class, new HttpMock());

			ods.LeaveDate__c = Date.today();
			update ods;
			List<Agency_Contact__c> lra = new List<Agency_Contact__c>();
			lra.add(new Agency_Contact__c(
			Id = 'a2R1m0000007BPD',
			Aws_Data_Id__c = '123456'
			));
			AWSServiceTool2.EncryptPushCore(Json.serialize(lra),'Agency_Contact__c');
			// AWSServiceTool2没上线就把这部分注释 end
			ods.LeaveDate__c = Date.today()+1;
			update ods;
			}catch(Exception e){
			system.debug('Exception from upsert file:'+e.getmessage());
			}
			Test.stopTest();
			}
			}