Updates to code structure placement order

Author: unkn0wnAPI

src/Controller/Api/ApiController.php

@@ -174,9 +174,9 @@ public function getUserCalendars(Request $request, string $username, ManagerRegi
         $response = [
             'status' => 'success',
             'data' => [
-                'user_calendars' => $calendars ?? [],
-                'shared_calendars' => $sharedCalendars ?? [],
-                'subscriptions' => $subscriptions ?? [],
+                'user_calendars' => $calendars,
+                'shared_calendars' => $sharedCalendars,
+                'subscriptions' => $subscriptions,
             ],
             'timestamp' => $this->getTimestamp(),
         ];
@@ -236,42 +236,38 @@ public function getUserCalendarDetails(Request $request, string $username, int $
         return $this->json($response, 200);
     }
 
-    #[Route('/calendars/{username}/{calendar_id}/edit', name: 'calendar_edit', methods: ['POST'], requirements: ['calendar_id' => "\d+", 'username' => '[a-zA-Z0-9_-]+'])]
-    public function editUserCalendar(Request $request, string $username, int $calendar_id, ManagerRegistry $doctrine): JsonResponse
+    /**
+     * Creates a new calendar for a specific user.
+     *
+     * @param Request $request  The HTTP POST request
+     * @param string  $username The username of the user for whom the calendar is to be created
+     *
+     * @return JsonResponse A JSON response indicating the success or failure of the operation
+     */
+    #[Route('/calendars/{username}/create', name: 'calendar_create', methods: ['POST'], requirements: ['username' => '[a-zA-Z0-9_-]+'])]
+    public function createNewUserCalendar(Request $request, string $username, ManagerRegistry $doctrine): JsonResponse
     {
         if (!$doctrine->getRepository(Principal::class)->findOneByUri(Principal::PREFIX.$username)) {
             return $this->json(['status' => 'error', 'message' => 'User Not Found', 'timestamp' => $this->getTimestamp()], 404);
         }
 
-        $ownerInstance = $doctrine->getRepository(CalendarInstance::class)->findOneBy([
-            'id' => $calendar_id,
-            'principalUri' => Principal::PREFIX.$username,
-        ]);
-
-        if (!$ownerInstance) {
-            return $this->json(['status' => 'error', 'message' => 'Invalid Calendar ID', 'timestamp' => $this->getTimestamp()], 400);
-        }
-
-        $calendarInstance = $doctrine->getRepository(CalendarInstance::class)->findOneById($calendar_id);
-        if (!$calendarInstance) {
-            return $this->json(['status' => 'error', 'message' => 'Calendar Instance Not Found', 'timestamp' => $this->getTimestamp()], 404);
-        }
-
         $calendarName = $request->get('name');
         if (1 !== preg_match('/^[a-zA-Z0-9 _-]{0,64}$/', $calendarName)) {
             return $this->json(['status' => 'error', 'message' => 'Invalid Calendar Name', 'timestamp' => $this->getTimestamp()], 400);
         }
+        $calendarURI = strtolower(str_replace(' ', '_', $calendarName));
 
         $calendarDescription = $request->get('description', '');
         if (1 !== preg_match('/^[a-zA-Z0-9 _-]{0,256}$/', $calendarDescription)) {
             return $this->json(['status' => 'error', 'message' => 'Invalid Calendar Description', 'timestamp' => $this->getTimestamp()], 400);
         }
 
         $entityManager = $doctrine->getManager();
-        $calendarInstance->setDisplayName($calendarName);
-        $calendarInstance->setDescription($calendarDescription);
+        $calendarInstance = new CalendarInstance();
+        $calendar = new Calendar();
+        $calendarInstance->setCalendar($calendar);
 
-        $calendarComponents = explode(',', $calendarInstance->getCalendar()->getComponents());
+        $calendarComponents = [];
         if ('true' === $request->get('events_support', 'true')) {
             $calendarComponents[] = Calendar::COMPONENT_EVENTS;
         }
@@ -283,44 +279,61 @@ public function editUserCalendar(Request $request, string $username, int $calend
         }
         $calendarInstance->getCalendar()->setComponents(implode(',', $calendarComponents));
 
+        $calendarInstance
+            ->setCalendar($calendar)
+            ->setAccess(CalendarInstance::ACCESS_SHAREDOWNER)
+            ->setDescription($calendarDescription)
+            ->setDisplayName($calendarName)
+            ->setUri($calendarURI)
+            ->setPrincipalUri(Principal::PREFIX.$username);
+
         $entityManager->persist($calendarInstance);
         $entityManager->flush();
 
-        return $this->json(['status' => 'success', 'timestamp' => $this->getTimestamp()], 200);
+        $response = [
+            'status' => 'success',
+            'timestamp' => $this->getTimestamp(),
+        ];
+
+        return $this->json($response, 200);
     }
 
-    /**
-     * Creates a new calendar for a specific user.
-     *
-     * @param Request $request  The HTTP POST request
-     * @param string  $username The username of the user for whom the calendar is to be created
-     *
-     * @return JsonResponse A JSON response indicating the success or failure of the operation
-     */
-    #[Route('/calendars/{username}/create', name: 'calendar_create', methods: ['POST'], requirements: ['username' => '[a-zA-Z0-9_-]+'])]
-    public function createNewUserCalendar(Request $request, string $username, ManagerRegistry $doctrine): JsonResponse
+    #[Route('/calendars/{username}/{calendar_id}/edit', name: 'calendar_edit', methods: ['POST'], requirements: ['calendar_id' => "\d+", 'username' => '[a-zA-Z0-9_-]+'])]
+    public function editUserCalendar(Request $request, string $username, int $calendar_id, ManagerRegistry $doctrine): JsonResponse
     {
         if (!$doctrine->getRepository(Principal::class)->findOneByUri(Principal::PREFIX.$username)) {
             return $this->json(['status' => 'error', 'message' => 'User Not Found', 'timestamp' => $this->getTimestamp()], 404);
         }
 
+        $ownerInstance = $doctrine->getRepository(CalendarInstance::class)->findOneBy([
+            'id' => $calendar_id,
+            'principalUri' => Principal::PREFIX.$username,
+        ]);
+
+        if (!$ownerInstance) {
+            return $this->json(['status' => 'error', 'message' => 'Invalid Calendar ID', 'timestamp' => $this->getTimestamp()], 400);
+        }
+
+        $calendarInstance = $doctrine->getRepository(CalendarInstance::class)->findOneById($calendar_id);
+        if (!$calendarInstance) {
+            return $this->json(['status' => 'error', 'message' => 'Calendar Instance Not Found', 'timestamp' => $this->getTimestamp()], 404);
+        }
+
         $calendarName = $request->get('name');
         if (1 !== preg_match('/^[a-zA-Z0-9 _-]{0,64}$/', $calendarName)) {
             return $this->json(['status' => 'error', 'message' => 'Invalid Calendar Name', 'timestamp' => $this->getTimestamp()], 400);
         }
-        $calendarURI = strtolower(str_replace(' ', '_', $calendarName));
 
         $calendarDescription = $request->get('description', '');
         if (1 !== preg_match('/^[a-zA-Z0-9 _-]{0,256}$/', $calendarDescription)) {
             return $this->json(['status' => 'error', 'message' => 'Invalid Calendar Description', 'timestamp' => $this->getTimestamp()], 400);
         }
 
         $entityManager = $doctrine->getManager();
-        $calendarInstance = new CalendarInstance();
-        $calendar = new Calendar();
-        $calendarInstance->setCalendar($calendar);
+        $calendarInstance->setDisplayName($calendarName);
+        $calendarInstance->setDescription($calendarDescription);
 
-        $calendarComponents = [];
+        $calendarComponents = explode(',', $calendarInstance->getCalendar()->getComponents());
         if ('true' === $request->get('events_support', 'true')) {
             $calendarComponents[] = Calendar::COMPONENT_EVENTS;
         }
@@ -332,23 +345,10 @@ public function createNewUserCalendar(Request $request, string $username, Manage
         }
         $calendarInstance->getCalendar()->setComponents(implode(',', $calendarComponents));
 
-        $calendarInstance
-            ->setCalendar($calendar)
-            ->setAccess(CalendarInstance::ACCESS_SHAREDOWNER)
-            ->setDescription($calendarDescription)
-            ->setDisplayName($calendarName)
-            ->setUri($calendarURI)
-            ->setPrincipalUri(Principal::PREFIX.$username);
-
         $entityManager->persist($calendarInstance);
         $entityManager->flush();
 
-        $response = [
-            'status' => 'success',
-            'timestamp' => $this->getTimestamp(),
-        ];
-
-        return $this->json($response, 200);
+        return $this->json(['status' => 'success', 'timestamp' => $this->getTimestamp()], 200);
     }
 
     /**
@@ -373,7 +373,7 @@ public function getUserCalendarsShares(Request $request, string $username, int $
         ]);
 
         if (!$ownerInstance) {
-            return $this->json(['status' => 'error', 'message' => 'Invalid Calendar ID', 'timestamp' => $this->getTimestamp()], 400);
+            return $this->json(['status' => 'error', 'message' => 'Invalid Calendar ID/Username', 'timestamp' => $this->getTimestamp()], 400);
         }
 
         $instances = $doctrine->getRepository(CalendarInstance::class)->findSharedInstancesOfInstance($calendar_id, true);
@@ -422,7 +422,7 @@ public function setUserCalendarsShare(Request $request, string $username, int $c
         ]);
 
         if (!$ownerInstance) {
-            return $this->json(['status' => 'error', 'message' => 'Invalid Calendar ID', 'timestamp' => $this->getTimestamp()], 400);
+            return $this->json(['status' => 'error', 'message' => 'Invalid Calendar ID and User ID', 'timestamp' => $this->getTimestamp()], 400);
         }
 
         $userId = $request->get('user_id');