Wabel / certain-api-wrapper

src/Services/DetectAppointmentsChangingsService.php

Doc Comments +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
     }
 
     /**
-     * @param $eventCode
+     * @param string $eventCode
      * @param null|int $start
      * @param null|int $maxResult
      * @return mixed
@@ -138,7 +138,7 @@ 
 
     /**
      * @param array $appointments
-     * @param $timestamp
+     * @param string $timestamp
      * @return array
      */
     private function insertDateTimeChanges(array $appointments,$timestamp){

Spacing +31 added lines, -31 removed lines

@@ -23,14 +23,14 @@ 
      * @param null|int $maxResult
      * @return mixed
      */
-    public function getCurrentAppoiments($eventCode,$start=null,$maxResult=null){
-        if(!$start){
+    public function getCurrentAppoiments($eventCode, $start = null, $maxResult = null) {
+        if (!$start) {
             $start = 0;
         }
-        if(!$maxResult){
-            $maxResult = $this->appointmentsCertain->get($eventCode,['start_index'=>0,'max_results'=>99999])->getMaxResults();
+        if (!$maxResult) {
+            $maxResult = $this->appointmentsCertain->get($eventCode, ['start_index'=>0, 'max_results'=>99999])->getMaxResults();
         }
-        return $this->certainAppointmentsList = $this->appointmentsCertain->get($eventCode,['start_index'=>$start,'max_results'=>$maxResult])->getResults()->appointments;
+        return $this->certainAppointmentsList = $this->appointmentsCertain->get($eventCode, ['start_index'=>$start, 'max_results'=>$maxResult])->getResults()->appointments;
     }
 
     /**
@@ -38,12 +38,12 @@ 
      * @param array $appointmentsNew
      * @return bool
      */
-    public function hasChanged(array $appointmentsOld,array $appointmentsNew){
+    public function hasChanged(array $appointmentsOld, array $appointmentsNew) {
         $hasChanged = false;
         $appointmentsOld = self::recursiveArrayObjectToFullArray($appointmentsOld);
         $appointmentsNew = self::recursiveArrayObjectToFullArray($appointmentsNew);
-        foreach ($appointmentsOld as $appointmentOld){
-            if(!in_array($appointmentOld,$appointmentsNew)){
+        foreach ($appointmentsOld as $appointmentOld) {
+            if (!in_array($appointmentOld, $appointmentsNew)) {
                 $hasChanged = true;
                 break;
             }
@@ -56,7 +56,7 @@ 
      * @return array
      */
     public static  function objectToArray($object) {
-        if(is_object($object)){
+        if (is_object($object)) {
 
             return (array) $object;
         }
@@ -67,7 +67,7 @@ 
      * @param $appointments
      * @return array
      */
-    public static function recursiveArrayObjectToFullArray($appointments){
+    public static function recursiveArrayObjectToFullArray($appointments) {
         return json_decode(json_encode($appointments), true);
     }
 
@@ -78,8 +78,8 @@ 
      */
     private function arrayRecursiveDiff(array $arrayOlds, array $arrayNews) {
         $difference = [];
-        foreach($arrayOlds as $key => $arrayOld){
-            if(!in_array($arrayOld,$arrayNews)){
+        foreach ($arrayOlds as $key => $arrayOld) {
+            if (!in_array($arrayOld, $arrayNews)) {
                 $difference[$key] = $arrayOld;
             }
         }
@@ -91,12 +91,12 @@ 
      * @param array $appointmentsNew
      * @return array
      */
-    public function getListChangings(array $appointmentsOld,array $appointmentsNew){
+    public function getListChangings(array $appointmentsOld, array $appointmentsNew) {
         $appointmentsOld = self::recursiveArrayObjectToFullArray($appointmentsOld);
         $appointmentsNew = self::recursiveArrayObjectToFullArray($appointmentsNew);
         $changesList = [];
-        if($this->hasChanged($appointmentsOld,$appointmentsNew)){
-            $changesList = self::recursiveArrayObjectToFullArray($this->arrayRecursiveDiff($appointmentsOld,$appointmentsNew));
+        if ($this->hasChanged($appointmentsOld, $appointmentsNew)) {
+            $changesList = self::recursiveArrayObjectToFullArray($this->arrayRecursiveDiff($appointmentsOld, $appointmentsNew));
         }
         return $changesList;
     }
@@ -107,26 +107,26 @@ 
      * @param array $changingsDetected
      * @return array ['deleted'=>[],'updated'=>[]]
      */
-    public function detectDeleteOrUpdated(array $currentAppointments,array $changingsDetected){
+    public function detectDeleteOrUpdated(array $currentAppointments, array $changingsDetected) {
         $delete = [];
         $update = [];
         //@Todo: Detect Fields has changed
         $appointmentsNew = self::recursiveArrayObjectToFullArray($currentAppointments);
         $changings = self::recursiveArrayObjectToFullArray($changingsDetected);
-        foreach ($changings as $changing){
+        foreach ($changings as $changing) {
             $registration = $changing['registration']['regCode'];
             $registrationTarget = $changing['targetRegistration']['regCode'];
-            foreach ($appointmentsNew as $currentAppointment){
+            foreach ($appointmentsNew as $currentAppointment) {
                 $registrationCurrent = $currentAppointment['registration']['regCode'];
                 $registrationTargetCurrent = $currentAppointment['targetRegistration']['regCode'];
-                if(in_array($registration,[$registrationCurrent,$registrationTargetCurrent])
-                    && in_array($registrationTarget,[$registrationCurrent,$registrationTargetCurrent])
-                    && !in_array($changing,$update) && !in_array($changing,$delete)) {
+                if (in_array($registration, [$registrationCurrent, $registrationTargetCurrent])
+                    && in_array($registrationTarget, [$registrationCurrent, $registrationTargetCurrent])
+                    && !in_array($changing, $update) && !in_array($changing, $delete)) {
                     $update[] = $changing;
                     break;
                 }
             }
-            if(!in_array($changing,$update) && !in_array($changing,$delete)){
+            if (!in_array($changing, $update) && !in_array($changing, $delete)) {
                 $delete[] = $changing;
             }
         }
@@ -141,8 +141,8 @@ 
      * @param $timestamp
      * @return array
      */
-    private function insertDateTimeChanges(array $appointments,$timestamp){
-        foreach ($appointments as $key => $appointment){
+    private function insertDateTimeChanges(array $appointments, $timestamp) {
+        foreach ($appointments as $key => $appointment) {
             $appointment[$key]['dateDetectChanges'] = $timestamp;
         }
         return $appointments;
@@ -154,17 +154,17 @@ 
      * @param string $timestamp
      * @return array ['deleted'=>[],'updated'=>[]]
      */
-    public function detectAppointmentsChangings(array $appointmentsOld,array $appointmentsNew,$timestamp){
-        $changings = $this->getListChangings($appointmentsOld,$appointmentsNew);
-        $changesList = $this->detectDeleteOrUpdated($appointmentsNew,$changings);
-        $insertDateTimeChanges = function ($appointment)use($timestamp){
-            if($appointment){
+    public function detectAppointmentsChangings(array $appointmentsOld, array $appointmentsNew, $timestamp) {
+        $changings = $this->getListChangings($appointmentsOld, $appointmentsNew);
+        $changesList = $this->detectDeleteOrUpdated($appointmentsNew, $changings);
+        $insertDateTimeChanges = function($appointment)use($timestamp){
+            if ($appointment) {
                 $appointment['dateDetectChanges'] = $timestamp;
             }
             return $appointment;
         };
-        $changesList['updated'] = $this->insertDateTimeChanges($changesList['updated'],$timestamp);
-        $changesList['deleted'] = $this->insertDateTimeChanges($changesList['deleted'],$timestamp);
+        $changesList['updated'] = $this->insertDateTimeChanges($changesList['updated'], $timestamp);
+        $changesList['deleted'] = $this->insertDateTimeChanges($changesList['deleted'], $timestamp);
         return $changesList;
     }
 

tests/Wabel/Services/DetectAppointmentsChangingsServiceTest.php

Spacing +28 added lines, -28 removed lines

@@ -29,7 +29,7 @@ 
      * Personal Object to test
      * @return array
      */
-    private function personalAppointment(){
+    private function personalAppointment() {
         return [
                     "appointmentId"=> 52,
                     "startDate"=> "2015-16-07 11:00:00",
@@ -68,23 +68,23 @@ 
 
     protected function setUp()
     {
-        $certainApiClient =  new CertainApiClient(null,$GLOBALS['username'],$GLOBALS['password'],$GLOBALS['accountCode']);
-        $this->certainApiService  = new CertainApiService($certainApiClient);
+        $certainApiClient = new CertainApiClient(null, $GLOBALS['username'], $GLOBALS['password'], $GLOBALS['accountCode']);
+        $this->certainApiService = new CertainApiService($certainApiClient);
         $this->appointmentsCertain = new AppointmentsCertain($this->certainApiService);
-        $this->certainAppointmentsList = $this->appointmentsCertain->get($GLOBALS['eventCode'],['start_index'=>0,'max_results'=>10])->getResults()->appointments;
+        $this->certainAppointmentsList = $this->appointmentsCertain->get($GLOBALS['eventCode'], ['start_index'=>0, 'max_results'=>10])->getResults()->appointments;
     }
 
-    public function testDetectChangings(){
+    public function testDetectChangings() {
         $detectService = new DetectAppointmentsChangingsService($this->appointmentsCertain);
         $oldAppointments = $this->certainAppointmentsList;
         $currentAppoiments = $oldAppointments;
         unset($currentAppoiments[0]);
         unset($currentAppoiments[1]);
-        $hasChanged = $detectService->hasChanged($oldAppointments,$currentAppoiments);
+        $hasChanged = $detectService->hasChanged($oldAppointments, $currentAppoiments);
         $this->assertTrue($hasChanged);
     }
 
-    public function testGetListChangings(){
+    public function testGetListChangings() {
         $detectService = new DetectAppointmentsChangingsService($this->appointmentsCertain);
         $oldAppointments = $this->certainAppointmentsList;
         $currentAppoiments = $oldAppointments;
@@ -94,14 +94,14 @@ 
         unset($currentAppoiments[0]);
         unset($currentAppoiments[1]);
         unset($currentAppoiments[4]);
-        $changings = $detectService->getListChangings($oldAppointments,$currentAppoiments);
-        $this->assertEquals(3,count($changings));
-        $this->assertContains($delete1,$changings);
-        $this->assertContains($delete2,$changings);
-        $this->assertContains($delete3,$changings);
+        $changings = $detectService->getListChangings($oldAppointments, $currentAppoiments);
+        $this->assertEquals(3, count($changings));
+        $this->assertContains($delete1, $changings);
+        $this->assertContains($delete2, $changings);
+        $this->assertContains($delete3, $changings);
     }
 
-    public function testDetectDeleteOrUpdated(){
+    public function testDetectDeleteOrUpdated() {
         $detectService = new DetectAppointmentsChangingsService($this->appointmentsCertain);
         $oldAppointments = $this->certainAppointmentsList;
         $oldAppointments[10] = $this->personalAppointment();
@@ -113,19 +113,19 @@ 
         $update1 = $currentAppoiments[10];
         $currentAppoiments[10]["startDate"] = "2015-17-07 12:00:00";
         $currentAppoiments[10]["endDate"] = "2015-17-07 12:30:00";
-        $changings = $detectService->getListChangings($oldAppointments,$currentAppoiments);
-        $listDetected = $detectService->detectDeleteOrUpdated($currentAppoiments,$changings);
-        $this->assertEquals(3,count($changings));
-        $this->assertArrayHasKey('deleted',$listDetected);
-        $this->assertArrayHasKey('updated',$listDetected);
-        $this->assertEquals(2,count($listDetected['deleted']));
-        $this->assertEquals(1,count($listDetected['updated']));
-        $this->assertContains($delete1,$listDetected['deleted']);
-        $this->assertContains($delete2,$listDetected['deleted']);
-        $this->assertContains($update1,$listDetected['updated']);
+        $changings = $detectService->getListChangings($oldAppointments, $currentAppoiments);
+        $listDetected = $detectService->detectDeleteOrUpdated($currentAppoiments, $changings);
+        $this->assertEquals(3, count($changings));
+        $this->assertArrayHasKey('deleted', $listDetected);
+        $this->assertArrayHasKey('updated', $listDetected);
+        $this->assertEquals(2, count($listDetected['deleted']));
+        $this->assertEquals(1, count($listDetected['updated']));
+        $this->assertContains($delete1, $listDetected['deleted']);
+        $this->assertContains($delete2, $listDetected['deleted']);
+        $this->assertContains($update1, $listDetected['updated']);
     }
 
-    public function testDetectAppointmentsChangings(){
+    public function testDetectAppointmentsChangings() {
         $detectService = new DetectAppointmentsChangingsService($this->appointmentsCertain);
         $oldAppointments = $this->certainAppointmentsList;
         $oldAppointments[10] = $this->personalAppointment();
@@ -138,10 +138,10 @@ 
         $currentAppoiments[10]["startDate"] = "2015-17-07 12:00:00";
         $currentAppoiments[10]["endDate"] = "2015-17-07 12:30:00";
         $time = time();
-        $listDetected = $detectService->detectAppointmentsChangings($oldAppointments,$currentAppoiments,$time);
-        $this->assertContains($delete1,$listDetected['deleted']);
-        $this->assertContains($delete2,$listDetected['deleted']);
-        $this->assertContains($update1,$listDetected['updated']);
+        $listDetected = $detectService->detectAppointmentsChangings($oldAppointments, $currentAppoiments, $time);
+        $this->assertContains($delete1, $listDetected['deleted']);
+        $this->assertContains($delete2, $listDetected['deleted']);
+        $this->assertContains($update1, $listDetected['updated']);
     }
 
 }
\ No newline at end of file