Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Filter not activated LPAs 2.0 #1064

Merged
merged 9 commits into from
Sep 10, 2021
Merged

Filter not activated LPAs 2.0 #1064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
648189b
Filter not activated LPAs
lukejolliffe Sep 1, 2021
712d798
update test
lukejolliffe Sep 1, 2021
bce0e27
Lint PHP errors
lukejolliffe Sep 1, 2021
1c1132f
boolean toggle functionality GetAllForUser -> two methods in LpaService
lukejolliffe Sep 6, 2021
9bf673a
Merge branch 'master' into UML-1697-filter-not-activated-lpa-from-das…
lukejolliffe Sep 7, 2021
9d757b1
fix indentation
lukejolliffe Sep 7, 2021
0a2a225
Merge branch 'master' into UML-1697-filter-not-activated-lpa-from-das…
lukejolliffe Sep 9, 2021
485af8a
Merge branch 'master' into UML-1697-filter-not-activated-lpa-from-das…
lukejolliffe Sep 10, 2021
094916f
Merge branch 'master' into UML-1697-filter-not-activated-lpa-from-das…
lukejolliffe Sep 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
168 changes: 167 additions & 1 deletion .idea/php.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions service-api/app/src/App/src/Service/Lpa/LpaAlreadyAdded.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,9 @@ public function __construct(
public function __invoke(string $userId, string $lpaUid): ?array
{
if (($this->featureEnabled)('save_older_lpa_requests')) {

$savedLpaRecords = $this->userLpaActorMapRepository->getUsersLpas($userId);

foreach($savedLpaRecords as $record) {
foreach ($savedLpaRecords as $record) {
if ($record['SiriusUid'] === $lpaUid && !array_key_exists('ActivateBy', $record)) {
$lpa = $this->lpaService->getByUserLpaActorToken($record['Id'], $userId);

Expand Down Expand Up @@ -80,7 +79,6 @@ public function __invoke(string $userId, string $lpaUid): ?array
}

return null;

} else {
return $this->preSaveOfRequestFeature($userId, $lpaUid);
}
Expand All @@ -95,7 +93,7 @@ public function __invoke(string $userId, string $lpaUid): ?array
*/
private function preSaveOfRequestFeature(string $userId, string $lpaUid): ?array
{
$lpasAdded = $this->lpaService->getAllForUser($userId);
$lpasAdded = $this->lpaService->getAllLpasAndRequestsForUser($userId);

foreach ($lpasAdded as $userLpaActorToken => $lpaData) {
if ($lpaData['lpa']['uId'] === $lpaUid) {
Expand Down
Loading