@@ -10,8 +10,8 @@ discard block |
||
| 10 | 10 | * @param $dirPath |
| 11 | 11 | * @return bool |
| 12 | 12 | */ |
| 13 | - public static function createDirectory($dirPath){ |
|
| 14 | - if(!file_exists($dirPath)){ |
|
| 13 | + public static function createDirectory($dirPath) { |
|
| 14 | + if (!file_exists($dirPath)) { |
|
| 15 | 15 | return mkdir($dirPath, 0775, true, null); |
| 16 | 16 | } |
| 17 | 17 | return false; |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | * @param string $msg |
| 24 | 24 | * @return void |
| 25 | 25 | */ |
| 26 | - public static function writeFile($path,$msg){ |
|
| 26 | + public static function writeFile($path, $msg) { |
|
| 27 | 27 | $f = fopen($path, "w+"); |
| 28 | 28 | fwrite($f, $msg); |
| 29 | 29 | fclose($f); |
@@ -35,15 +35,15 @@ discard block |
||
| 35 | 35 | * @param string $contents |
| 36 | 36 | * @return void |
| 37 | 37 | */ |
| 38 | - public static function saveAppointmentsFileByHistory($filePath,$contents){ |
|
| 38 | + public static function saveAppointmentsFileByHistory($filePath, $contents) { |
|
| 39 | 39 | $time = time(); |
| 40 | 40 | $file = pathinfo($filePath); |
| 41 | 41 | $fileNamebase = $file['filename']; |
| 42 | 42 | $filePath = $file['dirname'].'/'.$fileNamebase.'_'.$time.'.json'; |
| 43 | - if(!file_exists($filePath)){ |
|
| 44 | - self::writeFile($filePath,''); |
|
| 43 | + if (!file_exists($filePath)) { |
|
| 44 | + self::writeFile($filePath, ''); |
|
| 45 | 45 | } |
| 46 | - self::writeFile($filePath,$contents); |
|
| 46 | + self::writeFile($filePath, $contents); |
|
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | /** |
@@ -51,9 +51,9 @@ discard block |
||
| 51 | 51 | * @param $path |
| 52 | 52 | * @return string |
| 53 | 53 | */ |
| 54 | - public static function getContentFile($path){ |
|
| 55 | - if(!file_exists($path)){ |
|
| 56 | - self::writeFile($path,''); |
|
| 54 | + public static function getContentFile($path) { |
|
| 55 | + if (!file_exists($path)) { |
|
| 56 | + self::writeFile($path, ''); |
|
| 57 | 57 | } |
| 58 | 58 | $handle = fopen($path, "rb"); |
| 59 | 59 | if (FALSE === $handle) { |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | * @param string $path |
| 73 | 73 | * @return mixed |
| 74 | 74 | */ |
| 75 | - public static function getJsonContentFromFile($path){ |
|
| 75 | + public static function getJsonContentFromFile($path) { |
|
| 76 | 76 | $contents = self::getContentFile($path); |
| 77 | 77 | return json_decode($contents, true); |
| 78 | 78 | } |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | * @param string $pathDir |
| 84 | 84 | * @return array |
| 85 | 85 | */ |
| 86 | - public static function getFilesListHistoryAppointmentsByEventCode($eventCode,$pathDir){ |
|
| 86 | + public static function getFilesListHistoryAppointmentsByEventCode($eventCode, $pathDir) { |
|
| 87 | 87 | $fileList = array(); |
| 88 | 88 | $files = glob($pathDir.'/appointments_'.$eventCode.'_*.json'); |
| 89 | 89 | foreach ($files as $file) { |
@@ -100,8 +100,8 @@ discard block |
||
| 100 | 100 | * @param string $pathDir |
| 101 | 101 | * @return string |
| 102 | 102 | */ |
| 103 | - public static function getTheLastAppointmentsSaved($eventCode,$pathDir){ |
|
| 104 | - $fileList = self::getFilesListHistoryAppointmentsByEventCode($eventCode,$pathDir); |
|
| 103 | + public static function getTheLastAppointmentsSaved($eventCode, $pathDir) { |
|
| 104 | + $fileList = self::getFilesListHistoryAppointmentsByEventCode($eventCode, $pathDir); |
|
| 105 | 105 | return array_shift($fileList); |
| 106 | 106 | } |
| 107 | 107 | } |
| 108 | 108 | \ No newline at end of file |
@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | if (file_exists(__DIR__.'/../vendor/autoload.php')) { |
| 3 | 3 | require_once __DIR__.'/../vendor/autoload.php'; |
| 4 | -} else { |
|
| 4 | +}else { |
|
| 5 | 5 | require_once __DIR__.'/../../../../vendor/autoload.php'; |
| 6 | 6 | } |
| 7 | 7 | \ No newline at end of file |
@@ -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,$GLOBALS['username'],$GLOBALS['password'],$GLOBALS['accountCode']); |
|
| 72 | - $this->certainApiService = new CertainApiService($certainApiClient); |
|
| 71 | + $certainApiClient = new CertainApiClient(null, $GLOBALS['username'], $GLOBALS['password'], $GLOBALS['accountCode']); |
|
| 72 | + $this->certainApiService = new CertainApiService($certainApiClient); |
|
| 73 | 73 | $this->appointmentsCertain = new AppointmentsCertain($this->certainApiService); |
| 74 | - $this->certainAppointmentsList = $this->appointmentsCertain->get($GLOBALS['eventCode'],['start_index'=>0,'max_results'=>10])->getResults()->appointments; |
|
| 74 | + $this->certainAppointmentsList = $this->appointmentsCertain->get($GLOBALS['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)); |
|
| 99 | - $this->assertContains($delete1,$changings); |
|
| 100 | - $this->assertContains($delete2,$changings); |
|
| 101 | - $this->assertContains($delete3,$changings); |
|
| 97 | + $changings = $detectService->getListChangings($oldAppointments, $currentAppoiments); |
|
| 98 | + $this->assertEquals(3, count($changings)); |
|
| 99 | + $this->assertContains($delete1, $changings); |
|
| 100 | + $this->assertContains($delete2, $changings); |
|
| 101 | + $this->assertContains($delete3, $changings); |
|
| 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); |
|
| 118 | - $this->assertEquals(3,count($changings)); |
|
| 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); |
|
| 118 | + $this->assertEquals(3, count($changings)); |
|
| 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(); |
@@ -137,10 +137,10 @@ discard block |
||
| 137 | 137 | $update1 = $currentAppoiments[10]; |
| 138 | 138 | $currentAppoiments[10]["startDate"] = "2015-17-07 12:00:00"; |
| 139 | 139 | $currentAppoiments[10]["endDate"] = "2015-17-07 12:30:00"; |
| 140 | - $listDetected = $detectService->detectAppointmentsChangings($oldAppointments,$currentAppoiments); |
|
| 141 | - $this->assertContains($delete1,$listDetected['deleted']); |
|
| 142 | - $this->assertContains($delete2,$listDetected['deleted']); |
|
| 143 | - $this->assertContains($update1,$listDetected['updated']); |
|
| 140 | + $listDetected = $detectService->detectAppointmentsChangings($oldAppointments, $currentAppoiments); |
|
| 141 | + $this->assertContains($delete1, $listDetected['deleted']); |
|
| 142 | + $this->assertContains($delete2, $listDetected['deleted']); |
|
| 143 | + $this->assertContains($update1, $listDetected['updated']); |
|
| 144 | 144 | } |
| 145 | 145 | |
| 146 | 146 | } |
| 147 | 147 | \ 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){ |
|
| 31 | - $maxResult = $this->appointmentsCertain->get($eventCode,['start_index'=>0,'max_results'=>99999])->getMaxResults(); |
|
| 30 | + if (!$maxResult) { |
|
| 31 | + $maxResult = $this->appointmentsCertain->get($eventCode, ['start_index'=>0, 'max_results'=>99999])->getMaxResults(); |
|
| 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,12 +38,12 @@ 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 | - foreach ($appointmentsOld as $appointmentOld){ |
|
| 46 | - if(!in_array($appointmentOld,$appointmentsNew)){ |
|
| 45 | + foreach ($appointmentsOld as $appointmentOld) { |
|
| 46 | + if (!in_array($appointmentOld, $appointmentsNew)) { |
|
| 47 | 47 | $hasChanged = true; |
| 48 | 48 | break; |
| 49 | 49 | } |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | * @return array |
| 57 | 57 | */ |
| 58 | 58 | public static function objectToArray($object) { |
| 59 | - if(is_object($object)){ |
|
| 59 | + if (is_object($object)) { |
|
| 60 | 60 | |
| 61 | 61 | return (array) $object; |
| 62 | 62 | } |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | * @param $appointments |
| 68 | 68 | * @return array |
| 69 | 69 | */ |
| 70 | - public static function recursiveArrayObjectToFullArray($appointments){ |
|
| 70 | + public static function recursiveArrayObjectToFullArray($appointments) { |
|
| 71 | 71 | return json_decode(json_encode($appointments), true); |
| 72 | 72 | } |
| 73 | 73 | |
@@ -78,8 +78,8 @@ discard block |
||
| 78 | 78 | */ |
| 79 | 79 | private function arrayRecursiveDiff(array $arrayOlds, array $arrayNews) { |
| 80 | 80 | $difference = []; |
| 81 | - foreach($arrayOlds as $key => $arrayOld){ |
|
| 82 | - if(!in_array($arrayOld,$arrayNews)){ |
|
| 81 | + foreach ($arrayOlds as $key => $arrayOld) { |
|
| 82 | + if (!in_array($arrayOld, $arrayNews)) { |
|
| 83 | 83 | $difference[$key] = $arrayOld; |
| 84 | 84 | } |
| 85 | 85 | } |
@@ -91,12 +91,12 @@ discard block |
||
| 91 | 91 | * @param array $appointmentsNew |
| 92 | 92 | * @return array |
| 93 | 93 | */ |
| 94 | - public function getListChangings(array $appointmentsOld,array $appointmentsNew){ |
|
| 94 | + public function getListChangings(array $appointmentsOld, array $appointmentsNew) { |
|
| 95 | 95 | $appointmentsOld = self::recursiveArrayObjectToFullArray($appointmentsOld); |
| 96 | 96 | $appointmentsNew = self::recursiveArrayObjectToFullArray($appointmentsNew); |
| 97 | 97 | $changesList = []; |
| 98 | - if($this->hasChanged($appointmentsOld,$appointmentsNew)){ |
|
| 99 | - $changesList = self::recursiveArrayObjectToFullArray($this->arrayRecursiveDiff($appointmentsOld,$appointmentsNew)); |
|
| 98 | + if ($this->hasChanged($appointmentsOld, $appointmentsNew)) { |
|
| 99 | + $changesList = self::recursiveArrayObjectToFullArray($this->arrayRecursiveDiff($appointmentsOld, $appointmentsNew)); |
|
| 100 | 100 | } |
| 101 | 101 | return $changesList; |
| 102 | 102 | } |
@@ -107,26 +107,26 @@ discard block |
||
| 107 | 107 | * @param array $changingsDetected |
| 108 | 108 | * @return array ['deleted'=>[],'updated'=>[]] |
| 109 | 109 | */ |
| 110 | - public function detectDeleteOrUpdated(array $currentAppointments,array $changingsDetected){ |
|
| 110 | + public function detectDeleteOrUpdated(array $currentAppointments, array $changingsDetected) { |
|
| 111 | 111 | $delete = []; |
| 112 | 112 | $update = []; |
| 113 | 113 | //@Todo: Detect Fields has changed |
| 114 | 114 | $appointmentsNew = self::recursiveArrayObjectToFullArray($currentAppointments); |
| 115 | 115 | $changings = self::recursiveArrayObjectToFullArray($changingsDetected); |
| 116 | - foreach ($changings as $changing){ |
|
| 116 | + foreach ($changings as $changing) { |
|
| 117 | 117 | $registration = $changing['registration']['regCode']; |
| 118 | 118 | $registrationTarget = $changing['targetRegistration']['regCode']; |
| 119 | - foreach ($appointmentsNew as $currentAppointment){ |
|
| 119 | + foreach ($appointmentsNew as $currentAppointment) { |
|
| 120 | 120 | $registrationCurrent = $currentAppointment['registration']['regCode']; |
| 121 | 121 | $registrationTargetCurrent = $currentAppointment['targetRegistration']['regCode']; |
| 122 | - if(in_array($registration,[$registrationCurrent,$registrationTargetCurrent]) |
|
| 123 | - && in_array($registrationTarget,[$registrationCurrent,$registrationTargetCurrent]) |
|
| 124 | - && !in_array($changing,$update) && !in_array($changing,$delete)) { |
|
| 122 | + if (in_array($registration, [$registrationCurrent, $registrationTargetCurrent]) |
|
| 123 | + && in_array($registrationTarget, [$registrationCurrent, $registrationTargetCurrent]) |
|
| 124 | + && !in_array($changing, $update) && !in_array($changing, $delete)) { |
|
| 125 | 125 | $update[] = $changing; |
| 126 | 126 | break; |
| 127 | 127 | } |
| 128 | 128 | } |
| 129 | - if(!in_array($changing,$update) && !in_array($changing,$delete)){ |
|
| 129 | + if (!in_array($changing, $update) && !in_array($changing, $delete)) { |
|
| 130 | 130 | $delete[] = $changing; |
| 131 | 131 | } |
| 132 | 132 | } |
@@ -141,9 +141,9 @@ discard block |
||
| 141 | 141 | * @param array $appointmentsNew |
| 142 | 142 | * @return array ['deleted'=>[],'updated'=>[]] |
| 143 | 143 | */ |
| 144 | - public function detectAppointmentsChangings(array $appointmentsOld,array $appointmentsNew){ |
|
| 145 | - $changings = $this->getListChangings($appointmentsOld,$appointmentsNew); |
|
| 146 | - $changesList = $this->detectDeleteOrUpdated($appointmentsNew,$changings); |
|
| 144 | + public function detectAppointmentsChangings(array $appointmentsOld, array $appointmentsNew) { |
|
| 145 | + $changings = $this->getListChangings($appointmentsOld, $appointmentsNew); |
|
| 146 | + $changesList = $this->detectDeleteOrUpdated($appointmentsNew, $changings); |
|
| 147 | 147 | return $changesList; |
| 148 | 148 | } |
| 149 | 149 | |