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

Adjust PaymentPlan model to contain informations coming from TP and HS #4372

Open
wants to merge 174 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
174 commits
Select commit Hold shift + click to select a range
112768b
init
Oct 2, 2024
1183b72
add tp list rest
Oct 3, 2024
5e59003
Merge pull request #4286 from unicef/tp-list-rest
mmaciekk Oct 3, 2024
7fe3a7b
Merge branch 'develop' into long-term/remove-tp
mmaciekk Oct 4, 2024
9f94b04
Merge branch 'develop' into long-term/remove-tp
mmaciekk Oct 7, 2024
44925c5
Merge remote-tracking branch 'origin/develop' into long-term/remove-tp
Oct 24, 2024
ba49fb4
init changes
pavlo-mk Oct 25, 2024
e254fe2
add TP_MIGRATION_MAPPING
pavlo-mk Oct 25, 2024
1af4570
Merge remote-tracking branch 'origin' into long-term/remove-tp
Oct 28, 2024
4aeb370
Merge branch 'develop' into long-term/remove-tp
mmaciekk Oct 28, 2024
8619860
modify create target population add collector group
Oct 29, 2024
52e40b7
Merge branch 'long-term/remove-tp' into adjust-pp-model
pavlo-mk Oct 30, 2024
39f3a99
style :dart:
pavlo-mk Oct 30, 2024
4905ab5
add collector filters blocks
Oct 30, 2024
a80e25a
Merge branch 'long-term/remove-tp' into adjust-pp-model
pavlo-mk Oct 31, 2024
58a420e
upd few more fields and properties
pavlo-mk Oct 31, 2024
aec82ad
move full_rebuild & refactoring
pavlo-mk Oct 31, 2024
b2111fc
add collector rule groups
Oct 31, 2024
a76f5dd
Merge branch 'long-term/remove-tp' into adjust-pp-model
pavlo-mk Nov 4, 2024
750ccaf
merge develop & resolve conflicts & review
pavlo-mk Nov 22, 2024
f44683f
add CheckConstraint & migrations
pavlo-mk Nov 22, 2024
42f103d
update validation & migrations
pavlo-mk Nov 22, 2024
2735d37
upd tests
pavlo-mk Nov 22, 2024
afe9e74
upd migrations
pavlo-mk Nov 22, 2024
0b01791
fe cleanup & add more ut :star2:
pavlo-mk Nov 22, 2024
85a1c07
coverage :100:
pavlo-mk Nov 22, 2024
ffd8879
Merge branch 'develop' into adjust-pp-model
pavlo-mk Nov 25, 2024
d5691fe
init script
pavlo-mk Nov 25, 2024
d78b470
upd
pavlo-mk Nov 25, 2024
3c7fb21
script optimization
pavlo-mk Nov 25, 2024
f55b527
refactor: create/upd mutation
pavlo-mk Nov 26, 2024
178ecec
add updated_tc_rules
pavlo-mk Nov 26, 2024
f3b5b91
refactor mutations
pavlo-mk Nov 26, 2024
0f6ef7f
Merge branch 'develop' into adjust-pp-model
pavlo-mk Nov 26, 2024
e97b488
refactor mutations
pavlo-mk Nov 27, 2024
4b98b6e
upd migrations
pavlo-mk Nov 27, 2024
38b417a
more fixes
pavlo-mk Nov 27, 2024
635ad5e
migrations // fix initdemo
pavlo-mk Nov 28, 2024
8d75b5a
migration
pavlo-mk Nov 28, 2024
847deb6
Merge branch 'develop' into adjust-pp-model
pavlo-mk Nov 28, 2024
b9e59a7
add more statuses transitions
pavlo-mk Nov 28, 2024
519f043
Merge branch 'develop' into adjust-pp-model
pavlo-mk Nov 28, 2024
273aa22
fixes
pavlo-mk Nov 28, 2024
80509e4
fixes // upd unit tests
pavlo-mk Nov 29, 2024
8a30c48
conflicts
pavlo-mk Nov 29, 2024
0aafac1
more refactoring and upd unit tests
pavlo-mk Nov 29, 2024
967b810
unit tests // fixes
pavlo-mk Nov 30, 2024
81a02bc
conflicts
pavlo-mk Nov 30, 2024
9a95c33
conflicts
pavlo-mk Dec 2, 2024
d23ab77
conflicts & remove unused TPnode
pavlo-mk Dec 2, 2024
9f64e13
migrations conflict
pavlo-mk Dec 2, 2024
0635d1c
Merge branch 'develop' into adjust-pp-model
pavlo-mk Dec 2, 2024
b9fd035
migration
pavlo-mk Dec 2, 2024
e5ac4a2
Merge branch 'develop' into adjust-pp-model
pavlo-mk Dec 2, 2024
d7f7e9a
add TODOs & skip
pavlo-mk Dec 2, 2024
0642898
add more tests // fixes
pavlo-mk Dec 3, 2024
fba715e
Merge branch 'develop' into adjust-pp-model
pavlo-mk Dec 3, 2024
772cb6a
remove unused code
pavlo-mk Dec 3, 2024
00b4eea
fixes // add more tests
pavlo-mk Dec 3, 2024
16ec16e
upd snapshot
pavlo-mk Dec 3, 2024
df022a2
Merge branch 'develop' into adjust-pp-model
pavlo-mk Dec 3, 2024
9f457c7
more tests
pavlo-mk Dec 3, 2024
eb7f14b
Merge branch 'develop' into adjust-pp-model
pavlo-mk Dec 3, 2024
273d119
more tests
pavlo-mk Dec 4, 2024
9091fe0
merge develop :star2:
pavlo-mk Dec 4, 2024
1ccd4d9
add more :100: :star2:
pavlo-mk Dec 4, 2024
6967466
upd migration script
pavlo-mk Dec 5, 2024
2ea1dc2
change mutations part 1
Dec 5, 2024
25f5b5f
add more test & refactoring migration script
pavlo-mk Dec 5, 2024
139e7d2
add test_migrate_tp_into_pp
pavlo-mk Dec 5, 2024
38604a8
more adjustments
Dec 5, 2024
c03fdd3
upd tests & fix .delete()
pavlo-mk Dec 6, 2024
1c17668
Merge remote-tracking branch 'origin/adjust-pp-model' into adjust-pp-…
pavlo-mk Dec 6, 2024
1a11304
remove imports
Dec 6, 2024
db13e6a
upd test
pavlo-mk Dec 6, 2024
e1313f9
delete, copy
Dec 6, 2024
652a225
accountability
pavlo-mk Dec 9, 2024
411204e
add filters isTargetPopulation & isPaymentPlan
pavlo-mk Dec 9, 2024
8354a3e
merge develop & conflicts
pavlo-mk Dec 9, 2024
b23ba34
more changes
Dec 9, 2024
150b647
conflicts :star2:
pavlo-mk Dec 9, 2024
84bdc23
develop merge
pavlo-mk Dec 10, 2024
4e4a6ce
generate schema
Dec 10, 2024
0446eb1
add migrate_message_and_survey
pavlo-mk Dec 11, 2024
7c31950
fix update targeting_criteria
pavlo-mk Dec 11, 2024
f9ab5c9
upd filter
pavlo-mk Dec 11, 2024
1fcc3ed
migration script upd
pavlo-mk Dec 11, 2024
10026b2
more changes
Dec 11, 2024
bdf7289
more
Dec 11, 2024
5a808c5
Merge branch 'develop' into adjust-pp-model
pavlo-mk Dec 12, 2024
1b1a564
add more unit tests :star:
pavlo-mk Dec 12, 2024
c1bc2d3
fix migration script & upd unit tests :star2:
pavlo-mk Dec 12, 2024
81b15cb
Merge branch 'develop' into adjust-pp-model
pavlo-mk Dec 12, 2024
f425928
next part
Dec 12, 2024
fc2f569
more
Dec 12, 2024
b5afdf0
more changes
Dec 13, 2024
63f7845
upd filters
pavlo-mk Dec 16, 2024
6f02ee5
add total_households_count_with_valid_phone_no
pavlo-mk Dec 16, 2024
7fb8e42
upd filter
pavlo-mk Dec 17, 2024
eb2cdc8
resolve conflicts
pavlo-mk Dec 17, 2024
9c1dd4b
fix
Dec 17, 2024
6bf64de
another part
Dec 18, 2024
461adaa
add noStatus filter
pavlo-mk Dec 19, 2024
581623a
statusNot
pavlo-mk Dec 19, 2024
5cd3b96
add GraphQLError when no ba header for allPrograms query
pavlo-mk Dec 19, 2024
7b83afa
frontend compiles
Dec 19, 2024
b9db3dd
refactor & conflicts
pavlo-mk Dec 19, 2024
3d4d622
fixes
pavlo-mk Dec 19, 2024
7a7c7bd
fix payments lists TP
Dec 19, 2024
c74ef68
fix pp list
Dec 19, 2024
2ecb0bc
Merge branch 'refactor_pp' into adjust-pp-model
pavlo-mk Dec 19, 2024
43634a0
lint
pavlo-mk Dec 19, 2024
c7376c0
fix snapshots
Dec 19, 2024
9c2e6c1
minor fixes
pavlo-mk Dec 19, 2024
0346708
Merge remote-tracking branch 'origin/adjust-pp-model' into adjust-pp-…
pavlo-mk Dec 19, 2024
d75f30f
fix buttons and status
Dec 19, 2024
82d3015
fix pp queries
Dec 20, 2024
9a0066c
fix generated
Dec 20, 2024
61acf3d
fix schema
Dec 20, 2024
a6e4833
fix e2e fixtures
pavlo-mk Dec 20, 2024
2a9322a
upd statuses
pavlo-mk Dec 20, 2024
7ef29ed
fixes :star2:
pavlo-mk Dec 20, 2024
02cc948
unit tests :star:
pavlo-mk Dec 21, 2024
eba4ebd
unit tests & coverage :star2:
pavlo-mk Dec 21, 2024
a6dd17c
fix e2e
pavlo-mk Dec 23, 2024
7f8def9
fix e2e
pavlo-mk Dec 23, 2024
649ae27
fix labels + lock unlock
Dec 23, 2024
f395ef6
id undefined
Dec 23, 2024
4804bb7
fix mutation
pavlo-mk Dec 23, 2024
41b3dba
Merge remote-tracking branch 'origin/adjust-pp-model' into adjust-pp-…
pavlo-mk Dec 23, 2024
ed9fe9c
bring back verify manual
Dec 23, 2024
90af108
bug fixes
Dec 23, 2024
bd87b7b
targeting hh fix
Dec 23, 2024
85a7e74
merge develop & conflicts
pavlo-mk Dec 23, 2024
74d63de
upd fe test
pavlo-mk Dec 23, 2024
98f894e
fix fe fixtures
pavlo-mk Dec 23, 2024
c244601
fix more e2e
pavlo-mk Dec 24, 2024
0bdab50
again fix more e2e
pavlo-mk Dec 27, 2024
80816f1
fix e2e
pavlo-mk Dec 27, 2024
2d706ae
schema
pavlo-mk Dec 27, 2024
7ae6d08
upd filtering
pavlo-mk Dec 27, 2024
6b95913
test with e2e
pavlo-mk Dec 27, 2024
7599d0d
Merge branch 'develop' into adjust-pp-model
pavlo-mk Dec 30, 2024
ce01074
Merge branch 'develop' into adjust-pp-model
pavlo-mk Dec 31, 2024
65b3e68
test with test_edit_targeting
pavlo-mk Jan 7, 2025
97b55b7
add xfail
pavlo-mk Jan 7, 2025
f045ead
small fixes
pavlo-mk Jan 7, 2025
b65eb70
update snapshots
Jan 7, 2025
77803ff
fixes
pavlo-mk Jan 7, 2025
272d04a
upd test
pavlo-mk Jan 7, 2025
6f71a3b
add open pp mutation
Jan 7, 2025
3e3d09e
fix upd currency :star:
pavlo-mk Jan 7, 2025
e25ab2a
review
pavlo-mk Jan 7, 2025
483a125
migration
pavlo-mk Jan 7, 2025
15b7ea5
ba fixtures
pavlo-mk Jan 8, 2025
3c011ca
fe schema upd
pavlo-mk Jan 8, 2025
48cfcc6
remove isPaymentPlanApplicable and Draft status
Jan 8, 2025
746a78e
clean up
pavlo-mk Jan 8, 2025
e9ef918
upd filters
pavlo-mk Jan 8, 2025
2fd7821
fix status
Jan 8, 2025
e7b91ba
change steficon mutation
Jan 8, 2025
848c869
steficon pp
Jan 8, 2025
c54cc84
upd mutations
pavlo-mk Jan 8, 2025
c50cc73
Merge remote-tracking branch 'origin/adjust-pp-model' into adjust-pp-…
pavlo-mk Jan 8, 2025
5089cc5
upd schema
pavlo-mk Jan 8, 2025
0ed6e01
fixes for SetSteficonRuleOnPaymentPlanPaymentListMutation
pavlo-mk Jan 8, 2025
50ab0e1
Merge branch 'develop' into adjust-pp-model
pavlo-mk Jan 8, 2025
caaffb2
fe lint
pavlo-mk Jan 8, 2025
d4c477a
remove none option in vulnerability component
Jan 8, 2025
77b87e8
fix ut
pavlo-mk Jan 9, 2025
550cc9e
Merge branch 'develop' into adjust-pp-model
pavlo-mk Jan 9, 2025
8069586
fe fixes
pavlo-mk Jan 9, 2025
717bddb
more fixes
pavlo-mk Jan 9, 2025
f32e689
upd query :star2:
pavlo-mk Jan 9, 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
287 changes: 75 additions & 212 deletions src/frontend/data/schema.graphql

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export const fakeApolloAllCommunicationMessages = [
targetPopulation: '',
createdBy: '',
first: 10,
paymentPlan: '',
orderBy: '-created_at',
},
},
Expand All @@ -27,14 +28,12 @@ export const fakeApolloAllCommunicationMessages = [
{
cursor: 'YXJyYXljb25uZWN0aW9uOjA=',
node: {
id:
'Q29tbXVuaWNhdGlvbk1lc3NhZ2VOb2RlOjExMDZmNThmLTJkZDMtNDQ5OC1hZjNkLTI2YzNhNDc2ZjkwZg==',
id: 'Q29tbXVuaWNhdGlvbk1lc3NhZ2VOb2RlOjExMDZmNThmLTJkZDMtNDQ5OC1hZjNkLTI2YzNhNDc2ZjkwZg==',
unicefId: 'MSG-23-0005',
title: 'jij',
numberOfRecipients: 1,
createdBy: {
id:
'VXNlck5vZGU6NDE5NmMyYzUtYzJkZC00OGQyLTg4N2YtM2E5ZDM5ZTc4OTE2',
id: 'VXNlck5vZGU6NDE5NmMyYzUtYzJkZC00OGQyLTg4N2YtM2E5ZDM5ZTc4OTE2',
firstName: 'Root',
lastName: 'Rootkowski',
email: '[email protected]',
Expand All @@ -48,14 +47,12 @@ export const fakeApolloAllCommunicationMessages = [
{
cursor: 'YXJyYXljb25uZWN0aW9uOjE=',
node: {
id:
'Q29tbXVuaWNhdGlvbk1lc3NhZ2VOb2RlOjExNzVmMzMwLTM2Y2MtNDM5NC04MjAyLWU4NjY3ZTI5ZTc4MA==',
id: 'Q29tbXVuaWNhdGlvbk1lc3NhZ2VOb2RlOjExNzVmMzMwLTM2Y2MtNDM5NC04MjAyLWU4NjY3ZTI5ZTc4MA==',
unicefId: 'MSG-22-0002',
title: 'You got credit of USD 200',
numberOfRecipients: 2,
createdBy: {
id:
'VXNlck5vZGU6NDE5NmMyYzUtYzJkZC00OGQyLTg4N2YtM2E5ZDM5ZTc4OTE2',
id: 'VXNlck5vZGU6NDE5NmMyYzUtYzJkZC00OGQyLTg4N2YtM2E5ZDM5ZTc4OTE2',
firstName: 'Root',
lastName: 'Rootkowski',
email: '[email protected]',
Expand All @@ -69,14 +66,12 @@ export const fakeApolloAllCommunicationMessages = [
{
cursor: 'YXJyYXljb25uZWN0aW9uOjI=',
node: {
id:
'Q29tbXVuaWNhdGlvbk1lc3NhZ2VOb2RlOjc1OGJiMjg0LTJjZjAtNGZjYy1hY2YyLTY5NDdlZDhkZGNlNg==',
id: 'Q29tbXVuaWNhdGlvbk1lc3NhZ2VOb2RlOjc1OGJiMjg0LTJjZjAtNGZjYy1hY2YyLTY5NDdlZDhkZGNlNg==',
unicefId: 'MSG-22-0004',
title: 'We hold your back!',
numberOfRecipients: 2,
createdBy: {
id:
'VXNlck5vZGU6NDE5NmMyYzUtYzJkZC00OGQyLTg4N2YtM2E5ZDM5ZTc4OTE2',
id: 'VXNlck5vZGU6NDE5NmMyYzUtYzJkZC00OGQyLTg4N2YtM2E5ZDM5ZTc4OTE2',
firstName: 'Root',
lastName: 'Rootkowski',
email: '[email protected]',
Expand All @@ -90,14 +85,12 @@ export const fakeApolloAllCommunicationMessages = [
{
cursor: 'YXJyYXljb25uZWN0aW9uOjM=',
node: {
id:
'Q29tbXVuaWNhdGlvbk1lc3NhZ2VOb2RlOjQxYjllNTE0LWI1NmMtNDY1OS1hYmFhLWE5ZWYwNzVlOThlMQ==',
id: 'Q29tbXVuaWNhdGlvbk1lc3NhZ2VOb2RlOjQxYjllNTE0LWI1NmMtNDY1OS1hYmFhLWE5ZWYwNzVlOThlMQ==',
unicefId: 'MSG-22-0003',
title: 'Hello There!',
numberOfRecipients: 2,
createdBy: {
id:
'VXNlck5vZGU6NDE5NmMyYzUtYzJkZC00OGQyLTg4N2YtM2E5ZDM5ZTc4OTE2',
id: 'VXNlck5vZGU6NDE5NmMyYzUtYzJkZC00OGQyLTg4N2YtM2E5ZDM5ZTc4OTE2',
firstName: 'Root',
lastName: 'Rootkowski',
email: '[email protected]',
Expand All @@ -111,14 +104,12 @@ export const fakeApolloAllCommunicationMessages = [
{
cursor: 'YXJyYXljb25uZWN0aW9uOjQ=',
node: {
id:
'Q29tbXVuaWNhdGlvbk1lc3NhZ2VOb2RlOjBkMDQ3NDg0LTUzODAtNGJmMi1hOTViLWM4NjVmNWUzYmM4OQ==',
id: 'Q29tbXVuaWNhdGlvbk1lc3NhZ2VOb2RlOjBkMDQ3NDg0LTUzODAtNGJmMi1hOTViLWM4NjVmNWUzYmM4OQ==',
unicefId: 'MSG-22-0001',
title: 'Hello World!',
numberOfRecipients: 2,
createdBy: {
id:
'VXNlck5vZGU6NDE5NmMyYzUtYzJkZC00OGQyLTg4N2YtM2E5ZDM5ZTc4OTE2',
id: 'VXNlck5vZGU6NDE5NmMyYzUtYzJkZC00OGQyLTg4N2YtM2E5ZDM5ZTc4OTE2',
firstName: 'Root',
lastName: 'Rootkowski',
email: '[email protected]',
Expand Down
8 changes: 3 additions & 5 deletions src/frontend/fixtures/paymentmodule/fakeApolloPaymentPlan.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
PaymentVerificationPlanSampling,
PaymentVerificationPlanStatus,
PaymentVerificationPlanVerificationChannel,
ProgramStatus,
} from '../../src/__generated__/graphql';

export const fakeApolloPaymentPlan: PaymentPlanQuery['paymentPlan'] = {
Expand Down Expand Up @@ -39,13 +40,9 @@ export const fakeApolloPaymentPlan: PaymentPlanQuery['paymentPlan'] = {
program: {
id: 'UHJvZ3JhbU5vZGU6NWJhMjEzY2UtNmNlOS00NTc4LThhNDgtYjFmMDgyM2Q2MDAy',
name: 'Already attention fear well hit instead person.',
status: ProgramStatus.Active,
__typename: 'ProgramNode',
},
targetPopulation: {
id: 'VGFyZ2V0UG9wdWxhdGlvbk5vZGU6MzlmMjQ0YzEtZGRiMC00ZGZmLWE0MzEtN2JiMDFhMTdiMThm',
name: 'Report should property early adult.',
__typename: 'TargetPopulationNode',
},
currency: 'PLN',
currencyName: 'Polish złoty',
startDate: '2020-10-27',
Expand Down Expand Up @@ -302,6 +299,7 @@ export const fakeApolloPaymentPlan: PaymentPlanQuery['paymentPlan'] = {
__typename: 'ReconciliationSummaryNode',
},
__typename: 'PaymentPlanNode',
excludedIds: '',
};

export const fakeApolloPaymentPlanWithWrongBackgroundActionStatus: PaymentPlanQuery['paymentPlan'] =
Expand Down
4 changes: 3 additions & 1 deletion src/frontend/fixtures/programs/fakeApolloAllPrograms.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ export const fakeApolloAllPrograms = [
startDate: '2020-01-20',
endDate: '2020-08-19',
status: 'ACTIVE',
caId: '123-21-PRG-00001',
internalData: {
caId: '123-21-PRG-00001',
},
description:
'Purpose she occur lose new wish day per little because east like bill.',
budget: '691946197.49',
Expand Down
Loading
Loading