Merge branch 'main' of https://github.com/OpenStackweb/summit-api into main

Author: romanetar

app/ModelSerializers/Summit/Speakers/PresentationSpeakerBaseSerializer.php

@@ -12,6 +12,7 @@
  * limitations under the License.
  **/
 
+use libs\utils\JsonUtils;
 use models\summit\PresentationSpeaker;
 
 /**
@@ -33,7 +34,6 @@ abstract class PresentationSpeakerBaseSerializer extends SilverStripeSerializer
         'FundedTravel' => 'funded_travel:json_boolean',
         'WillingToTravel' => 'willing_to_travel:json_boolean',
         'WillingToPresentVideo' => 'willing_to_present_video:json_boolean',
-        'Email' => 'email:json_null_email',
         'MemberID' => 'member_id:json_int',
         'RegistrationRequestId' => 'registration_request_id:json_int',
         'ProfilePhotoUrl' => 'pic:json_url',
@@ -71,6 +71,14 @@ public function serialize($expand = null, array $fields = [], array $relations =
             $values['last_name'] = $last_name;
         }
 
+
+        $currentUser = $this->resource_server_context->getCurrentUser();
+        // choose email serializer depending on user permissions
+        // is current user is null then is a service account
+        $values['email'] = is_null($currentUser) ?
+            JsonUtils::toNullEmail($speaker->getEmail()) :
+            JsonUtils::toObfuscatedEmail($speaker->getEmail());
+
         return $values;
     }
 }

app/Models/Foundation/Summit/Registration/SummitTicketType.php

@@ -12,6 +12,7 @@
  * limitations under the License.
  **/
 use App\Models\Foundation\Summit\AllowedCurrencies;
+use App\Models\Foundation\Summit\ScheduleEntity;
 use App\Models\Utils\Traits\FinancialTrait;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Log;
@@ -40,6 +41,8 @@ class SummitTicketType extends SilverstripeBaseModel
 
     use FinancialTrait;
 
+    use ScheduleEntity;
+
     const USD_Currency = 'USD';
     const EUR_Currency = 'EUR';
     const GBP_Currency = 'GBP';

app/Services/Model/Imp/ProcessScheduleEntityLifeCycleEventService.php

@@ -25,6 +25,7 @@
 use models\summit\ISummitRepository;
 use models\summit\Presentation;
 use models\summit\Summit;
+use models\summit\SummitTicketType;
 
 /**
  * Class ProcessScheduleEntityLifeCycleEventService
@@ -222,6 +223,24 @@ public function process(string $entity_operator, int $summit_id, int $entity_id,
                 return;
             }
 
+            if ($entity_type === 'SummitTicketType') {
+                $summit = $this->summit_repository->getById($summit_id);
+                if (!$summit instanceof Summit) return;
+
+                $ticket_type = $summit->getTicketTypeById($entity_id);
+                if (!$ticket_type instanceof SummitTicketType) return;
+
+                $this->rabbit_service->publish(
+                    [
+                        'summit_id' => $summit->getId(),
+                        'entity_id' => $summit->getId(),
+                        'entity_type' => 'Summit',
+                        'entity_operator' => 'UPDATE'
+                    ]);
+
+                return;
+            }
+
             Log::debug(sprintf("ProcessScheduleEntityLifeCycleEventService::process publishing summit %s entity id %",
                 $summit_id, $entity_id));