diff --git a/app/Services/Model/SpeakerService.php b/app/Services/Model/SpeakerService.php index cbbd50eb..72d4bbfc 100644 --- a/app/Services/Model/SpeakerService.php +++ b/app/Services/Model/SpeakerService.php @@ -27,6 +27,7 @@ use App\Models\Foundation\Summit\Speakers\SpeakerEditPermissionRequest; use App\Services\Model\AbstractService; use App\Services\Model\IFolderService; use Illuminate\Http\UploadedFile; +use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Mail; use libs\utils\ITransactionService; use models\exceptions\EntityNotFoundException; @@ -210,8 +211,14 @@ final class SpeakerService } if ($member_id == 0 && !empty($emai)) { + Log::debug(sprintf("SpeakerService::addSpeaker: member id is zero email is %s", $emai)); $member = $this->member_repository->getByEmail($email); + if (!is_null($member)) { + Log::debug(sprintf("SpeakerService::addSpeaker: member %s found, setting it to speaker", $emai)); + $speaker->setMember($member); + } if (is_null($member)) { + Log::debug(sprintf("SpeakerService::addSpeaker: member %s not found", $emai)); $existent_speaker = $this->speaker_repository->getByMember($member); if (!is_null($existent_speaker)) throw new ValidationException @@ -223,11 +230,6 @@ final class SpeakerService ]) ); - $speaker->setMember($member); - - } - - if(!$speaker->hasMember()){ $this->registerSpeaker($speaker, $email); } } diff --git a/app/Services/Model/SummitTrackTagGroupService.php b/app/Services/Model/SummitTrackTagGroupService.php index 4779ba4d..1c4e0534 100644 --- a/app/Services/Model/SummitTrackTagGroupService.php +++ b/app/Services/Model/SummitTrackTagGroupService.php @@ -15,6 +15,7 @@ use App\Models\Foundation\Summit\Factories\TrackTagGroupFactory; use App\Models\Foundation\Summit\Repositories\IDefaultTrackTagGroupRepository; use App\Models\Foundation\Summit\TrackTagGroup; use App\Models\Foundation\Summit\TrackTagGroupAllowedTag; +use Illuminate\Support\Facades\Log; use libs\utils\ITransactionService; use models\exceptions\EntityNotFoundException; use models\exceptions\ValidationException; @@ -165,9 +166,13 @@ implements ISummitTrackTagGroupService if (isset($data['allowed_tags'])) { $track_tag_group->clearAllowedTags(); foreach ($data['allowed_tags'] as $str_tag) { + Log::debug("updating allowed tags for track group"); + Log::debug(sprintf("trying to get tag %s ...", $str_tag)); $tag = $this->tag_repository->getByTag($str_tag); - if(is_null($tag)) + if(is_null($tag)) { + Log::debug(sprintf("creating tag %s ...", $str_tag)); $tag = new Tag(trim($str_tag)); + } $track_tag_group->addTag($tag); } } diff --git a/tests/OAuth2TrackTagGroupsApiTest.php b/tests/OAuth2TrackTagGroupsApiTest.php index b18edda9..91866cb5 100644 --- a/tests/OAuth2TrackTagGroupsApiTest.php +++ b/tests/OAuth2TrackTagGroupsApiTest.php @@ -92,7 +92,7 @@ final class OAuth2TrackTagGroupsApiTest extends ProtectedApiTest //$new_track_tag_group = $this->testAddTrackTagGroup($summit_id); $params = [ 'id' => $summit_id, - 'track_tag_group_id' => 26, + 'track_tag_group_id' => 25, 'expand' => 'allowed_tags,tag' ]; @@ -102,7 +102,7 @@ final class OAuth2TrackTagGroupsApiTest extends ProtectedApiTest 'name' => $name, 'label' => $label, 'order' => 1, - 'allowed_tags' => ['101','Case Study', 'Demo', 'Demo2'], + 'allowed_tags' => ['Symantec','Platinum Member', 'Marketplace', 'Enterprise', 'Tag Loco'], ]; $headers = [