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.

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

Remove TargetPopulation and HouseholdSelection models #4581

Merged
merged 56 commits into from
Feb 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
c3dc83d
remove TP i HS
pavlo-mk Jan 20, 2025
c9a6fef
Merge branch 'develop' into remove_models_tp
pavlo-mk Jan 20, 2025
a332a97
fix tests & fixes
pavlo-mk Jan 21, 2025
27a3563
fix more unit tests
pavlo-mk Jan 21, 2025
83b62b0
tests
pavlo-mk Jan 22, 2025
052531a
clean up
pavlo-mk Jan 22, 2025
30ff090
fix
pavlo-mk Jan 22, 2025
351dec8
fixes again
pavlo-mk Jan 22, 2025
bc7836a
Merge branch 'develop' into remove_models_tp
pavlo-mk Jan 22, 2025
263c783
upd filters
pavlo-mk Jan 23, 2025
7560d95
Merge branch 'develop' into remove_models_tp
pavlo-mk Jan 23, 2025
cc3b9d7
upd test
pavlo-mk Jan 23, 2025
14f1a4e
small fixes & add more unit tests
pavlo-mk Jan 23, 2025
e6d7e4e
generate schema, remove old properties from queries
Jan 23, 2025
8102df7
pragma no cover
pavlo-mk Jan 23, 2025
c10209c
more adjustments
Jan 23, 2025
ce56184
add filter_by_household_id
pavlo-mk Jan 24, 2025
07c8c7d
coverage & set PP.targeting_criteria not nullable
pavlo-mk Jan 24, 2025
e0ecd96
upd migrations
pavlo-mk Jan 24, 2025
78a6d70
upd tests
pavlo-mk Jan 24, 2025
464e961
upd schema
pavlo-mk Jan 24, 2025
b6deb35
more changes
Jan 24, 2025
4b1da65
fix tests
Jan 24, 2025
326078c
temp fix
pavlo-mk Jan 24, 2025
638a254
add status filtering to payment verification page
Jan 27, 2025
551d2fd
Merge branch 'develop' into remove_models_tp
mmaciekk Jan 27, 2025
2e33c07
fix snapshot
Jan 27, 2025
c32a014
fix status in test_payment_verification
Jan 27, 2025
82599ce
upd filter
pavlo-mk Jan 27, 2025
37d5ca6
fix filter & upd tests
pavlo-mk Jan 27, 2025
0772f76
remove arr in arr verificationStatus
Jan 27, 2025
f6799db
fix PV page, PP plan page displays
Jan 27, 2025
f6b845b
upd unit test
pavlo-mk Jan 28, 2025
ebb8e3e
Merge branch 'develop' into remove_models_tp
pavlo-mk Jan 28, 2025
73b9e1c
test one more time
pavlo-mk Jan 28, 2025
cf90653
migration & conflicts
pavlo-mk Jan 31, 2025
54849d6
conflicts
pavlo-mk Jan 31, 2025
4477182
remove empy files
pavlo-mk Jan 31, 2025
7228b06
test
pavlo-mk Jan 31, 2025
3a3cc42
test unit
pavlo-mk Jan 31, 2025
82cbc29
more ut
pavlo-mk Jan 31, 2025
22aef92
upd tests
pavlo-mk Jan 31, 2025
033eb01
upd tests
pavlo-mk Jan 31, 2025
1fde0cc
upd tests
pavlo-mk Jan 31, 2025
30ce4c6
pragma added
pavlo-mk Jan 31, 2025
e22a697
comment
pavlo-mk Jan 31, 2025
268faef
upd coverage
pavlo-mk Jan 31, 2025
0776455
Merge branch 'develop' into remove_models_tp
pavlo-mk Jan 31, 2025
1def4de
Merge branch 'develop' into remove_models_tp
pavlo-mk Feb 10, 2025
63d5396
merge develop
pavlo-mk Feb 11, 2025
74361aa
fix snapshot
Feb 11, 2025
85a9b59
Merge branch 'develop' into remove_models_tp
pavlo-mk Feb 12, 2025
c65f9f8
conflicts
pavlo-mk Feb 13, 2025
fee5cc9
review
pavlo-mk Feb 13, 2025
02a2f2c
merge develop
pavlo-mk Feb 13, 2025
67e685b
fix filters & upd utests
pavlo-mk Feb 13, 2025
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
100 changes: 9 additions & 91 deletions src/frontend/data/schema.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -392,33 +392,6 @@ type BusinessAreaNodeEdge {
cursor: String!
}

