Skip to content

Commit 8021df8

Browse files
romanetarromanetar
committed
fix: review feedback
Signed-off-by: romanetar <roman_ag@hotmail.com>
1 parent a05022f commit 8021df8

5 files changed

Lines changed: 114 additions & 89 deletions

File tree

‎app/Events/SponsorServices/SummitMediaFileTypeCreatedEventDTO.php‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ class SummitMediaFileTypeCreatedEventDTO
1717
{
1818
private int $id;
1919
private string $name;
20-
private string $description;
21-
private string $allowed_extensions;
20+
private ?string $description;
21+
private ?string $allowed_extensions;
2222

2323
public function __construct(
24-
int $id,
25-
string $name,
26-
string $description,
27-
string $allowed_extensions
24+
int $id,
25+
string $name,
26+
?string $description,
27+
?string $allowed_extensions
2828
)
2929
{
3030
$this->id = $id;
@@ -45,11 +45,17 @@ public static function fromSummitMediaFileType($summit_media_file_type): self
4545

4646
public function serialize(): array
4747
{
48-
return [
49-
'id' => $this->id,
48+
$res = [
49+
'id' => $this->id,
5050
'name' => $this->name,
51-
'description' => $this->description,
52-
'allowed_extensions' => $this->allowed_extensions
5351
];
52+
53+
if (!is_null($this->description))
54+
$res['description'] = $this->description;
55+
56+
if (!is_null($this->allowed_extensions))
57+
$res['allowed_extensions'] = $this->allowed_extensions;
58+
59+
return $res;
5460
}
5561
}

‎app/Services/Model/Imp/SummitMediaFileTypeService.php‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public function __construct
5050

5151
/**
5252
* @inheritDoc
53+
* @throws \Exception
5354
*/
5455
public function add(array $payload): SummitMediaFileType
5556
{
@@ -71,10 +72,11 @@ public function add(array $payload): SummitMediaFileType
7172

7273
/**
7374
* @inheritDoc
75+
* @throws \Exception
7476
*/
7577
public function update(int $id, array $payload): SummitMediaFileType
7678
{
77-
return $this->tx_service->transaction(function() use($id, $payload){
79+
$media_file_type = $this->tx_service->transaction(function() use($id, $payload){
7880
$type = $this->repository->getById($id);
7981
if(is_null($type))
8082
throw new EntityNotFoundException();
@@ -86,23 +88,23 @@ public function update(int $id, array $payload): SummitMediaFileType
8688
if(!is_null($type) && $type->getId() != $id)
8789
throw new ValidationException(sprintf("Name %s already exists.", $payload['name']));
8890
}
91+
return SummitMediaFileTypeFactory::populate($type, $payload);
92+
});
8993

90-
$media_file_type = SummitMediaFileTypeFactory::populate($type, $payload);
91-
92-
PublishSponsorServiceDomainEventsJob::dispatch(
93-
SummitMediaFileTypeCreatedEventDTO::fromSummitMediaFileType($media_file_type)->serialize(),
94-
SummitMediaFileTypeDomainEvents::SummitMediaFileTypeUpdated);
94+
PublishSponsorServiceDomainEventsJob::dispatch(
95+
SummitMediaFileTypeCreatedEventDTO::fromSummitMediaFileType($media_file_type)->serialize(),
96+
SummitMediaFileTypeDomainEvents::SummitMediaFileTypeUpdated);
9597

96-
return $media_file_type;
97-
});
98+
return $media_file_type;
9899
}
99100

100101
/**
101102
* @inheritDoc
103+
* @throws \Exception
102104
*/
103105
public function delete(int $id): void
104106
{
105-
$this->tx_service->transaction(function() use($id){
107+
$type = $this->tx_service->transaction(function() use($id){
106108
$type = $this->repository->getById($id);
107109
if(is_null($type))
108110
throw new EntityNotFoundException();
@@ -111,9 +113,11 @@ public function delete(int $id): void
111113

112114
$this->repository->delete($type);
113115

114-
PublishSponsorServiceDomainEventsJob::dispatch(
115-
DeletedEventDTO::fromEntity($type)->serialize(),
116-
SummitMediaFileTypeDomainEvents::SummitMediaFileTypeDeleted);
116+
return $type;
117117
});
118+
119+
PublishSponsorServiceDomainEventsJob::dispatch(
120+
DeletedEventDTO::fromEntity($type)->serialize(),
121+
SummitMediaFileTypeDomainEvents::SummitMediaFileTypeDeleted);
118122
}
119123
}

‎app/Services/Model/Imp/SummitService.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1585,10 +1585,11 @@ public function addSummit(array $data)
15851585
* @return Summit
15861586
* @throws EntityNotFoundException
15871587
* @throws ValidationException
1588+
* @throws Exception
15881589
*/
15891590
public function updateSummit($summit_id, array $data)
15901591
{
1591-
return $this->tx_service->transaction(function () use ($summit_id, $data) {
1592+
$summit = $this->tx_service->transaction(function () use ($summit_id, $data) {
15921593

15931594
if (isset($data['name'])) {
15941595

@@ -1656,14 +1657,13 @@ public function updateSummit($summit_id, array $data)
16561657
)
16571658
);
16581659
}
1660+
return SummitFactory::populate($summit, $data);
1661+
});
16591662

1660-
$summit = SummitFactory::populate($summit, $data);
1661-
1662-
PublishSponsorServiceDomainEventsJob::dispatch(
1663-
SummitCreatedEventDTO::fromSummit($summit)->serialize(), SummitDomainEvents::SummitUpdated);
1663+
PublishSponsorServiceDomainEventsJob::dispatch(
1664+
SummitCreatedEventDTO::fromSummit($summit)->serialize(), SummitDomainEvents::SummitUpdated);
16641665

1665-
return $summit;
1666-
});
1666+
return $summit;
16671667
}
16681668

16691669
/**
@@ -1674,7 +1674,7 @@ public function updateSummit($summit_id, array $data)
16741674
*/
16751675
public function deleteSummit($summit_id)
16761676
{
1677-
return $this->tx_service->transaction(function () use ($summit_id) {
1677+
$summit = $this->tx_service->transaction(function () use ($summit_id) {
16781678

16791679
$summit = $this->summit_repository->getById($summit_id);
16801680

@@ -1691,11 +1691,11 @@ public function deleteSummit($summit_id)
16911691

16921692
Log::debug(sprintf("SummitService::deleteSummit summit_id %s", $summit_id));
16931693
$summit->markAsDeleted();
1694-
1695-
PublishSponsorServiceDomainEventsJob::dispatch(
1696-
DeletedEventDTO::fromEntity($summit)->serialize(), SummitDomainEvents::SummitDeleted);
1697-
1694+
return $summit;
16981695
});
1696+
1697+
PublishSponsorServiceDomainEventsJob::dispatch(
1698+
DeletedEventDTO::fromEntity($summit)->serialize(), SummitDomainEvents::SummitDeleted);
16991699
}
17001700

17011701
/**

‎app/Services/Model/Imp/SummitSponsorService.php‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,11 @@ public function addSponsor(Summit $summit, array $payload): Sponsor
184184
* @return Sponsor
185185
* @throws EntityNotFoundException
186186
* @throws ValidationException
187+
* @throws \Exception
187188
*/
188189
public function updateSponsor(Summit $summit, int $sponsor_id, array $payload): Sponsor
189190
{
190-
return $this->tx_service->transaction(function () use ($summit, $sponsor_id, $payload) {
191+
$sponsor = $this->tx_service->transaction(function () use ($summit, $sponsor_id, $payload) {
191192
Log::debug
192193
(
193194
sprintf
@@ -332,12 +333,14 @@ function (array $acc, SummitSponsorship $sp): array {
332333
$summit->recalculateSummitSponsorOrder($sponsor, $payload['order']);
333334
}
334335

335-
PublishSponsorServiceDomainEventsJob::dispatch(
336-
SummitSponsorCreatedEventDTO::fromSummitSponsor($sponsor)->serialize(),
337-
SponsorDomainEvents::SponsorUpdated);
338-
339336
return $sponsor;
340337
});
338+
339+
PublishSponsorServiceDomainEventsJob::dispatch(
340+
SummitSponsorCreatedEventDTO::fromSummitSponsor($sponsor)->serialize(),
341+
SponsorDomainEvents::SponsorUpdated);
342+
343+
return $sponsor;
341344
}
342345

343346
/**
@@ -348,17 +351,18 @@ function (array $acc, SummitSponsorship $sp): array {
348351
*/
349352
public function deleteSponsor(Summit $summit, int $sponsor_id): void
350353
{
351-
$this->tx_service->transaction(function () use ($summit, $sponsor_id) {
354+
$sponsor = $this->tx_service->transaction(function () use ($summit, $sponsor_id) {
352355
$summit_sponsor = $summit->getSummitSponsorById($sponsor_id);
353356
if (is_null($summit_sponsor))
354357
throw new EntityNotFoundException("Sponsor not found.");
355358

356359
$summit->removeSummitSponsor($summit_sponsor);
357-
358-
PublishSponsorServiceDomainEventsJob::dispatch(
359-
DeletedEventDTO::fromEntity($summit_sponsor)->serialize(),
360-
SponsorDomainEvents::SponsorDeleted);
360+
return $summit_sponsor;
361361
});
362+
363+
PublishSponsorServiceDomainEventsJob::dispatch(
364+
DeletedEventDTO::fromEntity($sponsor)->serialize(),
365+
SponsorDomainEvents::SponsorDeleted);
362366
}
363367

364368
/**

0 commit comments

Comments
 (0)