fix: update getSponsor return allowing nulls

romanetar · romanetar · commit a8e3824ee7a7 · 2026-04-16T16:45:06.000+02:00
Signed-off-by: romanetar &lt;roman_ag@hotmail.com&gt;
diff --git a/app/Events/SponsorServices/SummitSponsorshipAddOnCreatedEventDTO.php b/app/Events/SponsorServices/SummitSponsorshipAddOnCreatedEventDTO.php
@@ -58,6 +58,7 @@ public static function fromSponsorshipAddOn(SummitSponsorshipAddOn $add_on): sel
         $sponsorship = $add_on->getSponsorship();
         $summit_sponsorship_type = $sponsorship->getType();
         $sponsorship_type = $summit_sponsorship_type->getType();
+        $sponsor = $sponsorship->getSponsor();
 
         return new self(
             $add_on->getId(),
@@ -67,8 +68,8 @@ public static function fromSponsorshipAddOn(SummitSponsorshipAddOn $add_on): sel
             $sponsorship_type->getName(),
             $add_on->getType(),
             $add_on->getName(),
-            $add_on->getSponsorship()->getSponsor()->getId(),
-            $add_on->getSponsorship()->getSponsor()->getSummitId(),
+            $sponsor?->getId() ?? 0,
+            $sponsor?->getSummitId() ?? 0,
         );
     }
 
diff --git a/app/Events/SponsorServices/SummitSponsorshipCreatedEventDTO.php b/app/Events/SponsorServices/SummitSponsorshipCreatedEventDTO.php
@@ -50,11 +50,11 @@ public static function fromSponsorship(SummitSponsorship $sponsorship): self
 
         return new self(
             $sponsorship->getId(),
-            $sponsor->getId(),
+            $sponsor?->getId() ?? 0,
             $summit_sponsorship_type->getId(),
             $sponsorship_type->getId(),
             $sponsorship_type->getName(),
-            $sponsor->getSummitId()
+            $sponsor?->getSummitId() ?? 0
         );
     }
 
diff --git a/app/Jobs/Emails/Registration/PromoCodes/SponsorPromoCodeEmail.php b/app/Jobs/Emails/Registration/PromoCodes/SponsorPromoCodeEmail.php
@@ -54,10 +54,10 @@ public function __construct
         $summit = $promo_code->getSummit();
         $payload = [];
         $sponsor = $promo_code->getSponsor();
-        $payload[IMailTemplatesConstants::sponsor_tier_name] = implode(',', $sponsor->getSponsorshipTierNames());
+        $payload[IMailTemplatesConstants::sponsor_tier_name] = $sponsor ? implode(',', $sponsor->getSponsorshipTierNames()) : '';
         $payload[IMailTemplatesConstants::promo_code] = $promo_code->getCode();
         $payload[IMailTemplatesConstants::company_name] = '';
-        $company = $sponsor->getCompany();
+        $company = $sponsor?->getCompany();
         if (!is_null($company))
             $payload[IMailTemplatesConstants::company_name] = $company->getName();
 
@@ -97,4 +97,4 @@ public static function getEmailTemplateSchema(): array{
         $payload[IMailTemplatesConstants::sponsor_tier_name]['type'] = 'string';
         return $payload;
     }
-}
+}
diff --git a/app/ModelSerializers/Summit/Registration/PromoCodes/SponsorSummitRegistrationDiscountCodeSerializer.php b/app/ModelSerializers/Summit/Registration/PromoCodes/SponsorSummitRegistrationDiscountCodeSerializer.php
@@ -62,7 +62,9 @@ public function serialize($expand = null, array $fields = [], array $relations =
                     }
                         break;
                     case 'sponsor_name':{
-                        $values['sponsor_name'] = $code->getSponsor()->getCompany()->getName();
+                        if($code->hasSponsor()) {
+                            $values['sponsor_name'] = $code->getSponsor()->getCompany()->getName();
+                        }
                     }
                         break;
                 }
@@ -71,4 +73,4 @@ public function serialize($expand = null, array $fields = [], array $relations =
 
         return $values;
     }
