Compare commits
8
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bc566e3c2c | ||
|
|
b21de75b7f | ||
|
|
7f0223bbaa | ||
|
|
f872fd25ae | ||
|
|
475cc9f0d8 | ||
|
|
dc7968493f | ||
|
|
a70fa14429 | ||
|
|
15eec69af8 |
No files matched your search
Generated
+700
-620
File diff suppressed because it is too large.
Load diff
@@ -28,10 +28,6 @@ zenstruck_schedule:
|
|||||||
frequency: '30 * * * *'
|
frequency: '30 * * * *'
|
||||||
description: "Removes orphaned uploads"
|
description: "Removes orphaned uploads"
|
||||||
|
|
||||||
- task: messenger:consume async -t 60
|
|
||||||
frequency: '*/15 * * * *'
|
|
||||||
description: "Starts messenger queue"
|
|
||||||
|
|
||||||
- task: app:cleanup:xml-dumps
|
- task: app:cleanup:xml-dumps
|
||||||
frequency: "0 2 * * *"
|
frequency: "0 2 * * *"
|
||||||
description: "Removes outdated XML dumps of requests/responses to BPN API for debugging"
|
description: "Removes outdated XML dumps of requests/responses to BPN API for debugging"
|
||||||
+2
-1
@@ -118,7 +118,8 @@ task('deploy:stop-workers', function () {
|
|||||||
});
|
});
|
||||||
|
|
||||||
task('deploy:assets', function () {
|
task('deploy:assets', function () {
|
||||||
runLocally('npm i && npm run build');
|
runLocally('ddev exec npm ci');
|
||||||
|
runLocally('ddev exec npm run build');
|
||||||
});
|
});
|
||||||
|
|
||||||
after('deploy:failed', 'deploy:unlock');
|
after('deploy:failed', 'deploy:unlock');
|
||||||
@@ -5,13 +5,18 @@ namespace App\BusProNet\DataProvider;
|
|||||||
use App\BusProNet\ApiClient;
|
use App\BusProNet\ApiClient;
|
||||||
use App\BusProNet\ApiClientException;
|
use App\BusProNet\ApiClientException;
|
||||||
use App\BusProNet\Model\Country;
|
use App\BusProNet\Model\Country;
|
||||||
|
use App\BusProNet\Model\NotificationResponse;
|
||||||
|
use Psr\Log\LoggerInterface;
|
||||||
use Symfony\Contracts\Cache\CacheInterface;
|
use Symfony\Contracts\Cache\CacheInterface;
|
||||||
use Symfony\Contracts\Cache\ItemInterface;
|
use Symfony\Contracts\Cache\ItemInterface;
|
||||||
|
|
||||||
class CountryDataProvider
|
class CountryDataProvider
|
||||||
{
|
{
|
||||||
public function __construct(private readonly ApiClient $apiClient, private readonly CacheInterface $cache)
|
public function __construct(
|
||||||
{
|
private readonly ApiClient $apiClient,
|
||||||
|
private readonly CacheInterface $cache,
|
||||||
|
private readonly LoggerInterface $logger,
|
||||||
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getAll(): array
|
public function getAll(): array
|
||||||
@@ -20,11 +25,15 @@ class CountryDataProvider
|
|||||||
$countries = $this->cache->get('bpn_countries', function (ItemInterface $item) {
|
$countries = $this->cache->get('bpn_countries', function (ItemInterface $item) {
|
||||||
$item->expiresAfter(3600);
|
$item->expiresAfter(3600);
|
||||||
|
|
||||||
return $this
|
$response = $this->apiClient->getBaseData(ApiClient::TYPE_BASE_DATA_COUNTRIES);
|
||||||
->apiClient
|
|
||||||
->getBaseData(ApiClient::TYPE_BASE_DATA_COUNTRIES)
|
if ($response instanceof NotificationResponse) {
|
||||||
->getItems()
|
$this->logger->error('Unable to fetch country base data from BusProNet. Code: '.$response->getCode().', Message: '.$response->getMessage());
|
||||||
;
|
|
||||||
|
throw new ApiClientException('Unable to fetch country base data from BusProNet');
|
||||||
|
}
|
||||||
|
|
||||||
|
return $response->getItems();
|
||||||
});
|
});
|
||||||
} catch (ApiClientException $e) {
|
} catch (ApiClientException $e) {
|
||||||
$countries = [];
|
$countries = [];
|
||||||
|
|||||||
@@ -5,14 +5,19 @@ namespace App\BusProNet\DataProvider;
|
|||||||
use App\BusProNet\ApiClient;
|
use App\BusProNet\ApiClient;
|
||||||
use App\BusProNet\ApiClientException;
|
use App\BusProNet\ApiClientException;
|
||||||
use App\BusProNet\Model\Hotel;
|
use App\BusProNet\Model\Hotel;
|
||||||
|
use App\BusProNet\Model\NotificationResponse;
|
||||||
use Psr\Cache\InvalidArgumentException;
|
use Psr\Cache\InvalidArgumentException;
|
||||||
|
use Psr\Log\LoggerInterface;
|
||||||
use Symfony\Contracts\Cache\CacheInterface;
|
use Symfony\Contracts\Cache\CacheInterface;
|
||||||
use Symfony\Contracts\Cache\ItemInterface;
|
use Symfony\Contracts\Cache\ItemInterface;
|
||||||
|
|
||||||
class HotelDataProvider
|
class HotelDataProvider
|
||||||
{
|
{
|
||||||
public function __construct(private readonly ApiClient $apiClient, private readonly CacheInterface $cache)
|
public function __construct(
|
||||||
{
|
private readonly ApiClient $apiClient,
|
||||||
|
private readonly CacheInterface $cache,
|
||||||
|
private readonly LoggerInterface $logger,
|
||||||
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getAll(): array
|
public function getAll(): array
|
||||||
@@ -21,11 +26,15 @@ class HotelDataProvider
|
|||||||
$hotels = $this->cache->get('bpn_hotels', function (ItemInterface $item) {
|
$hotels = $this->cache->get('bpn_hotels', function (ItemInterface $item) {
|
||||||
$item->expiresAfter(3600);
|
$item->expiresAfter(3600);
|
||||||
|
|
||||||
return $this
|
$response = $this->apiClient->getBaseData(ApiClient::TYPE_BASE_DATA_HOTELS);
|
||||||
->apiClient
|
|
||||||
->getBaseData(ApiClient::TYPE_BASE_DATA_HOTELS)
|
if ($response instanceof NotificationResponse) {
|
||||||
->getItems()
|
$this->logger->error('Unable to fetch hotel base data from BusProNet. Code: '.$response->getCode().', Message: '.$response->getMessage());
|
||||||
;
|
|
||||||
|
throw new ApiClientException('Unable to fetch hotel base data from BusProNet');
|
||||||
|
}
|
||||||
|
|
||||||
|
return $response->getItems();
|
||||||
});
|
});
|
||||||
} catch (ApiClientException|InvalidArgumentException $e) {
|
} catch (ApiClientException|InvalidArgumentException $e) {
|
||||||
$hotels = [];
|
$hotels = [];
|
||||||
|
|||||||
@@ -4,14 +4,19 @@ namespace App\BusProNet\DataProvider;
|
|||||||
|
|
||||||
use App\BusProNet\ApiClient;
|
use App\BusProNet\ApiClient;
|
||||||
use App\BusProNet\ApiClientException;
|
use App\BusProNet\ApiClientException;
|
||||||
|
use App\BusProNet\Model\NotificationResponse;
|
||||||
use App\BusProNet\Model\Pickup;
|
use App\BusProNet\Model\Pickup;
|
||||||
|
use Psr\Log\LoggerInterface;
|
||||||
use Symfony\Contracts\Cache\CacheInterface;
|
use Symfony\Contracts\Cache\CacheInterface;
|
||||||
use Symfony\Contracts\Cache\ItemInterface;
|
use Symfony\Contracts\Cache\ItemInterface;
|
||||||
|
|
||||||
class PickupDataProvider
|
class PickupDataProvider
|
||||||
{
|
{
|
||||||
public function __construct(private readonly ApiClient $apiClient, private readonly CacheInterface $cache)
|
public function __construct(
|
||||||
{
|
private readonly ApiClient $apiClient,
|
||||||
|
private readonly CacheInterface $cache,
|
||||||
|
private readonly LoggerInterface $logger,
|
||||||
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getAll(): array
|
public function getAll(): array
|
||||||
@@ -20,11 +25,15 @@ class PickupDataProvider
|
|||||||
$pickups = $this->cache->get('bpn_pickups', function (ItemInterface $item) {
|
$pickups = $this->cache->get('bpn_pickups', function (ItemInterface $item) {
|
||||||
$item->expiresAfter(3600);
|
$item->expiresAfter(3600);
|
||||||
|
|
||||||
return $this
|
$response = $this->apiClient->getBaseData(ApiClient::TYPE_BASE_DATA_PICKUPS);
|
||||||
->apiClient
|
|
||||||
->getBaseData(ApiClient::TYPE_BASE_DATA_PICKUPS)
|
if ($response instanceof NotificationResponse) {
|
||||||
->getItems()
|
$this->logger->error('Unable to fetch pickup base data from BusProNet. Code: '.$response->getCode().', Message: '.$response->getMessage());
|
||||||
;
|
|
||||||
|
throw new ApiClientException('Unable to fetch pickup base data from BusProNet');
|
||||||
|
}
|
||||||
|
|
||||||
|
return $response->getItems();
|
||||||
});
|
});
|
||||||
} catch (ApiClientException $e) {
|
} catch (ApiClientException $e) {
|
||||||
$pickups = [];
|
$pickups = [];
|
||||||
|
|||||||
@@ -345,13 +345,16 @@ class AssignmentRepository extends ServiceEntityRepository
|
|||||||
$qb->expr()->in('assignment.jobProfile', ':jobProfiles'),
|
$qb->expr()->in('assignment.jobProfile', ':jobProfiles'),
|
||||||
$qb->expr()->isNull('application'),
|
$qb->expr()->isNull('application'),
|
||||||
$qb->expr()->isNull('disposition'),
|
$qb->expr()->isNull('disposition'),
|
||||||
$qb->expr()->in('assignment.id', $availableAssignmentsIds)
|
|
||||||
))
|
))
|
||||||
->setParameter('staffingStatus', Assignment::STATUS_STAFFED)
|
->setParameter('staffingStatus', Assignment::STATUS_STAFFED)
|
||||||
->setParameter('jobProfiles', $teamer->getJobProfiles())
|
->setParameter('jobProfiles', $teamer->getJobProfiles())
|
||||||
->setParameter('teamer', $teamer)
|
->setParameter('teamer', $teamer)
|
||||||
;
|
;
|
||||||
|
|
||||||
|
if ([] !== $availableAssignmentsIds) {
|
||||||
|
$qb->andWhere($qb->expr()->in('assignment.id', $availableAssignmentsIds));
|
||||||
|
}
|
||||||
|
|
||||||
if (0 === $teamer->getTrainingAttendances()->count() && 0 === $teamer->getLicenses()->count()) {
|
if (0 === $teamer->getTrainingAttendances()->count() && 0 === $teamer->getLicenses()->count()) {
|
||||||
$qb
|
$qb
|
||||||
->andWhere($qb->expr()->eq('job_profile.requiredLicenses', ':requiredLicenses'))
|
->andWhere($qb->expr()->eq('job_profile.requiredLicenses', ':requiredLicenses'))
|
||||||
@@ -361,7 +364,7 @@ class AssignmentRepository extends ServiceEntityRepository
|
|||||||
}
|
}
|
||||||
|
|
||||||
return $qb
|
return $qb
|
||||||
->orderBy('assignment.createdAt', 'DESC')
|
->orderBy('destination.dateFrom', 'ASC')
|
||||||
->setMaxResults($limit)
|
->setMaxResults($limit)
|
||||||
->getQuery()
|
->getQuery()
|
||||||
->getResult()
|
->getResult()
|
||||||
|
|||||||
Reference in new issue
Block a user