Merge branch 'develop' into console-error-cleanup

Author: Iinguistics

backend/app/Services/Domain/Event/DuplicateEventService.php

@@ -5,6 +5,7 @@
 use HiEvents\DomainObjects\CapacityAssignmentDomainObject;
 use HiEvents\DomainObjects\CheckInListDomainObject;
 use HiEvents\DomainObjects\Enums\EventImageType;
+use HiEvents\DomainObjects\Enums\QuestionBelongsTo;
 use HiEvents\DomainObjects\EventDomainObject;
 use HiEvents\DomainObjects\EventSettingDomainObject;
 use HiEvents\DomainObjects\ImageDomainObject;
@@ -79,6 +80,10 @@ public function duplicateEvent(
                 cloneEventSettings: $duplicateSettings,
             );
 
+            if ($duplicateQuestions) {
+                $this->clonePerOrderQuestions($event, $newEvent->getId());
+            }
+
             if ($duplicateTickets) {
                 $this->cloneExistingTickets(
                     event: $event,
@@ -153,7 +158,7 @@ private function cloneExistingTickets(
         }
 
         if ($duplicateQuestions) {
-            $this->cloneQuestions($event, $newEventId, $oldTicketToNewTicketMap);
+            $this->clonePerTicketQuestions($event, $newEventId, $oldTicketToNewTicketMap);
         }
 
         if ($duplicatePromoCodes) {
@@ -174,23 +179,47 @@ private function cloneExistingTickets(
     /**
      * @throws Throwable
      */
-    private function cloneQuestions(EventDomainObject $event, int $newEventId, array $oldTicketToNewTicketMap): void
+    private function clonePerTicketQuestions(EventDomainObject $event, int $newEventId, array $oldTicketToNewTicketMap): void
     {
         foreach ($event->getQuestions() as $question) {
-            $this->createQuestionService->createQuestion(
-                (new QuestionDomainObject())
-                    ->setTitle($question->getTitle())
-                    ->setEventId($newEventId)
-                    ->setBelongsTo($question->getBelongsTo())
-                    ->setType($question->getType())
-                    ->setRequired($question->getRequired())
-                    ->setOptions($question->getOptions())
-                    ->setIsHidden($question->getIsHidden()),
-                array_map(
-                    static fn(TicketDomainObject $ticket) => $oldTicketToNewTicketMap[$ticket->getId()],
-                    $question->getTickets()?->all(),
-                ),
-            );
+            if ($question->getBelongsTo() === QuestionBelongsTo::TICKET->name) {
+                $this->createQuestionService->createQuestion(
+                    (new QuestionDomainObject())
+                        ->setTitle($question->getTitle())
+                        ->setEventId($newEventId)
+                        ->setBelongsTo($question->getBelongsTo())
+                        ->setType($question->getType())
+                        ->setRequired($question->getRequired())
+                        ->setOptions($question->getOptions())
+                        ->setIsHidden($question->getIsHidden()),
+                    array_map(
+                        static fn(TicketDomainObject $ticket) => $oldTicketToNewTicketMap[$ticket->getId()],
+                        $question->getTickets()?->all(),
+                    ),
+                );
+            }
+        }
+    }
+
+    /**
+     * @throws Throwable
+     */
+    private function clonePerOrderQuestions(EventDomainObject $event, int $newEventId): void
+    {
+        foreach ($event->getQuestions() as $question) {
+            if ($question->getBelongsTo() === QuestionBelongsTo::ORDER->name) {
+                $this->createQuestionService->createQuestion(
+                    (new QuestionDomainObject())
+                        ->setTitle($question->getTitle())
+                        ->setEventId($newEventId)
+                        ->setBelongsTo($question->getBelongsTo())
+                        ->setType($question->getType())
+                        ->setRequired($question->getRequired())
+                        ->setOptions($question->getOptions())
+                        ->setIsHidden($question->getIsHidden()),
+                    [],
+                );
+            }
         }
     }
 

docker/all-in-one/.env

@@ -1,12 +1,17 @@
-# See the README.md for informaiton on how to generate the JWT_SECRET and APP_KEY
+# See the README.md file for informaiton on how to generate the JWT_SECRET and APP_KEY
 APP_KEY=
 JWT_SECRET=
 
+# Frontend variables (Always prefixed with VITE_)
 VITE_FRONTEND_URL=http://localhost:8123
 VITE_API_URL_CLIENT=http://localhost:8123/api
 VITE_API_URL_SERVER=http://localhost:80/api
 VITE_STRIPE_PUBLISHABLE_KEY=pk_test
 
+# Backend variables
+# These values may not be suitable for production environments.
+# Please refer to the documentation for more information on how to configure these values
+# https://hi.events/docs/getting-started/deploying
 LOG_CHANNEL=stderr
 QUEUE_CONNECTION=sync
 MAIL_MAILER=log
@@ -15,5 +20,6 @@ FILESYSTEM_PUBLIC_DISK=public
 FILESYSTEM_PRIVATE_DISK=local
 
 APP_CDN_URL=http://localhost:8123/storage
+APP_FRONTEND_URL=http://localhost:8123
 
 DATABASE_URL=postgresql://postgres:secret@postgres:5432/hi-events

docker/all-in-one/docker-compose.yml

@@ -15,6 +15,7 @@ services:
       - QUEUE_CONNECTION=${QUEUE_CONNECTION}
       - MAIL_MAILER=${MAIL_MAILER}
       - APP_KEY=${APP_KEY}
+      - APP_FRONTEND_URL=${APP_FRONTEND_URL}
       - JWT_SECRET=${JWT_SECRET}
       - FILESYSTEM_PUBLIC_DISK=${FILESYSTEM_PUBLIC_DISK}
       - FILESYSTEM_PRIVATE_DISK=${FILESYSTEM_PRIVATE_DISK}