DEV -> STG

.github/helpers/.env-selenium

@@ -7,5 +7,6 @@ CELERY_RESULT_BACKEND=redis://redis:6379/0
 CACHE_LOCATION=redis://redis:6379/1
 CONSTANCE_REDIS_CONNECTION=redis://redis:6379/0
 DATABASE_URL=postgis://postgres:postgres@db:5432/postgres
+REP_DATABASE_URL=postgis://postgres:postgres@db:5432/postgres
 USE_DUMMY_EXCHANGE_RATES=yes
 CELERY_TASK_ALWAYS_EAGER=true

.github/helpers/.env-unit

@@ -4,6 +4,7 @@ POSTGRES_DB=postgres
 POSTGRES_USER=postgres
 POSTGRES_PASSWORD=postgres
 DATABASE_URL=postgis://postgres:postgres@db:5432/postgres
+REP_DATABASE_URL=postgis://postgres:postgres@db:5432/postgres
 POSTGRES_SSL_MODE=off
 EMAIL_HOST=TBD
 EMAIL_HOST_USER=TBD

.github/helpers/docker-compose.selenium.yml

@@ -5,7 +5,7 @@ services:
   backend:
     volumes:
       - ../../tests/test-coverage:/code/test-coverage
-      - ../../tests/report/:/code/tests/selenium/output_data/report/
+      - ../../tests/report/:/code/tests/selenium/output_data/
       - type: volume
         source: backend-web-app
         target: /code/src/hct_mis_api/apps/web

.github/workflows/ci.yml

@@ -271,7 +271,7 @@ jobs:
         continue-on-error: true
         with:
           name: report
-          path: ./tests/selenium/output_data/
+          path: ./tests/report/
           retention-days: 5
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v4

development_tools/.env.example

@@ -10,6 +10,7 @@ POSTGRES_PASS=postgres
 PGUSER=postgres
 POSTGRES_HOST_AUTH_METHOD=trust
 DATABASE_URL=postgis://postgres:postgres@db:5432/postgres
+REP_DATABASE_URL=postgis://postgres:postgres@db:5432/postgres
 POSTGRES_SSL_MODE=off
 EMAIL_HOST=TBD
 EMAIL_HOST_USER=TBD

development_tools/compose.yml

@@ -146,7 +146,6 @@ services:
     profiles:
       - default
       - services
-    container_name: elasticsearch
     build:
       context: elasticsearch
       dockerfile: ./Dockerfile

development_tools/local_selenium_init.sh

@@ -11,6 +11,7 @@ export POSTGRES_PASS=postgres
 export PGUSER=postgres
 export POSTGRES_HOST_AUTH_METHOD=trust
 export DATABASE_URL=postgis://postgres:postgres@localhost:5432/postgres
+export REP_DATABASE_URL=postgis://postgres:postgres@localhost:5432/postgres
 export POSTGRES_SSL_MODE=off
 export EMAIL_HOST=TBD
 export EMAIL_HOST_USER=TBD

pyproject.toml

@@ -137,7 +137,7 @@ distribution = true
 
 [project]
 name = "hope"
