| @@ -29,7 +29,7 @@ discard block | ||
| 29 | 29 | * Personal Object to test | 
| 30 | 30 | * @return array | 
| 31 | 31 | */ | 
| 32 | -    private function personalAppointment(){ | |
| 32 | +    private function personalAppointment() { | |
| 33 | 33 | return [ | 
| 34 | 34 | "appointmentId"=> 52, | 
| 35 | 35 | "startDate"=> "2015-16-07 11:00:00", | 
| @@ -68,23 +68,23 @@ discard block | ||
| 68 | 68 | |
| 69 | 69 | protected function setUp() | 
| 70 | 70 |      { | 
| 71 | -        $certainApiClient =  new CertainApiClient(null,getenv('username'),getenv('password'),getenv('accountCode')); | |
| 72 | - $this->certainApiService = new CertainApiService($certainApiClient); | |
| 71 | +        $certainApiClient = new CertainApiClient(null, getenv('username'), getenv('password'), getenv('accountCode')); | |
| 72 | + $this->certainApiService = new CertainApiService($certainApiClient); | |
| 73 | 73 | $this->appointmentsCertain = new AppointmentsCertain($this->certainApiService); | 
| 74 | -        $this->certainAppointmentsList = $this->appointmentsCertain->get(getenv('eventCode'),['start_index'=>0,'max_results'=>10])->getResults()->appointments; | |
| 74 | +        $this->certainAppointmentsList = $this->appointmentsCertain->get(getenv('eventCode'), ['start_index'=>0, 'max_results'=>10])->getResults()->appointments; | |
| 75 | 75 | } | 
| 76 | 76 | |
| 77 | -    public function testDetectChangings(){ | |
| 77 | +    public function testDetectChangings() { | |
| 78 | 78 | $detectService = new DetectAppointmentsChangingsService($this->appointmentsCertain); | 
| 79 | 79 | $oldAppointments = $this->certainAppointmentsList; | 
| 80 | 80 | $currentAppoiments = $oldAppointments; | 
| 81 | 81 | unset($currentAppoiments[0]); | 
| 82 | 82 | unset($currentAppoiments[1]); | 
| 83 | - $hasChanged = $detectService->hasChanged($oldAppointments,$currentAppoiments); | |
| 83 | + $hasChanged = $detectService->hasChanged($oldAppointments, $currentAppoiments); | |
| 84 | 84 | $this->assertTrue($hasChanged); | 
| 85 | 85 | } | 
| 86 | 86 | |
| 87 | -    public function testGetListChangings(){ | |
| 87 | +    public function testGetListChangings() { | |
| 88 | 88 | $detectService = new DetectAppointmentsChangingsService($this->appointmentsCertain); | 
| 89 | 89 | $oldAppointments = $this->certainAppointmentsList; | 
| 90 | 90 | $currentAppoiments = $oldAppointments; | 
| @@ -94,14 +94,14 @@ discard block | ||
| 94 | 94 | unset($currentAppoiments[0]); | 
| 95 | 95 | unset($currentAppoiments[1]); | 
| 96 | 96 | unset($currentAppoiments[4]); | 
| 97 | - $changings = $detectService->getListChangings($oldAppointments,$currentAppoiments); | |
| 98 | - $this->assertEquals(3,count($changings['updated_deleted'])); | |
| 99 | - $this->assertContains($delete1,$changings['updated_deleted']); | |
| 100 | - $this->assertContains($delete2,$changings['updated_deleted']); | |
| 101 | - $this->assertContains($delete3,$changings['updated_deleted']); | |
| 97 | + $changings = $detectService->getListChangings($oldAppointments, $currentAppoiments); | |
| 98 | + $this->assertEquals(3, count($changings['updated_deleted'])); | |
| 99 | + $this->assertContains($delete1, $changings['updated_deleted']); | |
| 100 | + $this->assertContains($delete2, $changings['updated_deleted']); | |
| 101 | + $this->assertContains($delete3, $changings['updated_deleted']); | |
| 102 | 102 | } | 
| 103 | 103 | |
| 104 | -    public function testDetectDeleteOrUpdated(){ | |
| 104 | +    public function testDetectDeleteOrUpdated() { | |
| 105 | 105 | $detectService = new DetectAppointmentsChangingsService($this->appointmentsCertain); | 
| 106 | 106 | $oldAppointments = $this->certainAppointmentsList; | 
| 107 | 107 | $oldAppointments[10] = $this->personalAppointment(); | 
| @@ -113,19 +113,19 @@ discard block | ||
| 113 | 113 | $update1 = $currentAppoiments[10]; | 
| 114 | 114 | $currentAppoiments[10]["startDate"] = "2015-17-07 12:00:00"; | 
| 115 | 115 | $currentAppoiments[10]["endDate"] = "2015-17-07 12:30:00"; | 
| 116 | - $changings = $detectService->getListChangings($oldAppointments,$currentAppoiments); | |
| 117 | - $listDetected = $detectService->detectDeleteOrUpdated($currentAppoiments,$changings['updated_deleted']); | |
| 118 | - $this->assertEquals(3,count($changings['updated_deleted'])); | |
| 119 | -        $this->assertArrayHasKey('deleted',$listDetected); | |
| 120 | -        $this->assertArrayHasKey('updated',$listDetected); | |
| 121 | - $this->assertEquals(2,count($listDetected['deleted'])); | |
| 122 | - $this->assertEquals(1,count($listDetected['updated'])); | |
| 123 | - $this->assertContains($delete1,$listDetected['deleted']); | |
| 124 | - $this->assertContains($delete2,$listDetected['deleted']); | |
| 125 | - $this->assertContains($update1,$listDetected['updated']); | |
| 116 | + $changings = $detectService->getListChangings($oldAppointments, $currentAppoiments); | |
| 117 | + $listDetected = $detectService->detectDeleteOrUpdated($currentAppoiments, $changings['updated_deleted']); | |
| 118 | + $this->assertEquals(3, count($changings['updated_deleted'])); | |
| 119 | +        $this->assertArrayHasKey('deleted', $listDetected); | |
| 120 | +        $this->assertArrayHasKey('updated', $listDetected); | |
| 121 | + $this->assertEquals(2, count($listDetected['deleted'])); | |
| 122 | + $this->assertEquals(1, count($listDetected['updated'])); | |
| 123 | + $this->assertContains($delete1, $listDetected['deleted']); | |
| 124 | + $this->assertContains($delete2, $listDetected['deleted']); | |
| 125 | + $this->assertContains($update1, $listDetected['updated']); | |
| 126 | 126 | } | 
| 127 | 127 | |
| 128 | -    public function testDetectAppointmentsChangings(){ | |
| 128 | +    public function testDetectAppointmentsChangings() { | |
| 129 | 129 | $detectService = new DetectAppointmentsChangingsService($this->appointmentsCertain); | 
| 130 | 130 | $oldAppointments = $this->certainAppointmentsList; | 
| 131 | 131 | $oldAppointments[10] = $this->personalAppointment(); | 
| @@ -141,10 +141,10 @@ discard block | ||
| 141 | 141 | $update1['dateDetectChanges'] = $time; | 
| 142 | 142 | $currentAppoiments[10]["startDate"] = "2015-17-07 12:00:00"; | 
| 143 | 143 | $currentAppoiments[10]["endDate"] = "2015-17-07 12:30:00"; | 
| 144 | - $listDetected = $detectService->detectAppointmentsChangings($oldAppointments,$currentAppoiments,$time); | |
| 145 | - $this->assertContains($delete1,$listDetected['deleted']); | |
| 146 | - $this->assertContains($delete2,$listDetected['deleted']); | |
| 147 | - $this->assertContains($update1,$listDetected['updated']); | |
| 144 | + $listDetected = $detectService->detectAppointmentsChangings($oldAppointments, $currentAppoiments, $time); | |
| 145 | + $this->assertContains($delete1, $listDetected['deleted']); | |
| 146 | + $this->assertContains($delete2, $listDetected['deleted']); | |
| 147 | + $this->assertContains($update1, $listDetected['updated']); | |
| 148 | 148 | } | 
| 149 | 149 | |
| 150 | 150 | } | 
| 151 | 151 | \ No newline at end of file | 
| @@ -23,14 +23,14 @@ discard block | ||
| 23 | 23 | * @param null|int $maxResult | 
| 24 | 24 | * @return mixed | 
| 25 | 25 | */ | 
| 26 | -    public function getCurrentAppoiments($eventCode,$start=null,$maxResult=null){ | |
| 27 | -        if(!$start){ | |
| 26 | +    public function getCurrentAppoiments($eventCode, $start = null, $maxResult = null) { | |
| 27 | +        if (!$start) { | |
| 28 | 28 | $start = 0; | 
| 29 | 29 | } | 
| 30 | -        if(!$maxResult){ | |
| 30 | +        if (!$maxResult) { | |
| 31 | 31 | $maxResult = 999999; | 
| 32 | 32 | } | 
| 33 | - return $this->certainAppointmentsList = $this->appointmentsCertain->get($eventCode,['start_index'=>$start,'max_results'=>$maxResult])->getResults()->appointments; | |
| 33 | + return $this->certainAppointmentsList = $this->appointmentsCertain->get($eventCode, ['start_index'=>$start, 'max_results'=>$maxResult])->getResults()->appointments; | |
| 34 | 34 | } | 
| 35 | 35 | |
| 36 | 36 | /** | 
| @@ -38,21 +38,21 @@ discard block | ||
| 38 | 38 | * @param array $appointmentsNew | 
| 39 | 39 | * @return bool | 
| 40 | 40 | */ | 
| 41 | -    public function hasChanged(array $appointmentsOld,array $appointmentsNew){ | |
| 41 | +    public function hasChanged(array $appointmentsOld, array $appointmentsNew) { | |
| 42 | 42 | $hasChanged = false; | 
| 43 | 43 | $appointmentsOld = self::recursiveArrayObjectToFullArray($appointmentsOld); | 
| 44 | 44 | $appointmentsNew = self::recursiveArrayObjectToFullArray($appointmentsNew); | 
| 45 | 45 | //Has change by update or delete | 
| 46 | -        foreach ($appointmentsOld as $appointmentOld){ | |
| 47 | -            if(!in_array($appointmentOld,$appointmentsNew)){ | |
| 46 | +        foreach ($appointmentsOld as $appointmentOld) { | |
| 47 | +            if (!in_array($appointmentOld, $appointmentsNew)) { | |
| 48 | 48 | $hasChanged = true; | 
| 49 | 49 | break; | 
| 50 | 50 | } | 
| 51 | 51 | } | 
| 52 | 52 | //Has changes by insertion or update | 
| 53 | -        if(!$hasChanged){ | |
| 54 | -            foreach ($appointmentsNew as $appointmentNew){ | |
| 55 | -                if(!in_array($appointmentNew,$appointmentsOld)){ | |
| 53 | +        if (!$hasChanged) { | |
| 54 | +            foreach ($appointmentsNew as $appointmentNew) { | |
| 55 | +                if (!in_array($appointmentNew, $appointmentsOld)) { | |
| 56 | 56 | $hasChanged = true; | 
| 57 | 57 | break; | 
| 58 | 58 | } | 
| @@ -66,7 +66,7 @@ discard block | ||
| 66 | 66 | * @return array | 
| 67 | 67 | */ | 
| 68 | 68 |      public static  function objectToArray($object) { | 
| 69 | -        if(is_object($object)){ | |
| 69 | +        if (is_object($object)) { | |
| 70 | 70 | |
| 71 | 71 | return (array) $object; | 
| 72 | 72 | } | 
| @@ -77,7 +77,7 @@ discard block | ||
| 77 | 77 | * @param $appointments | 
| 78 | 78 | * @return array | 
| 79 | 79 | */ | 
| 80 | -    public static function recursiveArrayObjectToFullArray($appointments){ | |
| 80 | +    public static function recursiveArrayObjectToFullArray($appointments) { | |
| 81 | 81 | return json_decode(json_encode($appointments), true); | 
| 82 | 82 | } | 
| 83 | 83 | |
| @@ -88,8 +88,8 @@ discard block | ||
| 88 | 88 | */ | 
| 89 | 89 |      private function arrayRecursiveDiff(array $arrayOlds, array $arrayNews) { | 
| 90 | 90 | $difference = []; | 
| 91 | -        foreach($arrayOlds as $key => $arrayOld){ | |
| 92 | -            if(!in_array($arrayOld,$arrayNews)){ | |
| 91 | +        foreach ($arrayOlds as $key => $arrayOld) { | |
| 92 | +            if (!in_array($arrayOld, $arrayNews)) { | |
| 93 | 93 | $difference[$key] = $arrayOld; | 
| 94 | 94 | } | 
| 95 | 95 | } | 
| @@ -104,9 +104,9 @@ discard block | ||
| 104 | 104 | */ | 
| 105 | 105 |      private function arrayRecursiveDiffNew(array $arrayOlds, array $arrayNews, array $existedUpdateOrDelete) { | 
| 106 | 106 | $difference = []; | 
| 107 | -        foreach($arrayNews as $key => $arrayNew){ | |
| 108 | - if(!in_array($arrayNew,$arrayOlds) | |
| 109 | -                && !in_array(self::recursiveArrayObjectToFullArray($arrayNew), $existedUpdateOrDelete)){ | |
| 107 | +        foreach ($arrayNews as $key => $arrayNew) { | |
| 108 | + if (!in_array($arrayNew, $arrayOlds) | |
| 109 | +                && !in_array(self::recursiveArrayObjectToFullArray($arrayNew), $existedUpdateOrDelete)) { | |
| 110 | 110 | $difference[$key] = $arrayNew; | 
| 111 | 111 | } | 
| 112 | 112 | } | 
| @@ -118,13 +118,13 @@ discard block | ||
| 118 | 118 | * @param array $appointmentsNew | 
| 119 | 119 | * @return array | 
| 120 | 120 | */ | 
| 121 | -    public function getListChangings(array $appointmentsOld,array $appointmentsNew){ | |
| 121 | +    public function getListChangings(array $appointmentsOld, array $appointmentsNew) { | |
| 122 | 122 | $appointmentsOld = self::recursiveArrayObjectToFullArray($appointmentsOld); | 
| 123 | 123 | $appointmentsNew = self::recursiveArrayObjectToFullArray($appointmentsNew); | 
| 124 | 124 | $changesListUpdateOrDelete = []; | 
| 125 | 125 | $changesListInsert = []; | 
| 126 | -        if($this->hasChanged($appointmentsOld,$appointmentsNew)){ | |
| 127 | - $changesListUpdateOrDelete = self::recursiveArrayObjectToFullArray($this->arrayRecursiveDiff($appointmentsOld,$appointmentsNew)); | |
| 126 | +        if ($this->hasChanged($appointmentsOld, $appointmentsNew)) { | |
| 127 | + $changesListUpdateOrDelete = self::recursiveArrayObjectToFullArray($this->arrayRecursiveDiff($appointmentsOld, $appointmentsNew)); | |
| 128 | 128 | $changesListInsert = self::recursiveArrayObjectToFullArray($this->arrayRecursiveDiffNew($appointmentsOld, $appointmentsNew, $changesListUpdateOrDelete)); | 
| 129 | 129 | } | 
| 130 | 130 | return [ | 
| @@ -139,26 +139,26 @@ discard block | ||
| 139 | 139 | * @param array $changingsDetected | 
| 140 | 140 | * @return array ['deleted'=>[],'updated'=>[]] | 
| 141 | 141 | */ | 
| 142 | -    public function detectDeleteOrUpdated(array $currentAppointments, array $changingsDetected){ | |
| 142 | +    public function detectDeleteOrUpdated(array $currentAppointments, array $changingsDetected) { | |
| 143 | 143 | $delete = []; | 
| 144 | 144 | $update = []; | 
| 145 | 145 | //@Todo: Detect Fields has changed | 
| 146 | 146 | $appointmentsNew = self::recursiveArrayObjectToFullArray($currentAppointments); | 
| 147 | 147 | $changings = self::recursiveArrayObjectToFullArray($changingsDetected); | 
| 148 | -        foreach ($changings as $changing){ | |
| 148 | +        foreach ($changings as $changing) { | |
| 149 | 149 | $registration = $changing['registration']['regCode']; | 
| 150 | 150 | $registrationTarget = $changing['targetRegistration']['regCode']; | 
| 151 | -            foreach ($appointmentsNew as $currentAppointment){ | |
| 151 | +            foreach ($appointmentsNew as $currentAppointment) { | |
| 152 | 152 | $registrationCurrent = $currentAppointment['registration']['regCode']; | 
| 153 | 153 | $registrationTargetCurrent = $currentAppointment['targetRegistration']['regCode']; | 
| 154 | - if(in_array($registration,[$registrationCurrent,$registrationTargetCurrent]) | |
| 155 | - && in_array($registrationTarget,[$registrationCurrent,$registrationTargetCurrent]) | |
| 156 | -                     && !in_array($changing,$update) && !in_array($changing,$delete)) { | |
| 154 | + if (in_array($registration, [$registrationCurrent, $registrationTargetCurrent]) | |
| 155 | + && in_array($registrationTarget, [$registrationCurrent, $registrationTargetCurrent]) | |
| 156 | +                     && !in_array($changing, $update) && !in_array($changing, $delete)) { | |
| 157 | 157 | $update[] = $changing; | 
| 158 | 158 | break; | 
| 159 | 159 | } | 
| 160 | 160 | } | 
| 161 | -            if(!in_array($changing, $update) && !in_array($changing,$delete)){ | |
| 161 | +            if (!in_array($changing, $update) && !in_array($changing, $delete)) { | |
| 162 | 162 | $delete[] = $changing; | 
| 163 | 163 | } | 
| 164 | 164 | |
| @@ -174,8 +174,8 @@ discard block | ||
| 174 | 174 | * @param $timestamp | 
| 175 | 175 | * @return array | 
| 176 | 176 | */ | 
| 177 | -    public static function insertDateTimeChanges(array $appointments,$timestamp){ | |
| 178 | -        foreach ($appointments as $key => $appointment){ | |
| 177 | +    public static function insertDateTimeChanges(array $appointments, $timestamp) { | |
| 178 | +        foreach ($appointments as $key => $appointment) { | |
| 179 | 179 | $appointments[$key]['dateDetectChanges'] = $timestamp; | 
| 180 | 180 | } | 
| 181 | 181 | return $appointments; | 
| @@ -187,12 +187,12 @@ discard block | ||
| 187 | 187 | * @param string $timestamp | 
| 188 | 188 | * @return array ['deleted'=>[],'updated'=>[]] | 
| 189 | 189 | */ | 
| 190 | -    public function detectAppointmentsChangings(array $appointmentsOld,array $appointmentsNew,$timestamp){ | |
| 191 | - $changings = $this->getListChangings($appointmentsOld,$appointmentsNew); | |
| 192 | - $changesList = $this->detectDeleteOrUpdated($appointmentsNew,$changings['updated_deleted']); | |
| 193 | - $changesList['inserted'] = self::insertDateTimeChanges($changings['inserted'],$timestamp); | |
| 194 | - $changesList['updated'] = self::insertDateTimeChanges($changesList['updated'],$timestamp); | |
| 195 | - $changesList['deleted'] = self::insertDateTimeChanges($changesList['deleted'],$timestamp); | |
| 190 | +    public function detectAppointmentsChangings(array $appointmentsOld, array $appointmentsNew, $timestamp) { | |
| 191 | + $changings = $this->getListChangings($appointmentsOld, $appointmentsNew); | |
| 192 | + $changesList = $this->detectDeleteOrUpdated($appointmentsNew, $changings['updated_deleted']); | |
| 193 | + $changesList['inserted'] = self::insertDateTimeChanges($changings['inserted'], $timestamp); | |
| 194 | + $changesList['updated'] = self::insertDateTimeChanges($changesList['updated'], $timestamp); | |
| 195 | + $changesList['deleted'] = self::insertDateTimeChanges($changesList['deleted'], $timestamp); | |
| 196 | 196 | return $changesList; | 
| 197 | 197 | } | 
| 198 | 198 | |