-}
+}
diff --git a/app/ModelSerializers/Summit/Registration/PromoCodes/SponsorSummitRegistrationPromoCodeSerializer.php b/app/ModelSerializers/Summit/Registration/PromoCodes/SponsorSummitRegistrationPromoCodeSerializer.php
@@ -63,7 +63,9 @@ public function serialize($expand = null, array $fields = [], array $relations =
                     }
                         break;
                     case 'sponsor_name':{
-                        $values['sponsor_name'] = $code->getSponsor()->getCompany()->getName();
+                        if($code->hasSponsor()) {
+                            $values['sponsor_name'] = $code->getSponsor()->getCompany()->getName();
+                        }
                     }
                     break;
                 }
@@ -72,4 +74,4 @@ public function serialize($expand = null, array $fields = [], array $relations =
 
         return $values;
     }
-}
+}
diff --git a/app/ModelSerializers/Summit/Registration/SponsorBadgeScanCSVSerializer.php b/app/ModelSerializers/Summit/Registration/SponsorBadgeScanCSVSerializer.php
@@ -65,6 +65,10 @@ public function serialize($expand = null, array $fields = array(), array $relati
         if (!$scan instanceof SponsorBadgeScan) return [];
         $values = parent::serialize($expand, $fields, $relations, $params);
         $sponsor = $scan->getSponsor();
+
+        //There are no sponsor questions to process without a sponsor
+        if (is_null($sponsor)) return $values;
+
         $sponsor_questions = $sponsor->getExtraQuestions();
         $setting = $sponsor->getSummit()->getLeadReportSettingFor($sponsor);
         $setting_columns = $setting->getColumns();
@@ -144,4 +148,4 @@ public function serialize($expand = null, array $fields = array(), array $relati
 
         return $values;
     }
-}
+}
diff --git a/app/ModelSerializers/Summit/Registration/SponsorUserInfoGrantCSVSerializer.php b/app/ModelSerializers/Summit/Registration/SponsorUserInfoGrantCSVSerializer.php
@@ -51,11 +51,14 @@ public function serialize($expand = null, array $fields = [], array $relations =
         $values['notes'] = 'VIRTUAL';
 
         $sponsor = $grant->getSponsor();
+
+        //There are no sponsor questions to process without a sponsor
+        if (is_null($sponsor)) return $values;
+
         $sponsor_questions = $sponsor->getExtraQuestions();
         $setting = $sponsor->getSummit()->getLeadReportSettingFor($sponsor);
         $setting_columns = $setting->getColumns();
 
-
         // remove not allowed string columns and sort them by setting columns order
         $new_values = [];
         foreach(array_values($setting_columns) as $column) {
@@ -130,4 +133,4 @@ public function serialize($expand = null, array $fields = [], array $relations =
 
         return $values;
     }
-}
+}
diff --git a/app/Models/Foundation/Summit/ExtraQuestions/SummitSponsorExtraQuestionType.php b/app/Models/Foundation/Summit/ExtraQuestions/SummitSponsorExtraQuestionType.php
@@ -35,7 +35,7 @@ class SummitSponsorExtraQuestionType extends ExtraQuestionType
     ];
 
     /**
-     * @var Sponsor
+     * @var Sponsor|null
      */
     #[ORM\JoinColumn(name: 'SponsorID', referencedColumnName: 'ID', onDelete: 'CASCADE')]
     #[ORM\ManyToOne(targetEntity: \models\summit\Sponsor::class, inversedBy: 'extra_questions')]
@@ -61,4 +61,4 @@ public function clearSponsor(): void
     {
         $this->sponsor = null;
     }
-}
+}
diff --git a/app/Models/Foundation/Summit/Registration/PromoCodes/Traits/SponsorPromoCodeTrait.php b/app/Models/Foundation/Summit/Registration/PromoCodes/Traits/SponsorPromoCodeTrait.php
@@ -71,9 +71,9 @@ public function setContactEmail(string $contact_email): void
     }
 
     /**
-     * @return Sponsor
+     * @return Sponsor|null
      */
-    public function getSponsor():Sponsor
+    public function getSponsor(): ?Sponsor
     {
         return $this->sponsor;
     }
@@ -95,4 +95,4 @@ public function setSponsor(Sponsor $sponsor)
     public function checkSubject(string $email, ?string $company):bool{
         return true;
     }
