Supporting 'Guest Speaker' - #176

bfren · Sep 20, 2024 · d78b907 · d78b907
1 parent 00893f0
commit d78b907
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/src/classes/lectionary/lectionary.class.php b/src/classes/lectionary/lectionary.class.php
@@ -95,7 +95,8 @@ public function __construct()
                     title: Arr::get($service, "Title"),
                     main_reading: Arr::get($service, "Main Reading"),
                     additional_reading: Arr::get($service, "Additional Reading"),
-                    psalms: Arr::map(explode(";", Arr::get($service, "Psalms", "")), "trim")
+                    psalms: Arr::map(explode(";", Arr::get($service, "Psalms", "")), "trim"),
+                    guest_speaker: Arr::get($service, "Guest Speaker")
                 );
             }
 

diff --git a/src/classes/lectionary/service.class.php b/src/classes/lectionary/service.class.php
@@ -21,6 +21,7 @@ class Service
      * @param string|null $main_reading         Optional main reading.
      * @param string|null $additional_reading   Optional additional reading.
      * @param string[] $psalms                  Optional psalms.
+     * @param string|null $guest_speaker        Optional guest speaker.
      * @return void
      */
     public function __construct(
@@ -32,6 +33,7 @@ public function __construct(
         public readonly ?string $title,
         public readonly ?string $main_reading,
         public readonly ?string $additional_reading,
-        public readonly array $psalms
+        public readonly array $psalms,
+        public readonly ?string $guest_speaker
     ) {}
 }
diff --git a/src/classes/rota/builder.class.php b/src/classes/rota/builder.class.php
@@ -85,6 +85,7 @@ public static function build_combined_rota(Lectionary $lectionary, array $servic
                     main_reading: $lectionary_service->main_reading,
                     additional_reading: $lectionary_service->additional_reading,
                     psalms: $lectionary_service->psalms ?: [],
+                    guest_speaker: $lectionary_service->guest_speaker,
                     ministries: $rota_service->ministries
                 );
             }
@@ -220,7 +221,11 @@ public static function get_description(
         if ($include_people && $service->ministries) {
             $description[] = "= Ministries =";
             foreach ($service->ministries as $name => $service_ministry) {
-                $description[] = sprintf("%s: %s", $name, join(", ", $service_ministry->people));
+                $people = Arr::map($service_ministry->people, function ($person) use ($service) {
+                    return $person == "Guest Speaker" ? $service->guest_speaker : $person;
+                });
+
+                $description[] = sprintf("%s: %s", $name, join(", ", $people));
             }
             $description[] = "";
         }

diff --git a/src/classes/rota/combined-service.class.php b/src/classes/rota/combined-service.class.php
@@ -22,6 +22,7 @@ class Combined_Service
      * @param string|null $main_reading         Optional main reading.
      * @param string|null $additional_reading   Optional additional reading.
      * @param string[] $psalms                  Optional psalms.
+     * @param string|null $guest_speaker        Optional guest speaker.
      * @param Service_Ministry[] $ministries    Ministries from the rota.
      * @return void
      */
@@ -36,6 +37,7 @@ public function __construct(
         public readonly ?string $main_reading,
         public readonly ?string $additional_reading,
         public readonly array $psalms,
+        public readonly ?string $guest_speaker,
         public readonly array $ministries
     ) {}
 }