Merge pull request #647 from TheRestartProject/RES-1885_vue_event_cre…

…ate_edit RES-1885 Rework event add/edit page to use API
TheRestartProject · Aug 2, 2023 · 324dbaf · 324dbaf
2 parents eef963f + 88a79e3
commit 324dbaf
Show file tree

Hide file tree

Showing 25 changed files with 537 additions and 523 deletions.
diff --git a/app/Helpers/Fixometer.php b/app/Helpers/Fixometer.php
@@ -188,7 +188,7 @@ public static function userHasDeletePartyPermission($partyId, $userId = null)
         return false;
     }
 
-    public static function userCanApproveEvent($eventId, $userId = null)
+    public static function userCanApproveEvent($eventId, $userId = null, $groupId = null)
     {
         if (is_null($userId)) {
             $userId = Auth::user()->id;
@@ -200,7 +200,12 @@ public static function userCanApproveEvent($eventId, $userId = null)
         }
 
         if (self::hasRole($user, 'NetworkCoordinator')) {
-            $group = Party::find($eventId)->theGroup;
+            if ($groupId) {
+                $group = Group::find($groupId);
+            } else {
+                $group = Party::find($eventId)->theGroup;
+            }
+
             foreach ($group->networks as $network) {
                 if ($network->coordinators->contains($user)) {
                     return true;
@@ -248,22 +253,22 @@ public static function userHasEditEventsDevicesPermission($partyId, $userId = nu
 
     public static function userCanCreateEvents($user)
     {
-        if (Auth::guest()) {
-            return false;
-        }
-
         if (is_null($user)) {
             $user = Auth::user();
         }
 
+        if (!$user) {
+            return false;
+        }
+
         $usersRole = $user->role()->first()->role;
         $superusers = ['Root', 'Administrator', 'NetworkCoordinator'];
 
         if (in_array($usersRole, $superusers)) {
             return true;
         }
 
-        $userIsHostOfAGroup = UserGroups::where('user', Auth::user()->id)
+        $userIsHostOfAGroup = UserGroups::where('user', $user->id)
             ->where('role', 3)
             ->count() > 0;
 

diff --git a/app/Http/Controllers/API/EventController.php b/app/Http/Controllers/API/EventController.php
@@ -279,10 +279,6 @@ public function getEventv2(Request $request, $idevents)
     {
         $party = Party::findOrFail($idevents);
 
-        if (!$party->theGroup->approved) {
-            abort(404);
-        }
-
         return \App\Http\Resources\Party::make($party);
     }
 
@@ -421,6 +417,10 @@ public function moderateEventsv2(Request $request)
      *                   property="online",
      *                   ref="#/components/schemas/Event/properties/online",
      *                ),
+     *                @OA\Property(
+     *                   property="link",
+     *                   ref="#/components/schemas/Event/properties/link",
+     *                ),
      *             )
      *         )
      *    ),
@@ -580,6 +580,10 @@ public function createEventv2(Request $request)
      *                   property="online",
      *                   ref="#/components/schemas/Event/properties/online",
      *                ),
+     *                @OA\Property(
+     *                   property="link",
+     *                   ref="#/components/schemas/Event/properties/link",
+     *                ),
      *             )
      *         )
      *    ),
@@ -648,8 +652,8 @@ private function validateEventParams(Request $request, $create): array
         if ($create) {
             $request->validate([
                 'groupid' => 'required|integer',
-                'start' => ['required', 'date_format:Y-m-d\TH:i:sP'],
-                'end' => ['required', 'date_format:Y-m-d\TH:i:sP'],
+                                   'start' => ['required', 'date_format:Y-m-d\TH:i:sP,Y-m-d\TH:i:s\Z'],
+                                   'end' => ['required', 'date_format:Y-m-d\TH:i:sP,Y-m-d\TH:i:s\Z'],
                 'title' => ['required', 'max:255'],
                 'description' => ['required'],
                 'location' => [
@@ -663,8 +667,8 @@ function ($attribute, $value, $fail) use ($request) {
             ]);
         } else {
             $request->validate([
-                'start' => ['required', 'date_format:Y-m-d\TH:i:sP'],
-                'end' => ['required', 'date_format:Y-m-d\TH:i:sP'],
+                                   'start' => ['required', 'date_format:Y-m-d\TH:i:sP,Y-m-d\TH:i:s\Z'],
+                                   'end' => ['required', 'date_format:Y-m-d\TH:i:sP,Y-m-d\TH:i:s\Z'],
                 'title' => ['required', 'max:255'],
                 'description' => ['required'],
                 'location' => [