From 19700007c6157874d1a6f9eff5888f3c204ac606 Mon Sep 17 00:00:00 2001 From: nttdata-rtorsoli Date: Thu, 22 Feb 2024 16:42:44 +0100 Subject: [PATCH 1/2] PIN-4602 BKE agreement-process getAgrrements with showOnlyUpgradeable = true does not work --- .../readmodel/ReadModelAgreementQueries.scala | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/scala/it/pagopa/interop/agreementprocess/common/readmodel/ReadModelAgreementQueries.scala b/src/main/scala/it/pagopa/interop/agreementprocess/common/readmodel/ReadModelAgreementQueries.scala index 8bd13a0c..c0e1360a 100644 --- a/src/main/scala/it/pagopa/interop/agreementprocess/common/readmodel/ReadModelAgreementQueries.scala +++ b/src/main/scala/it/pagopa/interop/agreementprocess/common/readmodel/ReadModelAgreementQueries.scala @@ -104,7 +104,7 @@ object ReadModelAgreementQueries extends ReadModelQuery { Document("""{ $filter: { input: "$eservices.data.descriptors", as: "descr", - cond: { $eq: ["$$descr.id" , "$data.descriptorId"]}}} }""") + cond: { $eq: ["$$descr.id" , "$data.descriptorId"]}}}""") ) ), unwind("$currentDescriptor"), @@ -116,10 +116,10 @@ object ReadModelAgreementQueries extends ReadModelQuery { input: "$eservices.data.descriptors", as: "upgradable", cond: { $and: [ - {$gt:["$$upgradable.activatedAt", "$currentDescriptor.activatedAt"]}, - {$in:["$$upgradable.state", ['""" + CatalogManagement.Published + """', '""" + - CatalogManagement.Suspended + """']]} - ]}}} }""" + {$gt:["$$upgradable.publishedAt", "$currentDescriptor.publishedAt"]}, + {$in:["$$upgradable.state", ['""" + CatalogManagement.Published.toString + """', '""" + + CatalogManagement.Suspended.toString + """']]} + ]}}}""" ) ) ), @@ -134,6 +134,10 @@ object ReadModelAgreementQueries extends ReadModelQuery { Seq(count("totalCount"), project(computed("data", Document("""{ "totalCount" : "$totalCount" }""")))) } + System.out.println("*******************************************") + System.out.println(eServicesLookupPipeline ++ upgradablePipeline) + System.out.println("*******************************************") + for { agreements <- readModel.aggregate[PersistentAgreement]( "agreements", From c20b45b91c183d78d815ad4473624710f594d8e1 Mon Sep 17 00:00:00 2001 From: nttdata-rtorsoli Date: Thu, 22 Feb 2024 16:43:57 +0100 Subject: [PATCH 2/2] PIN-4602 Cleaning --- .../common/readmodel/ReadModelAgreementQueries.scala | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/scala/it/pagopa/interop/agreementprocess/common/readmodel/ReadModelAgreementQueries.scala b/src/main/scala/it/pagopa/interop/agreementprocess/common/readmodel/ReadModelAgreementQueries.scala index c0e1360a..c6c2771e 100644 --- a/src/main/scala/it/pagopa/interop/agreementprocess/common/readmodel/ReadModelAgreementQueries.scala +++ b/src/main/scala/it/pagopa/interop/agreementprocess/common/readmodel/ReadModelAgreementQueries.scala @@ -134,10 +134,6 @@ object ReadModelAgreementQueries extends ReadModelQuery { Seq(count("totalCount"), project(computed("data", Document("""{ "totalCount" : "$totalCount" }""")))) } - System.out.println("*******************************************") - System.out.println(eServicesLookupPipeline ++ upgradablePipeline) - System.out.println("*******************************************") - for { agreements <- readModel.aggregate[PersistentAgreement]( "agreements",