-}
+}
diff --git a/app/Models/Foundation/Summit/Registration/SponsorUserInfoGrant.php b/app/Models/Foundation/Summit/Registration/SponsorUserInfoGrant.php
@@ -29,7 +29,7 @@ class SponsorUserInfoGrant extends SilverstripeBaseModel
 
     const ClassName = 'SponsorUserInfoGrant';
     /**
-     * @var Sponsor
+     * @var Sponsor|null
      */
     #[ORM\JoinColumn(name: 'SponsorID', referencedColumnName: 'ID')]
     #[ORM\ManyToOne(targetEntity: \models\summit\Sponsor::class, inversedBy: 'user_info_grants')]
@@ -53,9 +53,9 @@ class SponsorUserInfoGrant extends SilverstripeBaseModel
     ];
 
     /**
-     * @return Sponsor
+     * @return Sponsor|null
      */
-    public function getSponsor(): Sponsor
+    public function getSponsor(): ?Sponsor
     {
         return $this->sponsor;
     }
@@ -95,4 +95,4 @@ public function getAttendeeLastName():?string{
     public function getAttendeeEmail():?string{
         return $this->allowed_user->getEmail();
     }
-}
+}
diff --git a/app/Models/Foundation/Summit/SponsorMaterial.php b/app/Models/Foundation/Summit/SponsorMaterial.php
@@ -53,7 +53,7 @@ class SponsorMaterial extends SilverstripeBaseModel
     private $order;
 
     /**
-     * @var Sponsor
+     * @var Sponsor|null
      */
     #[ORM\JoinColumn(name: 'SponsorID', referencedColumnName: 'ID', onDelete: 'CASCADE')]
     #[ORM\ManyToOne(targetEntity: \Sponsor::class, inversedBy: 'materials', fetch: 'EXTRA_LAZY')]
@@ -144,9 +144,9 @@ public function setLink(string $link): void
     }
 
     /**
-     * @return Sponsor
+     * @return Sponsor|null
      */
-    public function getSponsor(): Sponsor
+    public function getSponsor(): ?Sponsor
     {
         return $this->sponsor;
     }
@@ -162,4 +162,4 @@ public function setSponsor(Sponsor $sponsor): void
     public function clearSponsor():void{
         $this->sponsor = null;
     }
-}
+}
diff --git a/app/Models/Foundation/Summit/SponsorStatistics.php b/app/Models/Foundation/Summit/SponsorStatistics.php
@@ -27,7 +27,7 @@ class SponsorStatistics extends SilverstripeBaseModel
     use One2ManyPropertyTrait;
 
     /**
-     * @var Sponsor
+     * @var Sponsor|null
      */
     #[ORM\JoinColumn(name: 'SponsorID', referencedColumnName: 'ID', onDelete: 'CASCADE')]
     #[ORM\OneToOne(targetEntity: Sponsor::class, inversedBy: 'sponsorservices_statistics', fetch: 'EXTRA_LAZY')]
@@ -66,7 +66,7 @@ public function __construct()
         $this->documentsQty = 0;
     }
 
-    public function getSponsor(): Sponsor
+    public function getSponsor(): ?Sponsor
     {
         return $this->sponsor;
     }
diff --git a/app/Models/Foundation/Summit/SummitLeadReportSetting.php b/app/Models/Foundation/Summit/SummitLeadReportSetting.php
@@ -29,7 +29,7 @@ class SummitLeadReportSetting extends SilverstripeBaseModel
     const SponsorExtraQuestionsKey = 'extra_questions';
 
     /**
-     * @var Sponsor
+     * @var Sponsor|null
      */
     #[ORM\JoinColumn(name: 'SponsorID', referencedColumnName: 'ID', onDelete: 'SET NULL')]
     #[ORM\OneToOne(targetEntity: \models\summit\Sponsor::class, inversedBy: 'lead_report_setting')]
@@ -51,9 +51,9 @@ public function __construct()
     }
 
     /**
-     * @return Sponsor
+     * @return Sponsor|null
      */
-    public function getSponsor(): Sponsor
+    public function getSponsor(): ?Sponsor
     {
         return $this->sponsor;
     }
