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

* add new serializers

* WIP: add new fields

* WIP: add new fields part 2

* WIP: fixes & upd filters

* add test list pp

* add more utests

* add more tests & filters

* add cache

* upd

* add TP list details

* fix cache pp/tp list

* add payments, hhs list

* test with lookup_field

* add more tests

* more tests

* PaymentPlanDetail instead of PaymentPlanQuery, is_follow_up instead of isFollowUp

* more updates ufter changing to Payment Plan hook

* more changes

* add ApprovalProcessSerializer

* add more fields

* tests

* tests

* add more fields

* add more fields & tests

* more changes

* tests and more serializers

* more fields

* add eligible_payments_count

* eligible_payments_count frontend

* fixes & tests & add program small

* Update serializers.py

* upd FollowUpPaymentPlanSerializer

* add program_cycle_id

* more changes

* add new ser

* generated

* tp list + details query

* WIP // REST TP/PP CRUD  (#4729)

* post, patch, delete

* black

* add more actions

* add unit tests

* coverage

* fix utests

* fix utests

* fix tests ⭐

* add more tests

* add tests 🌟

* remove tp snapshots

* add currency_choices

* add apply_engine_formula

* add test apply_engine_formula

* add open pp

* WIP: PP lock/unlock, delete, exclude_hh

* WIP: PP apply entitlement formula, FSP lock/unlock

* WIP: entitlement_export_xlsx

* conflicts

* fix

* add entitlement_import_xlsx

* generate-rest-api-types-camelcase

* generate-rest-api-types-camelcase

* rm payment 0024 ?<>?

* generate types

* add more api endpoints

* tests & fixes

* next part fixes

* more changes

* more changes

* new fields

* add types everywhere (useQuery)

* fixes

* fixes & add more tests

* more fixes

* fixes

* rewrite create pp and create follow up pp mutations

* create PP add id

* review & cache & tests

* fix unit tests

* use normal id instead of base64

* fix tests base64 ids

* add id

* read_only

* read_only

* more changes

* more actions PP

* fix approval process

* WIP // Rest Payment Verification (#4749)

* add PaymentVerification list

* upd

* fix PaymentVerificationListSerializer

* small fixes

* more mutations

* new serializers

* add Payment mark as failed and revert

* add TestPaymentViewSet

* add test

* upd

* mark as failed forced failed

* update rest

* upd serializers

* upd serializers PV

* upd Pv details

* next changes

* payment id instead of id

* more changes

* merge rest/payment-plan to this branch

* create pvp

* conflicts

* fe types + migrations

* fix unit tests

* fix unit tests

* fix unit tests

* upd fields

* add program_id

* add more fields

* more fixes

* remaining admin models changes rest gen.

* more changes

* add more action PVP

* fixes + leave comments TODOs

* upd serializers fields

* test upd

* fix

* add fields

* add mutations

* fix build

* mypy 🌟

* test 💯

* fix build (remove console error)

* remove program id from profile query?

* add more tests

* add more tests

* tables

* tables tables tables

* more unit tests

* one more table

* upd

* look up individuals

* add pagination

* add hh/payments

* add pagination to schema

* fix tests

* add new fields

* tables fixes

* more new fields

* more fixes

* more fixes

* add program/payments

* refactor and add PaymentVerificationRecordViewSet

* fixes build

* payment_list add program_name

* upd tests & fixes

* revert fe

* fix test

* apparent issues

* fix finish cycle

* fix camelize

* review & clean up

* fixes

* add available_fsps_for_delivery_mechanisms

* fixes and add cycles count

* fixes & clean up

* more fixes

* tests clean up

* more fixes

* skip failing old tests

* upd test & add choices urls

* skip snapshot test

* unit test

* fix queryvariables

* fix filter empty values

* upd program filter

* fix TP list

* upd

* fix api

* rm old json

* 500!!!

* allow black create TP

* fix create TP

* fix display tp

* null for delivery_mechanism_code

* fix empty params

* remove initial api calls

* status choices for filters

* filters (choices pv pp)

* unit test

* unit test

* unit test

* unit test

* fix unit test

---------

Co-authored-by: Maciej Szewczyk <[email protected]>
Co-authored-by: Maciej Szewczyk <[email protected]>

Author: 3 people

src/frontend/generated/models/Household.ts

@@ -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>;
 };
-

src/frontend/src/api/targetPopulationApi.ts

@@ -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/`,