Proposed Allowed location Fixes

smarcet · smarcet · commit c842b095e288 · 2023-05-31T19:24:06.000-05:00
* added login info
* fixed validation issues

Signed-off-by: smarcet@gmail.com &lt;smarcet@gmail.com&gt;
Change-Id: I960134a985c998364a44c513b8dc1506828b487b
diff --git a/app/Models/Foundation/Summit/ProposedSchedule/SummitProposedScheduleAllowedLocation.php b/app/Models/Foundation/Summit/ProposedSchedule/SummitProposedScheduleAllowedLocation.php
@@ -138,11 +138,31 @@ public function clearLocation():void{
      */
     public function addAllowedTimeFrame(\DateTime $day, ?int $opening_hour = null, ?int $closing_hour = null):?SummitProposedScheduleAllowedDay{
 
+        Log::debug
+        (
+            sprintf
+            (
+                "SummitProposedScheduleAllowedLocation::addAllowedTimeFrame location %s day %s opening_hour %s closing_hour %s",
+                $this->location->getId(),
+                $day->format("Y-m-d H:i:s"),
+                $opening_hour,
+                $closing_hour
+            )
+        );
+
         $criteria = Criteria::create();
         $criteria->where(Criteria::expr()->eq('day', $day));
 
         if($this->allowed_timeframes->matching($criteria)->count() > 0 ){
-            throw new ValidationException(sprintf("Day %s already exists for location %s.", $day->format("Y-m-d"), $this->location->getId()));
+            throw new ValidationException
+            (
+                sprintf
+                (
+                    "Day %s already exists for location %s.",
+                    $day->format("Y-m-d"),
+                    $this->location->getId()
+                )
+            );
         }
 
         $time_frame = new SummitProposedScheduleAllowedDay($this, $day, $opening_hour, $closing_hour);
@@ -192,7 +212,7 @@ public function getAllowedTimeFrameForDates(\DateTime $from, \DateTime $to):?Sum
         $day = clone $from;
         $localDay = $summit->convertDateFromUTC2TimeZone($day);
         // clear time on local day
-        $localDay = $localDay->setTime(0,0,0);
+        $localDay = $localDay->setTime(0,0,0,0);
 
         Log::debug
         (
diff --git a/app/Models/Foundation/Summit/Summit.php b/app/Models/Foundation/Summit/Summit.php
@@ -4358,7 +4358,7 @@ public function dayIsOnSummitPeriod(\DateTime $day, $omit_time_check = true): bo
         $dt = $dt->setTimezone(new \DateTimeZone('UTC'));
 
         if ($omit_time_check)
-            $dt = $dt->setTime(0, 0, 0);
+            $dt = $dt->setTime(0, 0, 0,0);
 
         $dt = $dt->getTimestamp();
 
@@ -4376,6 +4376,7 @@ public function dayIsOnSummitPeriod(\DateTime $day, $omit_time_check = true): bo
 
         $ed = $ed->getTimestamp();
 
+        Log::debug(sprintf("Summit::dayIsOnSummitPeriod bd %s ed %s dt %s", $bd, $ed, $dt));
         return $bd <= $dt && $dt <= $ed;
     }
 
diff --git a/app/Services/Model/Imp/ScheduleService.php b/app/Services/Model/Imp/ScheduleService.php
@@ -212,7 +212,7 @@ protected function validateBlackOutTimesAndTimes(IPublishableEvent $publishable_
                     (
                         "ScheduleService::validateBlackOutTimesAndTimes location %s has custom restriction for date %s opening_hour %s closing_hour %s",
                         $location->getId(),
-                        $publishable_event->getStartDate()->format("Y-m-d"),
+                        $publishable_event->getStartDate()->format("Y-m-d H:i:s"),
                         $opening_hour,
                         $closing_hour
                     )
diff --git a/app/Services/Model/Imp/SummitProposedScheduleAllowedLocationService.php b/app/Services/Model/Imp/SummitProposedScheduleAllowedLocationService.php
@@ -16,6 +16,8 @@
 use App\Models\Foundation\Summit\ProposedSchedule\SummitProposedScheduleAllowedLocation;
 use App\Services\Model\AbstractService;
 use App\Services\Model\ISummitProposedScheduleAllowedLocationService;
+use App\Utils\Time;
+use Illuminate\Support\Facades\Log;
 use models\exceptions\EntityNotFoundException;
 use models\exceptions\ValidationException;
 use models\summit\PresentationCategory;
@@ -61,11 +63,11 @@ public function addProposedLocationToTrack(PresentationCategory $track, array $p
     public function deleteProposedLocationFromTrack(PresentationCategory $track, int $allowed_location_id): void
     {
         $this->tx_service->transaction(function() use($track, $allowed_location_id){
-            $location = $track->getAllowedLocationById($allowed_location_id);
-            if(is_null($location))
+            $allowed_location = $track->getAllowedLocationById($allowed_location_id);
+            if(is_null($allowed_location))
                 throw new EntityNotFoundException(sprintf("Allowed Location %s not found", $allowed_location_id));
 
-            $track->removeProposedScheduleAllowedLocation($location);
+            $track->removeProposedScheduleAllowedLocation($allowed_location);
         });
     }
 
@@ -80,35 +82,87 @@ public function addAllowedDayToProposedLocation(PresentationCategory $track, int
     {
         return $this->tx_service->transaction(function() use($track, $allowed_location_id, $payload){
 
-            $alloqed_location = $track->getAllowedLocationById($allowed_location_id);
-            if(is_null($alloqed_location))
+            $allowed_location = $track->getAllowedLocationById($allowed_location_id);
+            if(is_null($allowed_location))
                 throw new EntityNotFoundException(sprintf("Allowed Location %s not found.", $allowed_location_id));
 
-            if($alloqed_location->getLocation()->getClassName() === SummitVenue::ClassName){
+            if($allowed_location->getLocation()->getClassName() === SummitVenue::ClassName){
                 throw new ValidationException("Location is a Venue, you can not add a venue to a track.");
             }
 
             $summit = $track->getSummit();
             $day = intval($payload['day']);
+            Log::debug(sprintf("SummitProposedScheduleAllowedLocationService::addAllowedDayToProposedLocation day epoch %s", $day));
             $day = new \DateTime("@$day", new \DateTimeZone("UTC"));
+            Log::debug(sprintf("SummitProposedScheduleAllowedLocationService::addAllowedDayToProposedLocation day %s", $day->format("Y-m-d H:i:s")));
             $localDay = $summit->convertDateFromUTC2TimeZone($day);
+            Log::debug(sprintf("SummitProposedScheduleAllowedLocationService::addAllowedDayToProposedLocation localDay %s", $localDay->format("Y-m-d H:i:s")));
             // reset time on local day
-            $localDay->setTime(0,0,0);
+            $localDay = $localDay->setTime(0,0,0, 0);
             $day = $summit->convertDateFromTimeZone2UTC($localDay);
 
-            if(!$summit->dayIsOnSummitPeriod($day, false))
+            if(!$summit->dayIsOnSummitPeriod($day, true))
                 throw new ValidationException
                 (
                     sprintf
                     (
                         "Day %s is not on summit period( %s - %s).",
-                        $day->format("Y-m-d"),
-                        $summit->getLocalBeginDate()->format("Y-m-d"),
-                        $summit->getLocalEndDate()->format("Y-m-d"),
+                        $day->format("Y-m-d h:i:s"),
+                        $summit->getLocalBeginDate()->format("Y-m-d h:i:s"),
+                        $summit->getLocalEndDate()->format("Y-m-d h:i:s"),
                     )
                 );
 
-            return $alloqed_location->addAllowedTimeFrame($day, $payload['opening_hour'] ?? null, $payload['closing_hour'] ?? null);
+            // check opening / closing hours
+            $opening_hour = $payload['opening_hour'] ?? null;
+            $closing_hour = $payload['closing_hour'] ?? null;
+
+            if(!is_null($opening_hour)){
+                list($hour, $minute) =Time::getHourAndMinutesFromInt($opening_hour);
+                Log::debug(sprintf("SummitProposedScheduleAllowedLocationService::addAllowedDayToProposedLocation opening_hour %s %s", $hour, $minute));
+                $start_local_date = clone $localDay;
+                $start_local_date = $start_local_date->setTime($hour, $minute, 0, 0 );
+                Log::debug(sprintf("SummitProposedScheduleAllowedLocationService::addAllowedDayToProposedLocation start_local_date %s", $start_local_date->format("Y-m-d H:i:s")));
+
+                if(!$summit->dayIsOnSummitPeriod($summit->convertDateFromTimeZone2UTC($start_local_date), false))
+                    throw new ValidationException
+                    (
+                        sprintf
+                        (
+                            "Start Day %s is not on summit period( %s - %s).",
+                            $start_local_date->format("Y-m-d h:i:s"),
+                            $summit->getLocalBeginDate()->format("Y-m-d h:i:s"),
+                            $summit->getLocalEndDate()->format("Y-m-d h:i:s"),
+                        )
+                    );
+            }
+
+            if(!is_null($closing_hour)){
+                list($hour, $minute) =Time::getHourAndMinutesFromInt($closing_hour);
+                Log::debug(sprintf("SummitProposedScheduleAllowedLocationService::addAllowedDayToProposedLocation closing_hour %s %s", $hour, $minute));
+                $end_local_date = clone $localDay;
+                $end_local_date = $end_local_date->setTime($hour, $minute, 0, 0 );
+                Log::debug(sprintf("SummitProposedScheduleAllowedLocationService::addAllowedDayToProposedLocation end_local_date %s", $end_local_date->format("Y-m-d H:i:s")));
+
+                if(!$summit->dayIsOnSummitPeriod($summit->convertDateFromTimeZone2UTC($end_local_date), false))
+                    throw new ValidationException
+                    (
+                        sprintf
+                        (
+                            "End Day %s is not on summit period( %s - %s).",
+                            $end_local_date->format("Y-m-d h:i:s"),
+                            $summit->getLocalBeginDate()->format("Y-m-d h:i:s"),
+                            $summit->getLocalEndDate()->format("Y-m-d h:i:s"),
+                        )
+                    );
+            }
+
+            return $allowed_location->addAllowedTimeFrame
+            (
+                $day,
+                $opening_hour,
+                $closing_hour,
+            );
         });
     }
 
@@ -123,11 +177,11 @@ public function addAllowedDayToProposedLocation(PresentationCategory $track, int
     public function updateAllowedDayToProposedLocation(PresentationCategory $track, int $allowed_location_id, int $allowed_day_id, array $payload): ?SummitProposedScheduleAllowedDay
     {
         return $this->tx_service->transaction(function() use($track, $allowed_location_id, $allowed_day_id){
-            $alloqed_location = $track->getAllowedLocationById($allowed_location_id);
-            if(is_null($alloqed_location))
+            $allowed_location = $track->getAllowedLocationById($allowed_location_id);
+            if(is_null($allowed_location))
                 throw new EntityNotFoundException(sprintf("Allowed Location %s not found", $allowed_location_id));
 
-            $time_frame = $alloqed_location->getAllowedTimeFrameById($allowed_day_id);
+            $time_frame = $allowed_location->getAllowedTimeFrameById($allowed_day_id);
 
             if(is_null($time_frame))
                 throw new EntityNotFoundException(sprintf("Allowed Day %s not found", $allowed_day_id));
@@ -145,16 +199,16 @@ public function updateAllowedDayToProposedLocation(PresentationCategory $track,
     public function deleteAllowedDayToProposedLocation(PresentationCategory $track, int $allowed_location_id, int $allowed_day_id): void
     {
         $this->tx_service->transaction(function() use($track, $allowed_location_id, $allowed_day_id){
-            $alloqed_location = $track->getAllowedLocationById($allowed_location_id);
-            if(is_null($alloqed_location))
+            $allowed_location = $track->getAllowedLocationById($allowed_location_id);
+            if(is_null($allowed_location))
                 throw new EntityNotFoundException(sprintf("Allowed Location %s not found", $allowed_location_id));
 
-            $time_frame = $alloqed_location->getAllowedTimeFrameById($allowed_day_id);
+            $time_frame = $allowed_location->getAllowedTimeFrameById($allowed_day_id);
 
             if(is_null($time_frame))
                 throw new EntityNotFoundException(sprintf("Allowed Day %s not found", $allowed_day_id));
 
-            $alloqed_location->removeAllowedTimeFrame($time_frame);
+            $allowed_location->removeAllowedTimeFrame($time_frame);
 
         });
     }
@@ -168,11 +222,11 @@ public function deleteAllowedDayToProposedLocation(PresentationCategory $track,
     public function deleteAllAllowedDayToProposedLocation(PresentationCategory $track, int $allowed_location_id): void
     {
         $this->tx_service->transaction(function() use($track, $allowed_location_id){
-            $alloqed_location = $track->getAllowedLocationById($allowed_location_id);
-            if(is_null($alloqed_location))
+            $allowed_location = $track->getAllowedLocationById($allowed_location_id);
+            if(is_null($allowed_location))
                 throw new EntityNotFoundException(sprintf("Allowed Location %s not found", $allowed_location_id));
 
-            $alloqed_location->clearAllowedTimeFrames();
+            $allowed_location->clearAllowedTimeFrames();
 
         });
     }
diff --git a/app/Utils/Time.php b/app/Utils/Time.php
@@ -0,0 +1,33 @@
+<?php namespace App\Utils;
+/*
+ * Copyright 2023 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+
+/**
+ * Class Time
+ * @package App\Utils
+ */
+final class Time
+{
+    /**
+     * @param int $time
+     * @return array
+     */
+    public static function getHourAndMinutesFromInt(int $time):array
+    {
+        $time = sprintf("%04d", $time);
+        $hours = intval(substr($time,0,2));
+        $minutes = intval(substr($time,2,2));
+        return [$hours, $minutes];
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ protected function validateBlackOutTimesAndTimes(IPublishableEvent $publishable_`
`212`	`212`	`(`
`213`	`213`	`"ScheduleService::validateBlackOutTimesAndTimes location %s has custom restriction for date %s opening_hour %s closing_hour %s",`
`214`	`214`	`$location->getId(),`
`215`		`- $publishable_event->getStartDate()->format("Y-m-d"),`
	`215`	`+ $publishable_event->getStartDate()->format("Y-m-d H:i:s"),`
`216`	`216`	`$opening_hour,`
`217`	`217`	`$closing_hour`
`218`	`218`	`)`