@@ -134,4 +134,4 @@ public function validateFor(Summit $summit, ?Sponsor $sponsor = null): void
             }
         }
     }
-}
+}
diff --git a/app/Models/Foundation/Summit/SummitSponsorship.php b/app/Models/Foundation/Summit/SummitSponsorship.php
@@ -39,7 +39,7 @@ class SummitSponsorship extends SilverstripeBaseModel
     ];
 
     /**
-     * @var Sponsor
+     * @var Sponsor|null
      */
     #[ORM\JoinColumn(name: 'SponsorID', referencedColumnName: 'ID')]
     #[ORM\ManyToOne(targetEntity: Sponsor::class)]
@@ -64,7 +64,7 @@ public function __construct()
         $this->add_ons = new ArrayCollection();
     }
 
-    public function getSponsor(): Sponsor
+    public function getSponsor(): ?Sponsor
     {
         return $this->sponsor;
     }
@@ -133,4 +133,4 @@ public function setType(SummitSponsorshipType $type): void
     {
         $this->type = $type;
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,9 @@ public function serialize($expand = null, array $fields = [], array $relations =`
`62`	`62`	`}`
`63`	`63`	`break;`
`64`	`64`	`case 'sponsor_name':{`
`65`		`- $values['sponsor_name'] = $code->getSponsor()->getCompany()->getName();`
	`65`	`+ if($code->hasSponsor()) {`
	`66`	`+ $values['sponsor_name'] = $code->getSponsor()->getCompany()->getName();`
	`67`	`+ }`
`66`	`68`	`}`
`67`	`69`	`break;`
`68`	`70`	`}`
`@@ -71,4 +73,4 @@ public function serialize($expand = null, array $fields = [], array $relations =`
`71`	`73`
`72`	`74`	`return $values;`
`73`	`75`	`}`
`74`		`-}`
	`76`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,9 @@ public function serialize($expand = null, array $fields = [], array $relations =`
`63`	`63`	`}`
`64`	`64`	`break;`
`65`	`65`	`case 'sponsor_name':{`
`66`		`- $values['sponsor_name'] = $code->getSponsor()->getCompany()->getName();`
	`66`	`+ if($code->hasSponsor()) {`
	`67`	`+ $values['sponsor_name'] = $code->getSponsor()->getCompany()->getName();`
	`68`	`+ }`
`67`	`69`	`}`
`68`	`70`	`break;`
`69`	`71`	`}`
`@@ -72,4 +74,4 @@ public function serialize($expand = null, array $fields = [], array $relations =`
`72`	`74`
`73`	`75`	`return $values;`
`74`	`76`	`}`
`75`		`-}`
	`77`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class SummitSponsorExtraQuestionType extends ExtraQuestionType`
`35`	`35`	`];`
`36`	`36`
`37`	`37`	`/**`
`38`		`- * @var Sponsor`
	`38`	`+ * @var Sponsor\|null`
`39`	`39`	`*/`
`40`	`40`	`#[ORM\JoinColumn(name: 'SponsorID', referencedColumnName: 'ID', onDelete: 'CASCADE')]`
`41`	`41`	`#[ORM\ManyToOne(targetEntity: \models\summit\Sponsor::class, inversedBy: 'extra_questions')]`
`@@ -61,4 +61,4 @@ public function clearSponsor(): void`
`61`	`61`	`{`
`62`	`62`	`$this->sponsor = null;`
`63`	`63`	`}`
`64`		`-}`
	`64`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -71,9 +71,9 @@ public function setContactEmail(string $contact_email): void`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`/**`
`74`		`- * @return Sponsor`
	`74`	`+ * @return Sponsor\|null`
`75`	`75`	`*/`
`76`		`- public function getSponsor():Sponsor`
	`76`	`+ public function getSponsor(): ?Sponsor`
`77`	`77`	`{`
`78`	`78`	`return $this->sponsor;`
`79`	`79`	`}`
`@@ -95,4 +95,4 @@ public function setSponsor(Sponsor $sponsor)`
`95`	`95`	`public function checkSubject(string $email, ?string $company):bool{`
`96`	`96`	`return true;`
`97`	`97`	`}`
`98`		`-}`
	`98`	`+}`