type CashPlanAndPaymentPlanEdges {
cursor: String
node: CashPlanAndPaymentPlanNode
}

type CashPlanAndPaymentPlanNode {
adminUrl: String
objType: String
id: String
unicefId: String
verificationStatus: String
status: String
currency: String
totalDeliveredQuantity: Float
startDate: String
endDate: String
programName: String
updatedAt: String
verificationPlans: [PaymentVerificationPlanNode]
totalNumberOfHouseholds: Int
totalEntitledQuantity: Float
totalUndeliveredQuantity: Float
assistanceMeasurement: String
dispersionDate: String
serviceProviderFullName: String
}

input CategoryExtrasInput {
sensitiveGrievanceTicketExtras: SensitiveGrievanceTicketExtras
grievanceComplaintTicketExtras: GrievanceComplaintTicketExtras
Expand Down Expand Up @@ -1453,7 +1426,7 @@ type GrievanceTicketNode implements Node {
adminUrl: String
household: HouseholdNode
individual: IndividualNode
paymentRecord: PaymentRecordAndPaymentNode
paymentRecord: PaymentNode
admin: String
existingTickets: [GrievanceTicketNode]
relatedTickets: [GrievanceTicketNode]
Expand Down Expand Up @@ -1605,12 +1578,10 @@ type HouseholdNode implements Node {
positiveFeedbackTicketDetails(offset: Int, before: String, after: String, first: Int, last: Int): TicketPositiveFeedbackDetailsNodeConnection!
negativeFeedbackTicketDetails(offset: Int, before: String, after: String, first: Int, last: Int): TicketNegativeFeedbackDetailsNodeConnection!
referralTicketDetails(offset: Int, before: String, after: String, first: Int, last: Int): TicketReferralDetailsNodeConnection!
selections: [HouseholdSelectionNode!]!
messages(offset: Int, before: String, after: String, first: Int, last: Int): CommunicationMessageNodeConnection!
feedbacks(offset: Int, before: String, after: String, first: Int, last: Int): FeedbackNodeConnection!
surveys(offset: Int, before: String, after: String, first: Int, last: Int): SurveyNodeConnection!
adminUrl: String
selection: HouseholdSelectionNode
sanctionListPossibleMatch: Boolean
sanctionListConfirmedMatch: Boolean
hasDuplicates: Boolean
Expand Down Expand Up @@ -1652,16 +1623,6 @@ enum HouseholdRegistrationMethod {
HH_REGISTRATION
}

type HouseholdSelectionNode {
id: UUID!
createdAt: DateTime!
updatedAt: DateTime!
household: HouseholdNode!
vulnerabilityScore: Float
isOriginal: Boolean!
isMigrationHandled: Boolean!
}

input HouseholdUpdateDataObjectType {
adminAreaTitle: String
status: String
Expand Down Expand Up @@ -2376,25 +2337,6 @@ type PageInfo {
endCursor: String
}

type PageInfoNode {
startCursor: String
endCursor: String
hasNextPage: Boolean
hasPreviousPage: Boolean
}

type PaginatedCashPlanAndPaymentPlanNode {
pageInfo: PageInfoNode
edges: [CashPlanAndPaymentPlanEdges]
totalCount: Int
}

type PaginatedPaymentRecordsAndPaymentsNode {
pageInfo: PageInfoNode
edges: [PaymentRecordsAndPaymentsEdges]
totalCount: Int
}

type PartnerNode {
id: ID!
allowedBusinessAreas(offset: Int, before: String, after: String, first: Int, last: Int, id: UUID): UserBusinessAreaNodeConnection!
Expand Down Expand Up @@ -2590,7 +2532,7 @@ type PaymentPlanNode implements Node {
backgroundActionStatus: PaymentPlanBackgroundActionStatus
buildStatus: PaymentPlanBuildStatus
builtAt: DateTime
targetingCriteria: TargetingCriteriaNode
targetingCriteria: TargetingCriteriaNode!
currency: String
dispersionStartDate: Date
dispersionEndDate: Date
Expand Down Expand Up @@ -2684,8 +2626,6 @@ enum PaymentPlanStatus {
IN_REVIEW
ACCEPTED
FINISHED
MIGRATION_BLOCKED
MIGRATION_FAILED
}

type PaymentPlanSupportingDocumentNode implements Node {
Expand All @@ -2707,26 +2647,6 @@ type PaymentPlanSupportingDocumentNodeEdge {
cursor: String!
}

type PaymentRecordAndPaymentNode {
objType: String
id: String
unicefId: String
status: String
fullName: String
parent: CashPlanAndPaymentPlanNode
entitlementQuantity: Float
deliveredQuantity: Float
deliveredQuantityUsd: Float
currency: String
deliveryDate: String
verification: PaymentVerificationNode
}

type PaymentRecordsAndPaymentsEdges {
cursor: String
node: PaymentRecordAndPaymentNode
}

enum PaymentStatus {
DISTRIBUTION_SUCCESSFUL
NOT_DISTRIBUTED
Expand Down Expand Up @@ -3111,8 +3031,7 @@ type Query {
grievanceTicketUrgencyChoices: [ChoiceObjectInt]
allSteficonRules(offset: Int, before: String, after: String, first: Int, last: Int, enabled: Boolean, deprecated: Boolean, type: String!): SteficonRuleNodeConnection
payment(id: ID!): PaymentNode
allPayments(offset: Int, before: String, after: String, first: Int, last: Int, businessArea: String!, paymentPlanId: String!, programId: String, orderBy: String): PaymentNodeConnection
allPaymentRecordsAndPayments(businessArea: String!, program: String, household: ID, orderBy: String, first: Int, last: Int, before: String, after: String): PaginatedPaymentRecordsAndPaymentsNode
allPayments(offset: Int, before: String, after: String, first: Int, last: Int, businessArea: String!, paymentPlanId: String, programId: String, householdId: String, orderBy: String): PaymentNodeConnection
financialServiceProviderXlsxTemplate(id: ID!): FinancialServiceProviderXlsxTemplateNode
allFinancialServiceProviderXlsxTemplates(offset: Int, before: String, after: String, first: Int, last: Int, financialServiceProviders: [ID], name: String, createdBy: ID, orderBy: String): FinancialServiceProviderXlsxTemplateNodeConnection
financialServiceProvider(id: ID!): FinancialServiceProviderNode
Expand Down Expand Up @@ -3140,13 +3059,12 @@ type Query {
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): PaymentVerificationLogEntryNodeConnection
paymentPlan(id: ID!): PaymentPlanNode
allPaymentPlans(offset: Int, before: String, after: String, first: Int, last: Int, businessArea: String!, search: String, status: [String], statusNot: String, totalEntitledQuantityFrom: Float, totalEntitledQuantityTo: Float, dispersionStartDate: Date, dispersionEndDate: Date, isFollowUp: Boolean, isPaymentPlan: Boolean, isTargetPopulation: Boolean, sourcePaymentPlanId: String, program: String, programCycle: String, name: String, totalHouseholdsCountMin: Int, totalHouseholdsCountMax: Int, totalHouseholdsCountWithValidPhoneNoMax: Int, totalHouseholdsCountWithValidPhoneNoMin: Int, createdAtRange: String, orderBy: String): PaymentPlanNodeConnection
allPaymentPlans(offset: Int, before: String, after: String, first: Int, last: Int, businessArea: String!, search: String, status: [String], statusNot: String, verificationStatus: [String], totalEntitledQuantityFrom: Float, totalEntitledQuantityTo: Float, dispersionStartDate: Date, dispersionEndDate: Date, startDate: Date, endDate: Date, isFollowUp: Boolean, isPaymentPlan: Boolean, isTargetPopulation: Boolean, sourcePaymentPlanId: String, program: String, programCycle: String, name: String, totalHouseholdsCountMin: Int, totalHouseholdsCountMax: Int, totalHouseholdsCountWithValidPhoneNoMax: Int, totalHouseholdsCountWithValidPhoneNoMin: Int, createdAtRange: String, serviceProvider: String, deliveryTypes: [String], orderBy: String): PaymentPlanNodeConnection
paymentPlanStatusChoices: [ChoiceObject]
currencyChoices: [ChoiceObject]
allDeliveryMechanisms: [ChoiceObject]
paymentPlanBackgroundActionStatusChoices: [ChoiceObject]
availableFspsForDeliveryMechanisms(input: AvailableFspsForDeliveryMechanismsInput): [FspChoices]
allCashPlansAndPaymentPlans(businessArea: String!, program: String, search: String, serviceProvider: String, deliveryType: [String], verificationStatus: [String], startDateGte: String, endDateLte: String, orderBy: String, first: Int, last: Int, before: String, after: String, isPaymentVerificationPage: Boolean): PaginatedCashPlanAndPaymentPlanNode
businessArea(businessAreaSlug: String!): BusinessAreaNode
allBusinessAreas(offset: Int, before: String, after: String, first: Int, last: Int, id: UUID, slug: String): BusinessAreaNodeConnection
allFieldsAttributes(flexField: Boolean, businessAreaSlug: String, programId: String): [FieldAttributeNode]
Expand Down Expand Up @@ -3176,7 +3094,7 @@ type Query {
canRunDeduplication: Boolean
isDeduplicationDisabled: Boolean
household(id: ID!): HouseholdNode
allHouseholds(offset: Int, before: String, after: String, first: Int, last: Int, businessArea: String, address: String, address_Startswith: String, headOfHousehold_FullName: String, headOfHousehold_FullName_Startswith: String, size_Range: [Int], size_Lte: Int, size_Gte: Int, adminArea: ID, admin1: ID, admin2: ID, targetPopulations: [ID], residenceStatus: String, withdrawn: Boolean, program: ID, firstRegistrationDate: DateTime, rdiId: String, size: String, search: String, documentType: String, documentNumber: String, headOfHousehold_PhoneNoValid: Boolean, lastRegistrationDate: String, countryOrigin: String, isActiveProgram: Boolean, rdiMergeStatus: String, orderBy: String): HouseholdNodeConnection
allHouseholds(offset: Int, before: String, after: String, first: Int, last: Int, businessArea: String, address: String, address_Startswith: String, headOfHousehold_FullName: String, headOfHousehold_FullName_Startswith: String, size_Range: [Int], size_Lte: Int, size_Gte: Int, adminArea: ID, admin1: ID, admin2: ID, residenceStatus: String, withdrawn: Boolean, program: ID, firstRegistrationDate: DateTime, rdiId: String, size: String, search: String, documentType: String, documentNumber: String, headOfHousehold_PhoneNoValid: Boolean, lastRegistrationDate: String, countryOrigin: String, isActiveProgram: Boolean, rdiMergeStatus: String, orderBy: String): HouseholdNodeConnection
individual(id: ID!): IndividualNode
allIndividuals(offset: Int, before: String, after: String, first: Int, last: Int, household_Id: UUID, businessArea: String, fullName: String, fullName_Startswith: String, fullName_Endswith: String, sex: [String], household_AdminArea: ID, withdrawn: Boolean, program: ID, age: String, programs: [ID], search: String, documentType: String, documentNumber: String, lastRegistrationDate: String, admin1: [ID], admin2: [ID], status: [String], excludedId: String, flags: [String], isActiveProgram: Boolean, rdiId: String, duplicatesOnly: Boolean, rdiMergeStatus: String, orderBy: String): IndividualNodeConnection
allMergedHouseholds(offset: Int, before: String, after: String, first: Int, last: Int, businessArea: String, rdiId: String, orderBy: String): HouseholdNodeConnection
Expand Down Expand Up @@ -3881,10 +3799,10 @@ type TargetingCriteriaNode {
updatedAt: DateTime!
flagExcludeIfActiveAdjudicationTicket: Boolean!
flagExcludeIfOnSanctionList: Boolean!
householdIds: String
individualIds: String
paymentPlan: PaymentPlanNode
rules: [TargetingCriteriaRuleNode]
householdIds: String
individualIds: String
}

input TargetingCriteriaObjectType {
Expand Down Expand Up @@ -4033,7 +3951,7 @@ type TicketComplaintDetailsNode implements Node {
household: HouseholdNode
individual: IndividualNode
payment: PaymentNode
paymentRecord: PaymentRecordAndPaymentNode
paymentRecord: PaymentNode
}

type TicketComplaintDetailsNodeConnection {
Expand Down Expand Up @@ -4304,7 +4222,7 @@ type TicketSensitiveDetailsNode implements Node {
household: HouseholdNode
individual: IndividualNode
payment: PaymentNode
paymentRecord: PaymentRecordAndPaymentNode
paymentRecord: PaymentNode
}

type TicketSensitiveDetailsNodeConnection {
Expand Down
Loading