-version = "2.15.0"
+version = "2.16.0"
 description = "HCT MIS is UNICEF's humanitarian cash transfer platform."
 authors = [
     { name = "Tivix" },

src/frontend/data/schema.graphql

@@ -288,6 +288,19 @@ input BankTransferObjectType {
   accountHolderName: String!
 }
 
+type BeneficiaryGroupNode implements Node {
+  id: ID!
+  createdAt: DateTime!
+  updatedAt: DateTime!
+  name: String!
+  groupLabel: String!
+  groupLabelPlural: String!
+  memberLabel: String!
+  memberLabelPlural: String!
+  masterDetail: Boolean!
+  programs(offset: Int, before: String, after: String, first: Int, last: Int, name: String): ProgramNodeConnection!
+}
+
 scalar BigInt
 
 type BulkGrievanceAddNoteMutation {
@@ -520,11 +533,6 @@ type ContentTypeObjectType {
   id: ID!
   appLabel: String!
   model: String!
-  paymentverificationplanSet(offset: Int, before: String, after: String, first: Int, last: Int): PaymentVerificationPlanNodeConnection!
-  paymentverificationSet(offset: Int, before: String, after: String, first: Int, last: Int): PaymentVerificationNodeConnection!
-  paymentverificationsummarySet(offset: Int, before: String, after: String, first: Int, last: Int): PaymentVerificationSummaryNodeConnection!
-  ticketcomplaintdetailsSet(offset: Int, before: String, after: String, first: Int, last: Int): TicketComplaintDetailsNodeConnection!
-  ticketsensitivedetailsSet(offset: Int, before: String, after: String, first: Int, last: Int): TicketSensitiveDetailsNodeConnection!
   logEntries(offset: Int, before: String, after: String, first: Int, last: Int): PaymentVerificationLogEntryNodeConnection!
   name: String
 }
@@ -699,6 +707,7 @@ input CreateProgramInput {
   administrativeAreasOfImplementation: String
   businessAreaSlug: String
   dataCollectingTypeCode: String
+  beneficiaryGroup: String
   partners: [ProgramPartnerThroughInput]
   partnerAccess: String
   programmeCode: String
@@ -1272,6 +1281,7 @@ type FinancialServiceProviderXlsxTemplateNode implements Node {
   columns: [String]
   coreFields: [String!]!
   flexFields: [String!]!
+  documentTypes: [String!]!
   financialServiceProviders(offset: Int, before: String, after: String, first: Int, last: Int): FinancialServiceProviderNodeConnection!
 }
 
@@ -2129,6 +2139,18 @@ input IndividualUpdateDataObjectType {
   deliveryMechanismData: [DeliveryMechanismDataObjectType]
   deliveryMechanismDataToEdit: [EditDeliveryMechanismDataObjectType]
   deliveryMechanismDataToRemove: [ID]
+  consent: Boolean
+  residenceStatus: String
+  countryOrigin: String
+  country: String
+  address: String
+  village: String
+  currency: String
+  unhcrId: String
+  nameEnumerator: String
+  orgEnumerator: String
+  orgNameEnumerator: String
+  registrationMethod: String
 }
 
 type InvalidPaymentVerificationPlan {
@@ -2513,10 +2535,10 @@ type PaymentNode implements Node {
   fspAuthCode: String
   isCashAssist: Boolean!
   followUps(offset: Int, before: String, after: String, first: Int, last: Int): PaymentNodeConnection!
-  paymentVerification: PaymentVerificationNode
   householdSnapshot: PaymentHouseholdSnapshotNode
-  ticketComplaintDetails: TicketComplaintDetailsNode
-  ticketSensitiveDetails: TicketSensitiveDetailsNode
+  paymentVerifications(offset: Int, before: String, after: String, first: Int, last: Int): PaymentVerificationNodeConnection!
+  ticketComplaintDetails(offset: Int, before: String, after: String, first: Int, last: Int): TicketComplaintDetailsNodeConnection!
+  ticketSensitiveDetails(offset: Int, before: String, after: String, first: Int, last: Int): TicketSensitiveDetailsNodeConnection!
   adminUrl: String
   paymentPlanHardConflicted: Boolean
   paymentPlanHardConflictedData: [PaymentConflictDataNode]
@@ -2607,13 +2629,13 @@ type PaymentPlanNode implements Node {
   excludeHouseholdError: String!
   name: String
   isCashAssist: Boolean!
+  approvalProcess(offset: Int, before: String, after: String, first: Int, last: Int): ApprovalProcessNodeConnection!
   followUps(offset: Int, before: String, after: String, first: Int, last: Int): PaymentPlanNodeConnection!
   deliveryMechanisms: [DeliveryMechanismPerPaymentPlanNode]
   paymentItems(offset: Int, before: String, after: String, first: Int, last: Int): PaymentNodeConnection!
+  documents(offset: Int, before: String, after: String, first: Int, last: Int): PaymentPlanSupportingDocumentNodeConnection!
   paymentVerificationPlans(offset: Int, before: String, after: String, first: Int, last: Int): PaymentVerificationPlanNodeConnection!
   paymentVerificationSummary: PaymentVerificationSummaryNode
-  approvalProcess(offset: Int, before: String, after: String, first: Int, last: Int): ApprovalProcessNodeConnection!
-  documents(offset: Int, before: String, after: String, first: Int, last: Int): PaymentPlanSupportingDocumentNodeConnection!
   adminUrl: String
   currencyName: String
   hasPaymentListExportFile: Boolean
@@ -2748,8 +2770,6 @@ type PaymentVerificationNode implements Node {
   updatedAt: DateTime!
   version: BigInt!
   paymentVerificationPlan: PaymentVerificationPlanNode!
-  paymentContentType: ContentTypeObjectType
-  paymentObjectId: UUID
   payment: GenericPaymentNode
   status: PaymentVerificationStatus!
   statusDate: DateTime
@@ -2780,8 +2800,6 @@ type PaymentVerificationPlanNode implements Node {
   version: BigInt!
   unicefId: String
   status: PaymentVerificationPlanStatus!
-  paymentPlanContentType: ContentTypeObjectType
-  paymentPlanObjectId: UUID
   paymentPlan: PaymentPlanNode
   sampling: PaymentVerificationPlanSampling!
   verificationChannel: PaymentVerificationPlanVerificationChannel!
@@ -2861,20 +2879,6 @@ type PaymentVerificationSummaryNode implements Node {
   activationDate: DateTime
   completionDate: DateTime
   paymentPlan: PaymentPlanNode
-  paymentPlanContentType: ContentTypeObjectType
-  paymentPlanObjectId: UUID
-}
-
-type PaymentVerificationSummaryNodeConnection {
-  pageInfo: PageInfo!
-  edges: [PaymentVerificationSummaryNodeEdge]!
-  totalCount: Int
-  edgeCount: Int
-}
-
-type PaymentVerificationSummaryNodeEdge {
-  node: PaymentVerificationSummaryNode
-  cursor: String!
 }
 
 enum PaymentVerificationSummaryStatus {
@@ -2988,6 +2992,7 @@ type ProgramNode implements Node {
   partners: [PartnerNode]
   biometricDeduplicationEnabled: Boolean!
   deduplicationSetId: UUID
+  beneficiaryGroup: BeneficiaryGroupNode
   pduFields: [PeriodicFieldNode]
   households(offset: Int, before: String, after: String, first: Int, last: Int): HouseholdNodeConnection!
   householdSet(offset: Int, before: String, after: String, first: Int, last: Int): HouseholdNodeConnection!
@@ -3134,7 +3139,7 @@ type Query {
   paymentVerificationStatusChoices: [ChoiceObject]
   allRapidProFlows(businessAreaSlug: String!): [RapidProFlow]
   sampleSize(input: GetCashplanVerificationSampleSizeInput): GetCashplanVerificationSampleSizeObject
-  allPaymentVerificationLogEntries(offset: Int, before: String, after: String, first: Int, last: Int, objectId: UUID, user: ID, businessArea: String!, search: String, module: String, userId: String, programId: String, objectType: String): PaymentVerificationLogEntryNodeConnection
+  allPaymentVerificationLogEntries(offset: Int, before: String, after: String, first: Int, last: Int, objectId: UUID, user: ID, businessArea: String!, search: String, module: String, userId: String, programId: String): PaymentVerificationLogEntryNodeConnection
   paymentPlan(id: ID!): PaymentPlanNode
   allPaymentPlans(offset: Int, before: String, after: String, first: Int, last: Int, businessArea: String!, search: String, status: [String], totalEntitledQuantityFrom: Float, totalEntitledQuantityTo: Float, dispersionStartDate: Date, dispersionEndDate: Date, isFollowUp: Boolean, sourcePaymentPlanId: String, program: String, programCycle: String, orderBy: String): PaymentPlanNodeConnection
   paymentPlanStatusChoices: [ChoiceObject]
@@ -3157,7 +3162,7 @@ type Query {
   dataCollectionTypeChoices: [DataCollectingTypeChoiceObject]
   pduSubtypeChoices: [PDUSubtypeChoiceObject]
   program(id: ID!): ProgramNode
-  allPrograms(offset: Int, before: String, after: String, first: Int, last: Int, businessArea: String!, search: String, status: [String], sector: [String], numberOfHouseholds: String, budget: String, startDate: Date, endDate: Date, name: String, numberOfHouseholdsWithTpInProgram: String, dataCollectingType: String, compatibleDct: Boolean, orderBy: String): ProgramNodeConnection
+  allPrograms(offset: Int, before: String, after: String, first: Int, last: Int, businessArea: String!, search: String, status: [String], sector: [String], numberOfHouseholds: String, budget: String, startDate: Date, endDate: Date, name: String, beneficiaryGroupMatch: Boolean, numberOfHouseholdsWithTpInProgram: String, dataCollectingType: String, compatibleDct: Boolean, orderBy: String): ProgramNodeConnection
   chartProgrammesBySector(businessAreaSlug: String!, year: Int!, program: String, administrativeArea: String): ChartDetailedDatasetsNode
   chartTotalTransferredByMonth(businessAreaSlug: String!, year: Int!, program: String, administrativeArea: String): ChartDetailedDatasetsNode
   programStatusChoices: [ChoiceObject]
@@ -3167,7 +3172,7 @@ type Query {
   programScopeChoices: [ChoiceObject]
   cashPlanStatusChoices: [ChoiceObject]
   dataCollectingTypeChoices: [ChoiceObject]
-  allActivePrograms(offset: Int, before: String, after: String, first: Int, last: Int, businessArea: String!, search: String, status: [String], sector: [String], numberOfHouseholds: String, budget: String, startDate: Date, endDate: Date, name: String, numberOfHouseholdsWithTpInProgram: String, dataCollectingType: String, compatibleDct: Boolean, orderBy: String): ProgramNodeConnection
+  allActivePrograms(offset: Int, before: String, after: String, first: Int, last: Int, businessArea: String!, search: String, status: [String], sector: [String], numberOfHouseholds: String, budget: String, startDate: Date, endDate: Date, name: String, beneficiaryGroupMatch: Boolean, numberOfHouseholdsWithTpInProgram: String, dataCollectingType: String, compatibleDct: Boolean, orderBy: String): ProgramNodeConnection
   programCycle(id: ID!): ProgramCycleNode
   canRunDeduplication: Boolean
   isDeduplicationDisabled: Boolean
@@ -4126,8 +4131,6 @@ type TicketComplaintDetailsNode implements Node {
   id: ID!
   createdAt: DateTime!
   updatedAt: DateTime!
-  paymentContentType: ContentTypeObjectType
-  paymentObjectId: UUID
   household: HouseholdNode
   individual: IndividualNode
   payment: PaymentNode
@@ -4399,8 +4402,6 @@ type TicketSensitiveDetailsNode implements Node {
   id: ID!
   createdAt: DateTime!
   updatedAt: DateTime!
-  paymentContentType: ContentTypeObjectType
-  paymentObjectId: UUID
   household: HouseholdNode
   individual: IndividualNode
   payment: PaymentNode
@@ -4550,6 +4551,7 @@ input UpdateProgramInput {
   populationGoal: Int
   administrativeAreasOfImplementation: String
   dataCollectingTypeCode: String
+  beneficiaryGroup: String
   programmeCode: String
   pduFields: [PDUFieldInput]
 }
@@ -4681,13 +4683,13 @@ type UserNode implements Node {
   doapHash: String!
   userRoles: [UserRoleNode!]!
   documentSet(offset: Int, before: String, after: String, first: Int, last: Int): DocumentNodeConnection!
+  approvalSet: [ApprovalNode!]!
   registrationDataImports(offset: Int, before: String, after: String, first: Int, last: Int): RegistrationDataImportNodeConnection!
   createdPaymentPlans(offset: Int, before: String, after: String, first: Int, last: Int): PaymentPlanNodeConnection!
   createdFinancialServiceProviderXlsxTemplates(offset: Int, before: String, after: String, first: Int, last: Int): FinancialServiceProviderXlsxTemplateNodeConnection!
   createdFinancialServiceProviders(offset: Int, before: String, after: String, first: Int, last: Int): FinancialServiceProviderNodeConnection!
   createdDeliveryMechanisms(offset: Int, before: String, after: String, first: Int, last: Int): DeliveryMechanismPerPaymentPlanNodeConnection!
   sentDeliveryMechanisms(offset: Int, before: String, after: String, first: Int, last: Int): DeliveryMechanismPerPaymentPlanNodeConnection!
-  approvalSet: [ApprovalNode!]!
   createdTickets(offset: Int, before: String, after: String, first: Int, last: Int): GrievanceTicketNodeConnection!
   assignedTickets(offset: Int, before: String, after: String, first: Int, last: Int): GrievanceTicketNodeConnection!
   ticketNotes(offset: Int, before: String, after: String, first: Int, last: Int): TicketNoteNodeConnection!