EP/myep-team
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: multiple hotelcodes assignable to users

Browse Source
This commit is contained in:
Björn Fromme
2025-01-08 10:07:19 +01:00
parent 5a07d95837
commit c15188c43c
16 changed files with 256 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/BusProNet/Model/CrmAttributesResponse.php
+5 -5
View File
@@ -9,7 +9,7 @@ class CrmAttributesResponse
private bool $manager = false;
private bool $houseManager = false;
private bool $teamer = false;
private ?string $hotelCode = null;
private array $hotelCodes = [];
public function getAttributeGroups(): ?array
{
@@ -70,14 +70,14 @@ class CrmAttributesResponse
return $this;
}
public function getHotelCode(): ?string
public function getHotelCodes(): array
{
return $this->hotelCode;
return $this->hotelCodes;
}
public function setHotelCode(?string $hotelCode): static
public function setHotelCodes(array $hotelCodes): static
{
$this->hotelCode = $hotelCode;
$this->hotelCodes = $hotelCodes;
return $this;
}
src/BusProNet/ResponseParser.php
+4 -4
View File
@@ -142,7 +142,7 @@ class ResponseParser
{
$groups = [];
$isAdmin = $isManager = $isHouseManager = $isTeamer = false;
$hotelCode = null;
$hotelCodes = [];
foreach ($xml->selektionsmerkmale->selektionsgruppe as $item) {
$group = new CrmAttributeGroup();
@@ -164,7 +164,7 @@ class ResponseParser
if (1 === preg_match('/^Hausleitung ([A-Z0-9]+)$/', $attributeLabel, $matches) && true === $attribute->isSelected()) {
$isHouseManager = true;
$hotelCode = $matches[1];
$hotelCodes[] = $matches[1];
}
if ($this->config['bpn_crm_id_admin'] === $attribute->getId() && true === $attribute->isSelected()) {
$isAdmin = true;
@@ -183,7 +183,7 @@ class ResponseParser
// Apply additional role and hotel code for testing purposes when provided
if ($isAdmin && null !== $this->config['bpn_default_hotel_code']) {
$isHouseManager = true;
$hotelCode = $this->config['bpn_default_hotel_code'];
$hotelCodes[] = $this->config['bpn_default_hotel_code'];
}
$response = new CrmAttributesResponse();
@@ -193,7 +193,7 @@ class ResponseParser
->setManager($isManager)
->setTeamer($isTeamer)
->setHouseManager($isHouseManager)
->setHotelCode($hotelCode)
->setHotelCodes($hotelCodes)
;
return $response;
src/BusProNet/UserDataHandler.php
+4 -4
View File
@@ -55,7 +55,7 @@ class UserDataHandler
array $roles,
bool $isTeamer = false,
array $crmSelections = [],
?string $hotelCode = null
array $hotelCodes = []
): User {
$user = new User();
$user
@@ -64,7 +64,7 @@ class UserDataHandler
->setEmail($profileResponse->getCommunication()->getEmail())
->setBusProPersonId($profileResponse->getPersonId())
->setBusProAddressId($profileResponse->getAddressId())
->setHotelCode($hotelCode)
->setHotelCodes($hotelCodes)
->setRoles($roles)
;
@@ -95,12 +95,12 @@ class UserDataHandler
array $roles,
bool $isTeamer = false,
array $crmSelections = [],
?string $hotelCode = null
array $hotelCodes = []
): void {
$user
->setEmail($profileResponse->getCommunication()->getEmail())
->setRoles($roles)
->setHotelCode($hotelCode)
->setHotelCodes($hotelCodes)
;
if (true === $isTeamer) {
src/Controller/HouseManager/Feedback/IndexController.php
+1 -1
View File
@@ -28,7 +28,7 @@ class IndexController extends AbstractController
$query = $this
->dispositionRepository
->getDispositionsWithPendingFeedbackQuery($user->getHotelCode())
->getDispositionsWithPendingFeedbackQuery($user->getHotelCodes())
;
$pagination = $this->paginator->paginate(
src/Controller/HouseManager/IndexController.php
+2 -2
View File
@@ -32,12 +32,12 @@ class IndexController extends AbstractController
$newDispositions = $this
->dispositionRepository
->findNewDispositionsByHotelCode($user->getHotelCode())
->findNewDispositionsByHotelCodes($user->getHotelCodes())
;
$pendingFeedbacks = $this
->dispositionRepository
->findDispositionsWithPendingFeedbackByHotelCode($user->getHotelCode())
->findDispositionsWithPendingFeedbackByHotelCodes($user->getHotelCodes())
;
return $this->render('house_manager/index.html.twig', [
src/Entity/User.php
+21 -4
View File
@@ -54,6 +54,9 @@ class User implements UserInterface, TimestampableEntityInterface
#[ORM\Column(length: 32, nullable: true)]
private ?string $hotelCode = null;
#[ORM\Column(type: 'json')]
private array $hotelCodes = [];
#[ORM\Column]
private bool $muteNotifications = false;
@@ -256,14 +259,14 @@ class User implements UserInterface, TimestampableEntityInterface
return $this;
}
public function getHotelCode(): ?string
public function getHotelCodes(): array
{
return $this->hotelCode;
return $this->hotelCodes;
}
public function setHotelCode(?string $hotelCode): static
public function setHotelCodes(array $hotelCodes): static
{
$this->hotelCode = $hotelCode;
$this->hotelCodes = $hotelCodes;
return $this;
}
@@ -279,4 +282,18 @@ class User implements UserInterface, TimestampableEntityInterface
return $this;
}
public function hasHotelCodeMatch(string $hotelCode): bool
{
foreach ($this->hotelCodes as $userHotelCode) {
if (
str_starts_with($hotelCode, $userHotelCode)
|| str_ends_with($hotelCode, $userHotelCode)
) {
return true;
}
}
return false;
}
}
src/Repository/DispositionRepository.php
+17 -7
View File
@@ -148,8 +148,10 @@ class DispositionRepository extends ServiceEntityRepository
;
}
public function findNewDispositionsByHotelCode(string $hotelCode): array
public function findNewDispositionsByHotelCodes(mixed $hotelCode): array
{
$hotelCodes = (array) $hotelCode;
$qb = $this->createQueryBuilder('disposition');
return $qb
@@ -157,12 +159,15 @@ class DispositionRepository extends ServiceEntityRepository
->innerJoin('disposition.assignment', 'assignment')
->innerJoin('assignment.destination', 'destination')
->where($qb->expr()->andX(
$qb->expr()->like('destination.hotelCode', ':hotelCode'),
$qb->expr()->orX(
$qb->expr()->in($qb->expr()->substring('destination.hotelCode', 1, 3), ':hotelCodes'),
$qb->expr()->in($qb->expr()->substring('destination.hotelCode', -3, 3), ':hotelCodes'),
),
$qb->expr()->gte('destination.dateTo', ':dateTo'),
$qb->expr()->eq('disposition.status', ':status')
))
->orderBy('destination.dateFrom', 'ASC')
->setParameter('hotelCode', '%'.$hotelCode.'%')
->setParameter('hotelCodes', $hotelCodes)
->setParameter('dateTo', new \DateTimeImmutable())
->setParameter('status', Disposition::STATUS_CONFIRMED)
->getQuery()
@@ -170,8 +175,10 @@ class DispositionRepository extends ServiceEntityRepository
;
}
public function getDispositionsWithPendingFeedbackQuery(?string $hotelCode = null, ?int $offsetDays = null): Query
public function getDispositionsWithPendingFeedbackQuery(mixed $hotelCode = null, ?int $offsetDays = null): Query
{
$hotelCodes = (array) $hotelCode;
$qb = $this->createQueryBuilder('disposition');
$qb
@@ -201,8 +208,11 @@ class DispositionRepository extends ServiceEntityRepository
if (null !== $hotelCode) {
$qb
->andWhere($qb->expr()->like('destination.hotelCode', ':hotelCode'))
->setParameter('hotelCode', '%'.$hotelCode.'%')
->andWhere($qb->expr()->orX(
$qb->expr()->in($qb->expr()->substring('destination.hotelCode', 1, 3), ':hotelCodes'),
$qb->expr()->in($qb->expr()->substring('destination.hotelCode', -3, 3), ':hotelCodes'),
))
->setParameter('hotelCodes', $hotelCodes)
;
}
@@ -217,7 +227,7 @@ class DispositionRepository extends ServiceEntityRepository
;
}
public function findDispositionsWithPendingFeedbackByHotelCode(string $hotelCode): array
public function findDispositionsWithPendingFeedbackByHotelCodes(mixed $hotelCode): array
{
return $this
->getDispositionsWithPendingFeedbackQuery($hotelCode)
src/Repository/UserRepository.php
+28 -25
View File
@@ -32,16 +32,14 @@ class UserRepository extends ServiceEntityRepository
$qb = $this->createQueryBuilder('u');
return $qb
->where($qb->expr()->orX(
$qb->expr()->like('u.roles', ':role_admin'),
$qb->expr()->like('u.roles', ':role_manager'),
$qb->expr()->like('u.roles', ':role_house_manager')
))
->where("JSON_CONTAINS(u.roles, :role_admin) = 1")
->orWhere("JSON_CONTAINS(u.roles, :role_manager) = 1")
->orWhere("JSON_CONTAINS(u.roles, :role_house_manager) = 1")
->orderBy('u.lastName', 'ASC')
->setParameters([
'role_admin' => '%"ROLE_ADMIN"%',
'role_manager' => '%"ROLE_MANAGER"%',
'role_house_manager' => '%"ROLE_HOUSE_MANAGER"%',
'role_admin' => json_encode('ROLE_ADMIN'),
'role_manager' => json_encode('ROLE_MANAGER'),
'role_house_manager' => json_encode('ROLE_HOUSE_MANAGER'),
])
->getQuery()
->getResult()
@@ -50,22 +48,29 @@ class UserRepository extends ServiceEntityRepository
/**
* @param string $role
* @param string $hotelCode
* @param string[]|string $hotelCode
* @return User[]
*/
public function getUsersByRoleAndHotelCode(string $role, string $hotelCode): array
public function getUsersByRoleAndHotelCode(string $role, mixed $hotelCode): array
{
$hotelCodeBase = substr($hotelCode, 0, 3);
$hotelCodes = (array) $hotelCode;
$hotelCodesBase = array_map(function ($code) {
return substr($code, 0, 3);
}, $hotelCodes);
$qb = $this->createQueryBuilder('user');
foreach ($hotelCodesBase as $index => $code) {
$qb
->orWhere('JSON_CONTAINS(user.hotelCodes, :hotelCode_'.$index.') = 1')
->setParameter('hotelCode_'.$index, json_encode($code))
;
}
return $qb
->where($qb->expr()->andX(
$qb->expr()->eq('user.hotelCode', ':hotelCode'),
$qb->expr()->like('user.roles', ':role')
))
->setParameter('hotelCode', $hotelCodeBase)
->setParameter('role', '%"'.$role.'"%')
->andWhere('JSON_CONTAINS(user.roles, :role) = 1')
->setParameter('role', json_encode($role))
->getQuery()
->getResult()
;
@@ -76,17 +81,15 @@ class UserRepository extends ServiceEntityRepository
$qb = $this->createQueryBuilder('user');
$users = $qb
->where($qb->expr()->andX(
$qb->expr()->orX(
$qb->expr()->like('user.lastName', ':search'),
$qb->expr()->like('user.firstName', ':search'),
)),
$qb->expr()->like('user.roles', ':role')
)
->where($qb->expr()->orX(
$qb->expr()->like('user.lastName', ':search'),
$qb->expr()->like('user.firstName', ':search'),
))
->andWhere('JSON_CONTAINS(user.roles, :role) = 1')
->orderBy('user.lastName', 'ASC')
->addOrderBy('user.firstName', 'ASC')
->setParameter('search', '%'.$this->escapeLikeWildcards($search).'%')
->setParameter('role', '%"'.$this->escapeLikeWildcards($role).'"%')
->setParameter('role', json_encode($role))
->getQuery()
->getResult()
;
src/Security/BpnAuthenticator.php
+2 -2
View File
@@ -137,7 +137,7 @@ class BpnAuthenticator extends AbstractLoginFormAuthenticator implements Authent
if (null !== $user) {
$this
->userDataHandler
->updateLocalUser($user, $profileResponse, $roles, $isTeamer, $crmSelections, $crmAttributes->getHotelCode())
->updateLocalUser($user, $profileResponse, $roles, $isTeamer, $crmSelections, $crmAttributes->getHotelCodes())
;
return $user;
@@ -145,7 +145,7 @@ class BpnAuthenticator extends AbstractLoginFormAuthenticator implements Authent
return $this
->userDataHandler
->createLocalUser($profileResponse, $roles, $isTeamer, $crmSelections, $crmAttributes->getHotelCode())
->createLocalUser($profileResponse, $roles, $isTeamer, $crmSelections, $crmAttributes->getHotelCodes())
;
}
}
src/Security/Voter/DispositionVoter.php
+2 -1
View File
@@ -5,6 +5,7 @@ namespace App\Security\Voter;
use App\BusProNet\DataProvider\HotelDataProvider;
use App\BusProNet\Model\Hotel;
use App\Entity\Disposition;
use App\Entity\User;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
use Symfony\Component\Security\Core\Authorization\Voter\Voter;
@@ -93,4 +94,4 @@ class DispositionVoter extends Voter
return $this->security->getUser()->getTeamer() === $disposition->getTeamer();
}
}
}
src/Service/Cron/FeedbackReminderService.php
+23 -11
View File
@@ -38,24 +38,30 @@ class FeedbackReminderService
continue;
}
// Get hotel base code to find hotel manager later
$hotelBaseCode = substr($hotel->getCode(), 0, 3);
// Get hotel code to find hotel manager later
$hotelCode = $hotel->getCode();
if (false === array_key_exists($hotelBaseCode, $sortedFeedbacks)) {
$sortedFeedbacks[$hotelBaseCode] = [];
if (false === array_key_exists($hotelCode, $sortedFeedbacks)) {
$sortedFeedbacks[$hotelCode] = [];
}
// Sort feedback by hotel base code
$sortedFeedbacks[$hotelBaseCode][] = $disposition;
$sortedFeedbacks[$hotelCode][] = $disposition;
}
// Determine hotel managers to notify
$hotelBaseCodes = array_keys($sortedFeedbacks);
// find hotel managers by hotel codes starting or ending with base code
$hotelCodes = array_keys($sortedFeedbacks);
$hotelBaseCodes = [];
foreach ($hotelCodes as $hotelCode) {
$hotelBaseCodes[] = substr($hotelCode, 0, 3);
$hotelBaseCodes[] = substr($hotelCode, -3, 3);
}
/** @var User[] $hotelManagers */
$hotelManagers = $this->userRepository->findBy([
'hotelCode' => $hotelBaseCodes,
]);
$hotelManagers = $this
->userRepository
->getUsersByRoleAndHotelCode('ROLE_HOTEL_MANAGER', $hotelBaseCodes)
;
if (0 === count($hotelManagers)) {
return 'No feedback reminders to be sent to hotel managers';
@@ -65,8 +71,14 @@ class FeedbackReminderService
if (true === $manager->isMuteNotifications()) {
continue;
}
$feedbackKeys = array_filter(array_keys($sortedFeedbacks), function (string $key) use ($manager) {
return $manager->hasHotelCodeMatch($key);
});
$feedbacksForManager = array_filter($sortedFeedbacks, function ($key) use ($feedbackKeys) {
return in_array($key, $feedbackKeys);
}, ARRAY_FILTER_USE_KEY);
$this->mailer->createAndSendEmail([
'feedbacks' => $sortedFeedbacks[$manager->getHotelCode()],
'feedbacks' => $feedbacksForManager,
], [
'to' => $manager->getEmail(),
'subject' => 'Reminder: Offene Feedbacks',