Skip to content

REST Target Population > Payment Plan > Payment Verification [All in one XD] #4698

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

Merged
merged 196 commits into from
Apr 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
196 commits
Select commit Hold shift + click to select a range
6dc9b70
add new serializers
pavlo-mk Mar 19, 2025
7234d5b
Merge branch 'long-term/rest-api-refactor' into rest/payment-plan
pavlo-mk Mar 19, 2025
e639a45
WIP: add new fields
pavlo-mk Mar 19, 2025
f5a6191
WIP: add new fields part 2
pavlo-mk Mar 19, 2025
4015828
WIP: fixes & upd filters
pavlo-mk Mar 20, 2025
169e315
Merge branch 'long-term/rest-api-refactor' into rest/payment-plan
pavlo-mk Mar 21, 2025
bfc67cc
add test list pp
pavlo-mk Mar 21, 2025
45f9a19
add more utests
pavlo-mk Mar 21, 2025
ddf2c9e
add more tests & filters
pavlo-mk Mar 21, 2025
55b4ce3
add cache
pavlo-mk Mar 21, 2025
45210aa
Merge branch 'long-term/rest-api-refactor' into rest/payment-plan
pavlo-mk Mar 21, 2025
c70e501
upd
pavlo-mk Mar 21, 2025
6735fac
add TP list details
pavlo-mk Mar 24, 2025
a625db6
fix cache pp/tp list
pavlo-mk Mar 25, 2025
23d2f3c
add payments, hhs list
pavlo-mk Mar 25, 2025
20d6e2f
test with lookup_field
pavlo-mk Mar 25, 2025
d9433b2
add more tests
pavlo-mk Mar 26, 2025
e5cecba
Merge branch 'long-term/rest-api-refactor' into rest/payment-plan
pavlo-mk Mar 26, 2025
6db1669
more tests
pavlo-mk Mar 26, 2025
a716934
PaymentPlanDetail instead of PaymentPlanQuery, is_follow_up instead o…
Mar 26, 2025
7ecb5c9
more updates ufter changing to Payment Plan hook
Mar 26, 2025
c684b34
more changes
Mar 27, 2025
8ff6b99
add ApprovalProcessSerializer
pavlo-mk Mar 27, 2025
4ed6ab7
Merge remote-tracking branch 'origin' into rest/payment-plan
Mar 27, 2025
db6a64e
add more fields
pavlo-mk Mar 27, 2025
5964c5c
Merge remote-tracking branch 'origin/rest/payment-plan' into rest/pay…
pavlo-mk Mar 27, 2025
5853d0a
conflicts
pavlo-mk Mar 27, 2025
0177d49
tests
pavlo-mk Mar 28, 2025
49fd880
tests
pavlo-mk Mar 28, 2025
37de80d
Merge branch 'long-term/rest-api-refactor' into rest/payment-plan
pavlo-mk Mar 28, 2025
4b04cda
add more fields
pavlo-mk Mar 28, 2025
153d3ea
add more fields & tests
pavlo-mk Mar 28, 2025
40aa817
more changes
Mar 28, 2025
34bccaf
tests and more serializers
pavlo-mk Mar 28, 2025
9df58c5
Merge remote-tracking branch 'origin/rest/payment-plan' into rest/pay…
pavlo-mk Mar 28, 2025
c29365c
more fields
pavlo-mk Mar 28, 2025
ad4f113
add eligible_payments_count
pavlo-mk Mar 28, 2025
fa8cbf2
eligible_payments_count frontend
Mar 28, 2025
a1e5820
Merge branch 'long-term/rest-api-refactor' into rest/payment-plan
pavlo-mk Mar 28, 2025
e3317c4
fixes & tests & add program small
pavlo-mk Mar 31, 2025
db1a6fb
Update serializers.py
pavlo-mk Mar 31, 2025
ef1e79e
upd FollowUpPaymentPlanSerializer
pavlo-mk Mar 31, 2025
e455e0e
add program_cycle_id
pavlo-mk Mar 31, 2025
b5bac00
more changes
Mar 31, 2025
20a72aa
add new ser
pavlo-mk Apr 1, 2025
2af36b1
generated
Apr 1, 2025
6891d37
tp list + details query
Apr 1, 2025
29888e7
Merge branch 'long-term/rest-api-refactor' into rest/payment-plan
pavlo-mk Apr 4, 2025
3328983
WIP // REST TP/PP CRUD (#4729)
pavlo-mk Apr 4, 2025
a711efe
Merge branch 'long-term/rest-api-refactor' into rest/payment-plan
mmaciekk Apr 4, 2025
1b6c438
conflicts
pavlo-mk Apr 4, 2025
4cf79fa
fix
mmaciekk Apr 7, 2025
b0596bd
add entitlement_import_xlsx
pavlo-mk Apr 7, 2025
1049f4f
generate-rest-api-types-camelcase
pavlo-mk Apr 7, 2025
5417de9
Merge remote-tracking branch 'origin/rest/payment-plan' into rest/pay…
pavlo-mk Apr 7, 2025
68ecdd5
generate-rest-api-types-camelcase
pavlo-mk Apr 7, 2025
3b739cd
rm payment 0024 ?<>?
pavlo-mk Apr 7, 2025
9988d19
generate types
mmaciekk Apr 7, 2025
c8782db
Merge remote-tracking branch 'origin' into rest/payment-plan
mmaciekk Apr 7, 2025
96ae105
add more api endpoints
pavlo-mk Apr 7, 2025
07cc771
tests & fixes
pavlo-mk Apr 7, 2025
ded9503
next part fixes
mmaciekk Apr 7, 2025
35713c0
more changes
mmaciekk Apr 7, 2025
d5e488e
more changes
mmaciekk Apr 7, 2025
d491887
new fields
pavlo-mk Apr 8, 2025
3cba2ca
add types everywhere (useQuery)
mmaciekk Apr 8, 2025
9b69d17
Merge branch 'long-term/rest-api-refactor' into rest/payment-plan
mmaciekk Apr 8, 2025
47e6451
Merge branch 'long-term/rest-api-refactor' into rest/payment-plan
mmaciekk Apr 8, 2025
ad4c8ef
fixes
pavlo-mk Apr 8, 2025
68c7682
Merge remote-tracking branch 'origin/rest/payment-plan' into rest/pay…
pavlo-mk Apr 8, 2025
620bbe6
fixes & add more tests
pavlo-mk Apr 8, 2025
145f837
more fixes
mmaciekk Apr 8, 2025
9decb6e
fixes
pavlo-mk Apr 8, 2025
7c006f3
rewrite create pp and create follow up pp mutations
mmaciekk Apr 8, 2025
6e08d1b
create PP add id
pavlo-mk Apr 9, 2025
5d72720
review & cache & tests
pavlo-mk Apr 9, 2025
cbf1545
fix unit tests
pavlo-mk Apr 9, 2025
e3c9dd0
use normal id instead of base64
pavlo-mk Apr 9, 2025
32ad2d5
fix tests base64 ids
pavlo-mk Apr 9, 2025
431a207
add id
pavlo-mk Apr 9, 2025
122fa3d
read_only
pavlo-mk Apr 9, 2025
b3fc238
read_only
pavlo-mk Apr 9, 2025
64b14d2
more changes
mmaciekk Apr 9, 2025
3cd3311
more actions PP
mmaciekk Apr 9, 2025
f11c7b5
fix approval process
pavlo-mk Apr 10, 2025
f078d59
Merge remote-tracking branch 'origin/rest/payment-plan' into rest/pay…
pavlo-mk Apr 10, 2025
4a77b48
WIP // Rest Payment Verification (#4749)
pavlo-mk Apr 10, 2025
390b645
fix PaymentVerificationListSerializer
pavlo-mk Apr 10, 2025
2644551
small fixes
pavlo-mk Apr 10, 2025
b4d82c3
more mutations
mmaciekk Apr 10, 2025
699fbd3
new serializers
pavlo-mk Apr 10, 2025
89c9a64
Merge remote-tracking branch 'origin/rest/payment-plan' into rest/pay…
pavlo-mk Apr 10, 2025
568b601
add Payment mark as failed and revert
pavlo-mk Apr 11, 2025
ca5f7bc
add TestPaymentViewSet
pavlo-mk Apr 11, 2025
fdc73eb
add test
pavlo-mk Apr 11, 2025
d949077
upd
pavlo-mk Apr 11, 2025
10e3fed
mark as failed forced failed
mmaciekk Apr 11, 2025
5f55126
update rest
mmaciekk Apr 11, 2025
be04f17
upd serializers
pavlo-mk Apr 11, 2025
b2bdb47
upd serializers PV
pavlo-mk Apr 11, 2025
2c35b6b
upd Pv details
pavlo-mk Apr 11, 2025
d3ff145
next changes
mmaciekk Apr 11, 2025
904ec89
payment id instead of id
mmaciekk Apr 11, 2025
52d182f
more changes
mmaciekk Apr 11, 2025
ddfb5c7
Merge branch 'long-term/rest-api-refactor' into rest/payment-plan
mmaciekk Apr 11, 2025
35846a7
merge rest/payment-plan to this branch
mmaciekk Apr 11, 2025
8f5c794
create pvp
pavlo-mk Apr 14, 2025
31b4df5
Merge remote-tracking branch 'origin/rest/payment-plan' into rest/pay…
pavlo-mk Apr 14, 2025
33de86d
conflicts
pavlo-mk Apr 14, 2025
9934c64
fe types + migrations
pavlo-mk Apr 14, 2025
6d952c1
fix unit tests
pavlo-mk Apr 14, 2025
3742b26
fix unit tests
pavlo-mk Apr 14, 2025
69b12a4
fix unit tests
pavlo-mk Apr 15, 2025
23f338e
upd fields
pavlo-mk Apr 15, 2025
9467066
add program_id
pavlo-mk Apr 15, 2025
934bf6a
add more fields
pavlo-mk Apr 15, 2025
d17aec0
more fixes
mmaciekk Apr 15, 2025
5d2c182
remaining admin models changes rest gen.
mmaciekk Apr 15, 2025
0d57cf2
more changes
mmaciekk Apr 15, 2025
87357e8
add more action PVP
pavlo-mk Apr 15, 2025
86c476f
fixes + leave comments TODOs
mmaciekk Apr 15, 2025
372fe3c
upd serializers fields
pavlo-mk Apr 16, 2025
dc005c4
test upd
pavlo-mk Apr 16, 2025
6ab0351
fix
mmaciekk Apr 16, 2025
27780ec
add fields
pavlo-mk Apr 16, 2025
6099353
add mutations
mmaciekk Apr 16, 2025
562f790
fix build
mmaciekk Apr 16, 2025
ed71bd1
mypy :star2:
pavlo-mk Apr 16, 2025
c382161
Merge branch 'long-term/rest-api-refactor' into rest/payment-plan
pavlo-mk Apr 16, 2025
0ac9ee2
test :100:
pavlo-mk Apr 16, 2025
81478fe
fix build (remove console error)
mmaciekk Apr 16, 2025
4bc5092
remove program id from profile query?
mmaciekk Apr 16, 2025
29ca6ec
add more tests
pavlo-mk Apr 17, 2025
c2aa9b2
add more tests
pavlo-mk Apr 17, 2025
d1de4fb
tables
mmaciekk Apr 17, 2025
c23c094
tables tables tables
mmaciekk Apr 17, 2025
0f280c8
more unit tests
pavlo-mk Apr 18, 2025
49a22f0
one more table
mmaciekk Apr 18, 2025
10d8dcb
Merge remote-tracking branch 'origin/rest/payment-plan' into rest/pay…
pavlo-mk Apr 18, 2025
d3564b8
upd
pavlo-mk Apr 18, 2025
7e12fb7
look up individuals
mmaciekk Apr 18, 2025
3b9b466
add pagination
pavlo-mk Apr 18, 2025
bd960ae
Merge remote-tracking branch 'origin/rest/payment-plan' into rest/pay…
pavlo-mk Apr 18, 2025
2e30964
add hh/payments
pavlo-mk Apr 18, 2025
fa6b1a2
add pagination to schema
pavlo-mk Apr 18, 2025
b073f6b
fix tests
pavlo-mk Apr 18, 2025
6fbc82b
add new fields
pavlo-mk Apr 18, 2025
9c8f887
tables fixes
mmaciekk Apr 18, 2025
c7a4676
more new fields
pavlo-mk Apr 22, 2025
d285dec
more fixes
pavlo-mk Apr 22, 2025
84e8aa1
more fixes
pavlo-mk Apr 22, 2025
b34f78f
add program/payments
pavlo-mk Apr 22, 2025
e70398f
refactor and add PaymentVerificationRecordViewSet
pavlo-mk Apr 22, 2025
c2888a1
fixes build
mmaciekk Apr 22, 2025
c8f8f64
payment_list add program_name
pavlo-mk Apr 22, 2025
423c4f2
upd tests & fixes
pavlo-mk Apr 22, 2025
705efcb
revert fe
pavlo-mk Apr 22, 2025
f30eef5
fix test
pavlo-mk Apr 22, 2025
66a9893
apparent issues
mmaciekk Apr 22, 2025
17750cf
fix finish cycle
pavlo-mk Apr 23, 2025
5b6e421
fix camelize
mmaciekk Apr 23, 2025
76b7932
review & clean up
pavlo-mk Apr 23, 2025
26507c8
fixes
pavlo-mk Apr 23, 2025
ee1d8c6
add available_fsps_for_delivery_mechanisms
pavlo-mk Apr 23, 2025
2688aee
fixes and add cycles count
pavlo-mk Apr 23, 2025
ecc0ac2
fixes & clean up
pavlo-mk Apr 23, 2025
b2cff77
more fixes
mmaciekk Apr 23, 2025
6291f51
tests clean up
pavlo-mk Apr 23, 2025
d314b37
more fixes
mmaciekk Apr 23, 2025
6f75bad
skip failing old tests
pavlo-mk Apr 24, 2025
315edf3
upd test & add choices urls
pavlo-mk Apr 24, 2025
41a705a
skip snapshot test
pavlo-mk Apr 24, 2025
3abbc4b
unit test
pavlo-mk Apr 24, 2025
b700834
fix queryvariables
mmaciekk Apr 24, 2025
1dc1cc7
fix filter empty values
mmaciekk Apr 24, 2025
6af5f98
upd program filter
pavlo-mk Apr 25, 2025
497f30c
fix TP list
mmaciekk Apr 25, 2025
760585d
conflicts
pavlo-mk Apr 25, 2025
4e5fc21
upd
pavlo-mk Apr 25, 2025
5f1223f
fix api
pavlo-mk Apr 25, 2025
1e0898c
rm old json
pavlo-mk Apr 25, 2025
a4fcb2e
500!!!
mmaciekk Apr 25, 2025
6f0d58b
allow black create TP
pavlo-mk Apr 25, 2025
d21478b
fix create TP
pavlo-mk Apr 25, 2025
4bfd600
fix display tp
mmaciekk Apr 25, 2025
3ea4091
null for delivery_mechanism_code
pavlo-mk Apr 25, 2025
2dff969
Merge remote-tracking branch 'origin/rest/payment-plan' into rest/pay…
pavlo-mk Apr 25, 2025
1a179d9
fix empty params
mmaciekk Apr 25, 2025
4c8834b
remove initial api calls
mmaciekk Apr 25, 2025
4bd2a48
status choices for filters
mmaciekk Apr 25, 2025
30f713e
filters (choices pv pp)
mmaciekk Apr 25, 2025
2aeeb85
unit test
pavlo-mk Apr 26, 2025
3873669
unit test
pavlo-mk Apr 26, 2025
57cabcc
unit test
pavlo-mk Apr 26, 2025
40c42be
unit test
pavlo-mk Apr 26, 2025
a5bece8
fix unit test
pavlo-mk Apr 26, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
179 changes: 89 additions & 90 deletions src/frontend/generated/models/Household.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,94 +14,93 @@ import type { RdiMergeStatusEnum } from './RdiMergeStatusEnum';
import type { RegistrationMethodEnum } from './RegistrationMethodEnum';
import type { ResidenceStatusEnum } from './ResidenceStatusEnum';
export type Household = {
first_registration_date?: string;
last_registration_date?: string;
members: Array<Individual>;
country: CountryEnum;
country_origin?: CountryOriginEnum;
size?: number | null;
rdi_merge_status?: RdiMergeStatusEnum;
is_original?: boolean;
readonly created_at: string;
readonly updated_at: string;
is_removed?: boolean;
removed_date?: string | null;
last_sync_at?: string | null;
internal_data?: any;
withdrawn?: boolean;
withdrawn_date?: string | null;
consent_sign?: string;
consent?: boolean | null;
consent_sharing?: (ConsentSharingEnum | BlankEnum);
residence_status?: (ResidenceStatusEnum | BlankEnum);
address?: string;
zip_code?: string | null;
female_age_group_0_5_count?: number | null;
female_age_group_6_11_count?: number | null;
female_age_group_12_17_count?: number | null;
female_age_group_18_59_count?: number | null;
female_age_group_60_count?: number | null;
pregnant_count?: number | null;
male_age_group_0_5_count?: number | null;
male_age_group_6_11_count?: number | null;
male_age_group_12_17_count?: number | null;
male_age_group_18_59_count?: number | null;
male_age_group_60_count?: number | null;
female_age_group_0_5_disabled_count?: number | null;
female_age_group_6_11_disabled_count?: number | null;
female_age_group_12_17_disabled_count?: number | null;
female_age_group_18_59_disabled_count?: number | null;
female_age_group_60_disabled_count?: number | null;
male_age_group_0_5_disabled_count?: number | null;
male_age_group_6_11_disabled_count?: number | null;
male_age_group_12_17_disabled_count?: number | null;
male_age_group_18_59_disabled_count?: number | null;
male_age_group_60_disabled_count?: number | null;
children_count?: number | null;
male_children_count?: number | null;
female_children_count?: number | null;
children_disabled_count?: number | null;
male_children_disabled_count?: number | null;
female_children_disabled_count?: number | null;
returnee?: boolean | null;
flex_fields?: any;
fchild_hoh?: boolean | null;
child_hoh?: boolean | null;
start?: string | null;
deviceid?: string;
name_enumerator?: string;
org_enumerator?: (OrgEnumeratorEnum | BlankEnum);
org_name_enumerator?: string;
village?: string;
registration_method?: (RegistrationMethodEnum | BlankEnum);
currency?: (CurrencyEnum | BlankEnum);
unhcr_id?: string;
registration_id?: string | null;
program_registration_id?: string | null;
total_cash_received_usd?: string | null;
total_cash_received?: string | null;
family_id?: string | null;
origin_unicef_id?: string | null;
collect_type?: CollectTypeEnum;
enumerator_rec_id?: number | null;
flex_registrations_record_id?: number | null;
household_collection?: number | null;
admin_area?: string | null;
admin1?: string | null;
admin2?: string | null;
admin3?: string | null;
admin4?: string | null;
storage_obj?: number | null;
/**
* If this household was copied from another household, this field will contain the household it was copied from.
*/
copied_from?: string | null;
/**
* This is only used to track collector (primary or secondary) of a household.
* They may still be a HOH of this household or any other household.
* Through model will contain the role (ROLE_CHOICE) they are connected with on.
*/
readonly representatives: Array<string>;
programs?: Array<string>;
first_registration_date?: string;
last_registration_date?: string;
members: Array<Individual>;
country: CountryEnum;
country_origin?: CountryOriginEnum;
size?: number | null;
rdi_merge_status?: RdiMergeStatusEnum;
is_original?: boolean;
readonly created_at: string;
readonly updated_at: string;
is_removed?: boolean;
removed_date?: string | null;
last_sync_at?: string | null;
internal_data?: any;
withdrawn?: boolean;
withdrawn_date?: string | null;
consent_sign?: string;
consent?: boolean | null;
consent_sharing?: ConsentSharingEnum | BlankEnum;
residence_status?: ResidenceStatusEnum | BlankEnum;
address?: string;
zip_code?: string | null;
female_age_group_0_5_count?: number | null;
female_age_group_6_11_count?: number | null;
female_age_group_12_17_count?: number | null;
female_age_group_18_59_count?: number | null;
female_age_group_60_count?: number | null;
pregnant_count?: number | null;
male_age_group_0_5_count?: number | null;
male_age_group_6_11_count?: number | null;
male_age_group_12_17_count?: number | null;
male_age_group_18_59_count?: number | null;
male_age_group_60_count?: number | null;
female_age_group_0_5_disabled_count?: number | null;
female_age_group_6_11_disabled_count?: number | null;
female_age_group_12_17_disabled_count?: number | null;
female_age_group_18_59_disabled_count?: number | null;
female_age_group_60_disabled_count?: number | null;
male_age_group_0_5_disabled_count?: number | null;
male_age_group_6_11_disabled_count?: number | null;
male_age_group_12_17_disabled_count?: number | null;
male_age_group_18_59_disabled_count?: number | null;
male_age_group_60_disabled_count?: number | null;
children_count?: number | null;
maleChildrenCount?: number | null;
femaleChildrenCount?: number | null;
children_disabled_count?: number | null;
male_children_disabled_count?: number | null;
female_children_disabled_count?: number | null;
returnee?: boolean | null;
flex_fields?: any;
fchild_hoh?: boolean | null;
child_hoh?: boolean | null;
start?: string | null;
deviceid?: string;
name_enumerator?: string;
org_enumerator?: OrgEnumeratorEnum | BlankEnum;
org_name_enumerator?: string;
village?: string;
registration_method?: RegistrationMethodEnum | BlankEnum;
currency?: CurrencyEnum | BlankEnum;
unhcr_id?: string;
registration_id?: string | null;
program_registration_id?: string | null;
total_cash_received_usd?: string | null;
total_cash_received?: string | null;
family_id?: string | null;
origin_unicef_id?: string | null;
collect_type?: CollectTypeEnum;
enumerator_rec_id?: number | null;
flex_registrations_record_id?: number | null;
household_collection?: number | null;
admin_area?: string | null;
admin1?: string | null;
admin2?: string | null;
admin3?: string | null;
admin4?: string | null;
storage_obj?: number | null;
/**
* If this household was copied from another household, this field will contain the household it was copied from.
*/
copied_from?: string | null;
/**
* This is only used to track collector (primary or secondary) of a household.
* They may still be a HOH of this household or any other household.
* Through model will contain the role (ROLE_CHOICE) they are connected with on.
*/
readonly representatives: Array<string>;
programs?: Array<string>;
};

4 changes: 2 additions & 2 deletions src/frontend/src/api/targetPopulationApi.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { PaginatedPaymentPlanListList } from '@restgenerated/models/PaginatedPaymentPlanListList';
import { api, handleApiResponse } from './api';
import { TargetPopulationList } from '@restgenerated/models/TargetPopulationList';

export const fetchTargetPopulations = async (
businessAreaSlug: string,
programId: string,
params = {},
): Promise<TargetPopulationList> => {
): Promise<PaginatedPaymentPlanListList> => {
return handleApiResponse(
api.get(
`${businessAreaSlug}/programs/${programId}/targeting/target-populations/`,
Expand Down

This file was deleted.

Loading
Loading