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

Jump to bottom

PIN-5450 - Update getEservices query with delegation lookup #1116

Draft
wants to merge 4 commits into
base: pin-5444_reject-descriptor
Choose a base branch
from
Draft

PIN-5450 - Update getEservices query with delegation lookup #1116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
90e7736
Updated query
Carminepo2 Oct 21, 2024
6a4dbd0
Update getEservices.test.ts
Carminepo2 Oct 21, 2024
dfa320e
Update readModelService.ts
Carminepo2 Oct 21, 2024
482d3a4
Updated delegation filter lookup to include only active delegations
Carminepo2 Oct 21, 2024
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
32 changes: 28 additions & 4 deletions packages/catalog-process/src/services/readModelService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import {
genericInternalError,
Delegation,
DelegationState,
delegationState,
} from "pagopa-interop-models";
import { match } from "ts-pattern";
import { z } from "zod";
Expand Down Expand Up @@ -150,10 +151,32 @@ export function readModelServiceBuilder(
"data.id": { $in: ids },
});

const producersIdsFilter: ReadModelFilter<EService> =
ReadModelRepository.arrayToFilter(producersIds, {
"data.producerId": { $in: producersIds },
});
const producersIdsFilter = ReadModelRepository.arrayToFilter(
producersIds,
{
$or: [
{ "data.producerId": { $in: producersIds } },
{
"delegation.data.delegateId": { $in: producersIds },
"delegation.data.state": { $eq: delegationState.active },
},
],
}
);

const delegationLookup =
producersIds.length > 0
? [
{
$lookup: {
from: "delegations",
localField: "data.id",
foreignField: "data.eserviceId",
as: "delegation",
},
},
]
: [];
Comment on lines +154 to +179
Copy link
Contributor Author

@Carminepo2 Carminepo2 Oct 21, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Discussions on making the active delegations e-service implicit in the producersIds filter are still on going


