Summit Events

Fixed occupancy updates

Change-Id: I125a3097acc56523e6ec5d0ccc878a012e504a4c

Author: smarcet

app/Http/Controllers/Apis/Protected/Summit/Factories/SummitEventValidationRulesFactory.php

@@ -1,4 +1,6 @@
 <?php namespace App\Http\Controllers;
+use models\summit\SummitEvent;
+
 /**
  * Copyright 2021 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -60,7 +62,7 @@ public static function build(array $data, bool $update = false): array
                 'links' => 'sometimes|url_array',
                 // group event
                 'groups' => 'sometimes|int_array',
-                'occupancy' => 'sometimes|in:EMPTY,25%,50%,75%,FULL',
+                'occupancy' => 'sometimes|in:'.join(',', SummitEvent::ValidOccupanciesValues),
                 'selection_plan_id' => 'sometimes|integer',
                 'disclaimer_accepted' => 'sometimes|boolean',
                 'created_by_id' => 'sometimes|integer',

app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitEventsApiController.php

@@ -651,6 +651,7 @@ public function addEvent($summit_id)
         });
     }
 
+
     /**
      * @param $summit_id
      * @param $event_id
@@ -666,10 +667,6 @@ public function updateEvent($summit_id, $event_id)
             if (is_null($summit))
                 return $this->error404();
 
-            if (!Request::isJson())
-                return $this->error400();
-            $data = Request::json();
-
             $current_member = $this->resource_server_context->getCurrentUser();
             if (is_null($current_member))
                 return $this->error403();
@@ -678,10 +675,11 @@ public function updateEvent($summit_id, $event_id)
             if (is_null($event))
                 return $this->error404();
 
-            $isAdmin = $current_member->isAdmin() || $current_member->isSummitAdmin();
+            $isAdmin = $current_member->isSummitAllowed($summit);
             $isTrackChair = $summit->isTrackChairAdmin($current_member) || $summit->isTrackChair($current_member, $event->getCategory());
 
-            $payload = $data->all();
+            $payload = $this->getJsonData();
+
             // Creates a Validator instance and validates the data.
             $rules = $isAdmin ? SummitEventValidationRulesFactory::build($payload, true) : null;
             if(is_null($rules)){
@@ -691,16 +689,8 @@ public function updateEvent($summit_id, $event_id)
             if(is_null($rules))
                 return $this->error403();
 
-            $validation = Validator::make($payload, $rules);
-
-            if ($validation->fails()) {
-                $messages = $validation->messages()->toArray();
 
-                return $this->error412
-                (
-                    $messages
-                );
-            }
+            $payload = $this->getJsonPayload($rules, true);
 
             $fields = [
                 'title',

app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitLocationsApiController.php

@@ -381,11 +381,12 @@ public function getLocation($summit_id, $location_id)
     private function _getLocationEvents($summit_id, $location_id, $published = true)
     {
         $summit = SummitFinderStrategyFactory::build($this->repository, $this->resource_server_context)->find($summit_id);
-        if (is_null($summit))
-            if (is_null($summit)) return $this->error404();
+        if (is_null($summit)) return $this->error404();
 
         $location = null;
 
+        $current_user = $this->resource_server_context->getCurrentUser();
+
         if (strtolower($location_id) !== "tbd" && intval($location_id) !== 0) {
             $location = $summit->getLocation(intval($location_id));
             if (is_null($location)) return $this->error404();
@@ -437,7 +438,10 @@ function ($filter) use($summit_id, $location, $published){
 
                 return $filter;
             },
-            function () {
+            function () use($summit, $current_user) {
+                if(!is_null($current_user) && $current_user->isSummitAllowed($summit))
+                    return SerializerRegistry::SerializerType_Admin;
+
                 return SerializerRegistry::SerializerType_Public;
             },
             null,

app/ModelSerializers/Summit/AdminSummitEventSerializer.php

@@ -18,6 +18,14 @@
  */
 class AdminSummitEventSerializer extends SummitEventSerializer
 {
+    protected static $array_mappings = [
+        'Occupancy' => 'occupancy:json_string',
+    ];
+
+    protected static $allowed_fields = [
+        'occupancy',
+    ];
+
     /**
      * @param string|null $relation
      * @return string

app/ModelSerializers/Summit/SummitEventSerializer.php

@@ -12,9 +12,7 @@
  * limitations under the License.
  **/
 
-use App\Facades\ResourceServerContext;
 use Libs\ModelSerializers\AbstractSerializer;
-use models\main\Member;
 use models\summit\SummitEvent;
 
 /**

app/Models/Foundation/Summit/Events/SummitEvent.php

@@ -999,16 +999,31 @@ public function setRSVPMaxUserWaitListNumber($rsvp_max_user_wait_list_number)
     /**
      * @return string
      */
-    public function getOccupancy()
+    public function getOccupancy():?string
     {
         return $this->occupancy;
     }
 
+    const OccupancyEmpty = 'EMPTY';
+    const Occupancy25_Percent = '25%';
+    const Occupancy50_Percent = '50%';
+    const Occupancy75_Percent = '75%';
+    const OccupancyFull = 'FULL';
+
+    const ValidOccupanciesValues = [
+        self::OccupancyEmpty,
+        self::Occupancy25_Percent,
+        self::Occupancy50_Percent,
+        self::Occupancy75_Percent,
+        self::OccupancyFull
+    ];
     /**
      * @param string $occupancy
      */
-    public function setOccupancy($occupancy)
+    public function setOccupancy(string $occupancy)
     {
+        if(!in_array($occupancy, self::ValidOccupanciesValues))
+            throw new ValidationException(sprintf("occupancy %s is not valid", $occupancy));
         $this->occupancy = $occupancy;
     }
 

app/Services/Model/Imp/AbstractPublishService.php

@@ -145,6 +145,7 @@ protected function updateEventDates
         );
 
         if (isset($data['start_date']) && isset($data['end_date'])) {
+
             // we are setting dates
 
             if (!$publishable_event->hasType()) {
@@ -190,10 +191,6 @@ protected function updateEventDates
             $publishable_event->setStartDate($start_datetime);
             $publishable_event->setEndDate($end_datetime);
         }
-        else{
-            // clear dates
-            $publishable_event->clearPublishingDates();
-        }
 
         return $this->updateDuration($data, $summit, $publishable_event);
     }

app/Services/Model/Imp/SummitService.php

@@ -675,6 +675,7 @@ private function saveOrUpdateEvent(Summit $summit, array $data, $event_id = null
             }
 
             $event = null;
+
             // existing event
 
             if (!is_null($event_id) && intval($event_id) > 0) {
@@ -713,6 +714,7 @@ private function saveOrUpdateEvent(Summit $summit, array $data, $event_id = null
                 $event->setSummit($summit);
                 if (!is_null($event_type))
                     $event->setType($event_type);
+
                 SummitEventFactory::populate($event, $data);
             }