const descriptorsStateFilter: ReadModelFilter<EService> =
ReadModelRepository.arrayToFilter(states, {
Expand Down Expand Up @@ -239,6 +262,7 @@ export function readModelServiceBuilder(
: {};

const aggregationPipeline = [
...delegationLookup,
{
$match: {
...nameFilter,
Expand Down
316 changes: 315 additions & 1 deletion packages/catalog-process/test/getEservices.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,57 @@ describe("get eservices", () => {
expect(result.totalCount).toBe(3);
expect(result.results).toEqual([eservice1, eservice2, eservice3]);
});
it("should get the eServices, including the ones with an active delegation, if they exist (parameters: producersIds)", async () => {
const delegatedOrganization1 = generateId<TenantId>();
const delegatedOrganization2 = generateId<TenantId>();

await addOneDelegation({
...getMockDelegationProducer(),
eserviceId: eservice4.id,
delegateId: delegatedOrganization1,
state: delegationState.active,
});

await addOneDelegation({
...getMockDelegationProducer(),
eserviceId: eservice5.id,
delegateId: delegatedOrganization2,
state: delegationState.active,
});

await addOneDelegation({
...getMockDelegationProducer(),
eserviceId: eservice6.id,
delegateId: delegatedOrganization2,
state: delegationState.rejected,
});

const result = await catalogService.getEServices(
getMockAuthData(),
{
eservicesIds: [],
producersIds: [
organizationId1,
delegatedOrganization1,
delegatedOrganization2,
],
states: [],
agreementStates: [],
attributesIds: [],
},
0,
50,
genericLogger
);
expect(result.totalCount).toBe(5);
expect(result.results).toEqual([
eservice1,
eservice2,
eservice3,
eservice4,
eservice5,
]);
});
it("should get the eServices if they exist (parameters: states)", async () => {
const result = await catalogService.getEServices(
getMockAuthData(),
Expand Down Expand Up @@ -344,6 +395,148 @@ describe("get eservices", () => {
expect(result.totalCount).toBe(1);
expect(result.results).toEqual([eservice5]);
});
it("should get the eServices, including the ones with an active delegation, if they exist (parameters: producersIds, states, name)", async () => {
const delegatedOrganization1: TenantId = generateId();
const delegatedOrganization2: TenantId = generateId();

const delegatedEService1: EService = {
...mockEService,
id: generateId(),
name: "delegated eservice 1 test",
producerId: organizationId1,
descriptors: [
{
...mockDescriptor,
id: generateId(),
interface: mockDocument,
state: descriptorState.published,
},
],
};

const delegatedEService2: EService = {
...mockEService,
id: generateId(),
name: "delegated eservice 2",
producerId: organizationId1,
descriptors: [
{
...mockDescriptor,
id: generateId(),
interface: mockDocument,
state: descriptorState.published,
},
],
};

const delegatedEService3: EService = {
...mockEService,
id: generateId(),
name: "delegated eservice 3 test",
producerId: organizationId1,
descriptors: [
{
...mockDescriptor,
id: generateId(),
state: descriptorState.draft,
},
],
};

const delegatedEService4: EService = {
...mockEService,
id: generateId(),
name: "delegated eservice 4 test",
producerId: organizationId1,
descriptors: [
{
...mockDescriptor,
id: generateId(),
state: descriptorState.published,
},
],
};

const delegatedEService5: EService = {
...mockEService,
id: generateId(),
name: "delegated eservice 5 test",
producerId: organizationId1,
descriptors: [
{
...mockDescriptor,
id: generateId(),
state: descriptorState.published,
},
],
};

await addOneEService(delegatedEService1);
await addOneEService(delegatedEService2);
await addOneEService(delegatedEService3);
await addOneEService(delegatedEService4);
await addOneEService(delegatedEService5);

await addOneDelegation({
...getMockDelegationProducer(),
eserviceId: delegatedEService1.id,
delegateId: delegatedOrganization1,
state: delegationState.active,
});

await addOneDelegation({
...getMockDelegationProducer(),
eserviceId: delegatedEService2.id,
delegateId: delegatedOrganization1,
state: delegationState.active,
});

await addOneDelegation({
...getMockDelegationProducer(),
eserviceId: delegatedEService3.id,
delegateId: delegatedOrganization1,
state: delegationState.active,
});

await addOneDelegation({
...getMockDelegationProducer(),
eserviceId: delegatedEService4.id,
delegateId: delegatedOrganization2,
state: delegationState.active,
});

await addOneDelegation({
...getMockDelegationProducer(),
eserviceId: delegatedEService5.id,
delegateId: delegatedOrganization2,
state: delegationState.waitingForApproval,
});

const result = await catalogService.getEServices(
getMockAuthData(),
{
eservicesIds: [],
producersIds: [
organizationId2,
delegatedOrganization1,
delegatedOrganization2,
],
states: ["Published"],
agreementStates: [],
name: "test",
attributesIds: [],
},
0,
50,
genericLogger
);
expect(result.totalCount).toBe(3);
expect(result.results).toEqual([
delegatedEService1,
delegatedEService4,
eservice5,
]);
});
it("should not get the eServices if they don't exist (parameters: producersIds, states, name)", async () => {
const result = await catalogService.getEServices(
getMockAuthData(),
Expand Down Expand Up @@ -444,7 +637,7 @@ describe("get eservices", () => {
});
});

it("should get the eServices if they exist (parameters: producerIds, mode)", async () => {
it("should get the eServices if they exist (parameters: producersIds, mode)", async () => {
const result = await catalogService.getEServices(
getMockAuthData(),
{
Expand All @@ -465,6 +658,127 @@ describe("get eservices", () => {
});
});

it("should get the eServices, including the ones with an active delegation, if they exist (parameters: producersIds, mode)", async () => {
const delegatedOrganization1: TenantId = generateId();
const delegatedOrganization2: TenantId = generateId();

const delegatedEService1: EService = {
...mockEService,
id: generateId(),
name: "delegated eservice 1",
producerId: organizationId1,
mode: eserviceMode.deliver,
descriptors: [
{
...mockDescriptor,
id: generateId(),
state: descriptorState.published,
},
],
};

const delegatedEService2: EService = {
...mockEService,
id: generateId(),
name: "delegated eservice 2",
producerId: organizationId1,
mode: eserviceMode.receive,
descriptors: [
{
...mockDescriptor,
id: generateId(),
state: descriptorState.published,
},
],
};

const delegatedEService3: EService = {
...mockEService,
id: generateId(),
name: "delegated eservice 3",
producerId: organizationId1,
mode: eserviceMode.deliver,
descriptors: [
{
...mockDescriptor,
id: generateId(),
state: descriptorState.published,
},
],
};

const delegatedEService4: EService = {
...mockEService,
id: generateId(),
name: "delegated eservice 4",
producerId: organizationId1,
mode: eserviceMode.deliver,
descriptors: [
{
...mockDescriptor,
id: generateId(),
state: descriptorState.published,
},
],
};

await addOneEService(delegatedEService1);
await addOneEService(delegatedEService2);
await addOneEService(delegatedEService3);
await addOneEService(delegatedEService4);

await addOneDelegation({
...getMockDelegationProducer(),
eserviceId: delegatedEService1.id,
delegateId: delegatedOrganization1,
state: delegationState.active,
});

await addOneDelegation({
...getMockDelegationProducer(),
eserviceId: delegatedEService2.id,
delegateId: delegatedOrganization1,
state: delegationState.active,
});

await addOneDelegation({
...getMockDelegationProducer(),
eserviceId: delegatedEService3.id,
delegateId: delegatedOrganization2,
state: delegationState.active,
});

await addOneDelegation({
...getMockDelegationProducer(),
eserviceId: delegatedEService4.id,
delegateId: delegatedOrganization2,
state: delegationState.rejected,
});

const result = await catalogService.getEServices(
getMockAuthData(),
{
eservicesIds: [],
producersIds: [
organizationId2,
delegatedOrganization1,
delegatedOrganization2,
],
states: [],
agreementStates: [],
attributesIds: [],
mode: eserviceMode.deliver,
},
0,
50,
genericLogger
);
expect(result).toEqual({
totalCount: 4,
results: [delegatedEService1, delegatedEService3, eservice4, eservice5],
});
});

it("should not get the eServices if they don't exist (parameters: attributesIds)", async () => {
const result = await catalogService.getEServices(
getMockAuthData(),
Expand Down