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

Next Release #1645

Closed
wants to merge 432 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
432 commits
Select commit Hold shift + click to select a range
d7dd925
fix: add pagination for qf round listed projects
Meriem-B Jun 3, 2024
3416e46
fix: conflict
Meriem-B Jun 3, 2024
c94734f
fix: Refactor conditions (use optinal chaining)
Meriem-B Jun 3, 2024
e064bc7
fix: add alternative text for accessibility in SVG elements.
Meriem-B Jun 3, 2024
bda6caa
fix: add detailed func attribute types
Meriem-B Jun 3, 2024
428ff5b
fix: add attributes types to handleBannerBgImage func
Meriem-B Jun 3, 2024
15edcd7
Merge pull request #1597 from Giveth/fix/unlink_project_with_qf_round
Meriem-BM Jun 3, 2024
ae52122
Merge branch 'staging' into fix/add_qf_round_pagination
Meriem-BM Jun 3, 2024
ba2225a
Merge pull request #1601 from Giveth/fix/add_qf_round_pagination
Meriem-BM Jun 3, 2024
7a0e413
remove refreshProjectDonationSummaryView from migrations
RamRamez Jun 4, 2024
2d6868a
DropDonationSummaryView migration
RamRamez Jun 4, 2024
05d0ee6
remove ProjectDonationSummaryView
RamRamez Jun 4, 2024
e19ea95
remove refreshProjectDonationSummaryView
RamRamez Jun 4, 2024
326c751
replace countUniqueDonors and sumDonationValueUsd with countUniqueDon…
RamRamez Jun 4, 2024
031bfe1
remove ProjectDonationSummaryView
RamRamez Jun 4, 2024
f09a0ad
Merge pull request #1603 from Giveth/drop-donation-summary-view
RamRamez Jun 4, 2024
b0e10b5
changed projectTabs adminUserId to true but still not updating in Dat…
lovelgeorge99 Jun 4, 2024
5140a93
651 run migration files as js file (#1604)
ae2079 Jun 4, 2024
17c0fbb
Change for Project Ownship
lovelgeorge99 Jun 5, 2024
3aaf0fe
Merge branch 'staging' into change-admin#1602
lovelgeorge99 Jun 5, 2024
87051be
i have fixed the issue for transfer project ownership in adminBro and…
lovelgeorge99 Jun 5, 2024
e0ef866
Merge branch 'change-admin#1602' of https://github.com/Giveth/impact-…
lovelgeorge99 Jun 5, 2024
965cea3
Revert "651 run migration files as js file (#1604)"
RamRamez Jun 5, 2024
bd6a965
Merge pull request #1606 from Giveth/revert-#1604
RamRamez Jun 5, 2024
faf87e2
Update staging-pipeline.yml
mhmdksh Jun 5, 2024
595cd4b
Update staging-pipeline.yml
mhmdksh Jun 5, 2024
11e59a4
Update staging-pipeline.yml
mhmdksh Jun 5, 2024
54d61ad
Create funding.json
divine-comedian Jun 5, 2024
a0d2db9
Fix issue in db migration scripts (#1608)
ae2079 Jun 5, 2024
5d29a98
add cache to mainCategories query
RamRamez Jun 6, 2024
ab97be4
add cache to findQfRounds query
RamRamez Jun 6, 2024
a8dc7ed
add cache to findQfRounds query
RamRamez Jun 6, 2024
710f612
fix MainCategory test case
RamRamez Jun 6, 2024
f4e1a71
removed unnecessary comments and changed email to admin id
lovelgeorge99 Jun 6, 2024
5464896
Merge branch 'staging' of https://github.com/Giveth/impact-graph into…
lovelgeorge99 Jun 6, 2024
bd49a58
fix: filter unique donors based on passport score and knownAsSybilAdd…
Meriem-BM Jun 7, 2024
40c28b0
set cache duration as env var
RamRamez Jun 7, 2024
f2a6be0
Merge pull request #1612 from Giveth/Optimize-qfRounds-mainCategories…
RamRamez Jun 7, 2024
e49c991
allow refresh concurrently of materialized views (#1611)
CarlosQ96 Jun 7, 2024
e75272a
Merge branch 'staging' of github.com:Giveth/impact-graph into fix/fil…
Meriem-BM Jun 9, 2024
40e3f7c
add logger to updateProjectStatistics
RamRamez Jun 9, 2024
7dc841e
fix: add new field isDataAnalysisDone to QF Round
Meriem-BM Jun 9, 2024
8dc84d0
Merge branch 'staging' into fix/filter_unique_donors
Meriem-BM Jun 9, 2024
8ed4f62
fix: refactor condition where data analysis shouldn't be edited
Meriem-BM Jun 9, 2024
ecd070c
Merge branch 'fix/filter_unique_donors' of github.com:Giveth/impact-g…
Meriem-BM Jun 9, 2024
43fb8f0
fix: issue while listing recurrring donations
Meriem-BM Jun 10, 2024
635f5e5
revert concurrent flag for failed views
CarlosQ96 Jun 10, 2024
f4b67cb
fix: requested change (using subquery to get unique donors count)
Meriem-BM Jun 11, 2024
309f530
Merge pull request #1622 from Giveth/fix/recurring_donation_tab
Meriem-BM Jun 11, 2024
aa14e64
Merge pull request #1613 from Giveth/fix/filter_unique_donors
Meriem-BM Jun 11, 2024
fbbdcd7
add getUserAnalysisScore
CarlosQ96 Jun 11, 2024
f06b88b
revert all materialized views concurrent flag
CarlosQ96 Jun 11, 2024
f3cd380
reactivate concurrent flag for all materialized views
CarlosQ96 Jun 11, 2024
4940916
move refresh estimated matching view last
CarlosQ96 Jun 11, 2024
f5292ca
Add some error logs and complete some error messages (#1623)
ae2079 Jun 12, 2024
2f320a3
move refreshProjectEstimatedMatchingView
RamRamez Jun 12, 2024
289781f
fix: retrieve correct usd value of donations for an archived QF round
Meriem-BM Jun 12, 2024
f3bff27
skip if there's a wrong tx hash
RamRamez Jun 12, 2024
8cae4f6
skip if there's a wrong error in insertDonationsFromQfRoundHistory
RamRamez Jun 12, 2024
e36f63a
Get giv price from coingecko instead of subgraph (#1621)
mohammadranjbarz Jun 13, 2024
871d3b4
Merge pull request #1624 from Giveth/fix/arch_qf_round_usd_val
Meriem-BM Jun 13, 2024
b1b2c1f
remove unused logs
RamRamez Jun 13, 2024
a71e500
remove unused logs
RamRamez Jun 13, 2024
37f5e36
force findActiveQfRound to use read replica
RamRamez Jun 13, 2024
762ad2c
rewrite updateProjectStatistics
RamRamez Jun 14, 2024
23ebf0d
move refreshProjectEstimatedMatchingView
RamRamez Jun 14, 2024
d005737
optimize updateProjectStatistics
RamRamez Jun 14, 2024
cd4f9ca
Merge pull request #1605 from Giveth/change-admin#1602
RamRamez Jun 14, 2024
49a2eab
Merge pull request #1625 from Giveth/optimize-updateProjectStatistics
RamRamez Jun 14, 2024
80f524d
ProjectEstimatedMatchingView V3
RamRamez Jun 17, 2024
ba23fb0
resolve ProjectEstimatedMatchingView V2 errors
RamRamez Jun 17, 2024
59df24a
update donationRepository.test.ts
RamRamez Jun 17, 2024
76b9552
update donationRepository.ts
RamRamez Jun 17, 2024
df2c19b
update project.ts
RamRamez Jun 17, 2024
188aec4
update ProjectEstimatedMatchingView.ts
RamRamez Jun 17, 2024
ab5e781
update projectRepository.ts
RamRamez Jun 17, 2024
cc75a05
update projectService.ts with new estimated matching structure
RamRamez Jun 17, 2024
c35773a
update qfRoundHistory.ts with new estimated matching structure
RamRamez Jun 17, 2024
ebc34d1
update qfRoundRepository.test.ts with new estimated matching structure
RamRamez Jun 17, 2024
b84155a
update qfRoundRepository.ts with new estimated matching structure
RamRamez Jun 17, 2024
3494a56
update qfRoundResolver.ts with new estimated matching structure
RamRamez Jun 17, 2024
196023f
update qfUtils.ts with new estimated matching structure
RamRamez Jun 17, 2024
360c144
add verified status
RamRamez Jun 17, 2024
16a9576
add minimumPassportScore to getProjectQfRoundStats
RamRamez Jun 17, 2024
258e5d4
add check for begin and end date to getProjectQfRoundStats
RamRamez Jun 17, 2024
5e46008
remove refreshProjectEstimatedMatchingView from tests
RamRamez Jun 17, 2024
f43794e
fix qfRoundRepository.test.ts tests
RamRamez Jun 17, 2024
c700005
remove qfRound stats from projects when added or removed from QF round
RamRamez Jun 18, 2024
3df84dd
Merge pull request #1630 from Giveth/fix-estimated-matching-view
RamRamez Jun 18, 2024
e034f47
update added projects only
RamRamez Jun 18, 2024
f1bb60f
update added projects only
RamRamez Jun 18, 2024
847d2ef
optimize refreshProjectEstimatedMatchingView
RamRamez Jun 18, 2024
e2dc95c
set NODE_ENV for refreshProjectEstimatedMatchingView
RamRamez Jun 18, 2024
3caddea
merge getQfRoundUniqueDonors and getQfRoundTotalDonations
RamRamez Jun 18, 2024
fdfc387
fix adding valueUsd to query
RamRamez Jun 18, 2024
8e849fb
Merge pull request #1633 from Giveth/merge-getQfRoundUniqueDonors-and…
RamRamez Jun 18, 2024
34c1630
add userQfRoundModelScore
CarlosQ96 Jun 18, 2024
7f8cb73
remove minimumPassportScore from getProjectQfRoundStats
RamRamez Jun 19, 2024
727bbce
remove user join from getProjectQfRoundStats
RamRamez Jun 19, 2024
382a73e
Merge pull request #1632 from Giveth/optimize-refreshProjectEstimated…
RamRamez Jun 19, 2024
404c648
remove insertDonationsFromQfRoundHistory from syncDonationStatusWithB…
RamRamez Jun 19, 2024
8725500
enable replica
RamRamez Jun 19, 2024
179c92b
projectVerificationRepository.ts replace .save with update method
RamRamez Jun 19, 2024
da168df
projectVerificationRepository.ts replace .save with update method
RamRamez Jun 19, 2024
8d2f1a5
remove unused fields from logs
RamRamez Jun 19, 2024
0f9717f
remove user from badge warning
RamRamez Jun 19, 2024
713eca0
optimize projectsWithoutUpdateAfterTimeFrame
RamRamez Jun 19, 2024
e0a4efa
fix merge conflicts
CarlosQ96 Jun 20, 2024
0270e4e
Zkevm integration (#1635)
mohammadranjbarz Jun 20, 2024
b20d23d
fix merge conflicts
RamRamez Jun 20, 2024
86107c8
Merge pull request #1636 from Giveth/remove-insertDonationsFromQfRoun…
RamRamez Jun 20, 2024
117f6b7
add projectId to projectRepository.ts
RamRamez Jun 20, 2024
851d411
remove unnecessary updatedAt
RamRamez Jun 20, 2024
6f81446
Merge branch 'staging' into optimize-check-project-verification
RamRamez Jun 20, 2024
013294c
fix: get unique_donors based on user wallet address not added to sybi…
Meriem-BM Jun 21, 2024
076c518
Merge pull request #1637 from Giveth/optimize-check-project-verification
RamRamez Jun 22, 2024
3cd7ed2
add cache to findActiveQfRound
RamRamez Jun 22, 2024
1bb77c1
Add on conflicrt do nothing for add zkevm tokens
mohammadranjbarz Jun 23, 2024
59e1b7e
Fix add polygon zkevm token migration
mohammadranjbarz Jun 23, 2024
50179c3
remove updateTotalDonationsOfProject from migrations
RamRamez Jun 23, 2024
2e8f139
replace updateTotalDonationsOfProject with updateProjectStatistics
RamRamez Jun 23, 2024
a3309a1
replace updateTotalDonationsOfProject with updateProjectStatistics
RamRamez Jun 23, 2024
e1d5d6d
remove sumDonationValueUsd from project
RamRamez Jun 23, 2024
7a723ce
Merge pull request #1643 from Giveth/fix/findArchivedQfRounds
Meriem-BM Jun 23, 2024
804a396
do email verification on project verification form through Ortto
RamRamez Jun 24, 2024
50b943b
add solana to available networks for qfround
CarlosQ96 Jun 24, 2024
093d034
remove knownAsSybilAddress from user
RamRamez Jun 24, 2024
2108bd9
wrong query cache in some functions
RamRamez Jun 24, 2024
da8ead3
Merge pull request #1651 from Giveth/remove-knownAsSybilAddress-from-…
RamRamez Jun 24, 2024
9101257
Merge pull request #1652 from Giveth/wrong-query-cache-in-some-functions
RamRamez Jun 24, 2024
31e5d52
User Story - Rejected project owner reason
RamRamez Jun 25, 2024
a0c6e5b
use networkId instead of optimism-only flag (#1653)
ae2079 Jun 25, 2024
0ef0f1d
fatal errors (#1640)
ae2079 Jun 26, 2024
e90c05a
added on final step for verification project data
kkatusic Jun 26, 2024
ce5dd10
Replace ortto External Embedded Webform for Onboarding guide
RamRamez Jun 26, 2024
7fb5174
fix: findArchivedQfRounds query
Meriem-BM Jun 27, 2024
672c1bd
Merge pull request #1660 from Giveth/fix/findArchivedQfRounds
Meriem-BM Jun 27, 2024
6de2ef7
Merge branch 'refs/heads/staging' into add-cache-to-findActiveQfRound
RamRamez Jun 28, 2024
5cbdeab
Merge pull request #1644 from Giveth/add-cache-to-findActiveQfRound
RamRamez Jun 28, 2024
50d2563
Merge branch 'staging' into Replace-ortto-External-Embedded-Webform-f…
RamRamez Jun 30, 2024
18dc52d
fix subscribeOnboarding args
RamRamez Jun 30, 2024
5f8f952
change output to boolean
RamRamez Jun 30, 2024
a60e86e
Merge branch 'refs/heads/staging' into remove-updateTotalDonationsOfP…
RamRamez Jun 30, 2024
b731ea7
Merge pull request #1648 from Giveth/remove-updateTotalDonationsOfPro…
RamRamez Jun 30, 2024
e1542ad
Merge pull request #1649 from Giveth/do-email-verification-on-project…
RamRamez Jun 30, 2024
04ec864
WIP: add API key to request & add fetch MBD score record from DB
Meriem-BM Jun 30, 2024
69f4630
Merge branch 'master' into staging
mohammadranjbarz Jul 1, 2024
f6a55f5
Merge pull request #1654 from Giveth/User-Story---Rejected-project-ow…
RamRamez Jul 1, 2024
685ac4d
Merge branch 'refs/heads/staging' into Replace-ortto-External-Embedde…
RamRamez Jul 1, 2024
078efce
Merge pull request #1657 from Giveth/Replace-ortto-External-Embedded-…
RamRamez Jul 1, 2024
80bf7f1
fixed last step verification
kkatusic Jul 1, 2024
e3d7294
fixed typo
kkatusic Jul 1, 2024
922f701
WIP: add field to user that holds user MBD score for an active round
Meriem-BM Jul 2, 2024
641ae06
disable DB Replica on staging
RamRamez Jul 2, 2024
6935405
Merge branch 'master' into staging
mohammadranjbarz Jul 3, 2024
bb44cca
Merge branch 'staging' of github.com:Giveth/impact-graph into staging
mohammadranjbarz Jul 3, 2024
511029d
Merge branch 'master' into staging
mohammadranjbarz Jul 3, 2024
b2c6f83
Merge branch 'master' into staging
mohammadranjbarz Jul 3, 2024
2775e01
Merge branch 'master' into staging
mohammadranjbarz Jul 3, 2024
f569275
fetch data uere with the score from MBD & remove non needed query
Meriem-BM Jul 3, 2024
1c17941
Fix some test cases about stable coin donations
mohammadranjbarz Jul 3, 2024
0ce70b8
fix: issue with adminJs authentication when user has hash as null
Meriem-BM Jul 4, 2024
03eecc6
Merge branch 'staging' into feature_new_qf_scoring_model
Meriem-BM Jul 4, 2024
13001a1
Merge branch 'staging' of github.com:Giveth/impact-graph into feature…
Meriem-BM Jul 4, 2024
de8c3a0
Merge branch 'feature_new_qf_scoring_model' of github.com:Giveth/impa…
Meriem-BM Jul 4, 2024
69a00a8
"Last Update" on project card is not correct
RamRamez Jul 4, 2024
d680f4c
Fix some test cases about stable coin donations (#1665)
mohammadranjbarz Jul 7, 2024
475289e
Merge branch 'staging' of github.com:Giveth/impact-graph into staging
mohammadranjbarz Jul 7, 2024
63f28d1
Bump follow-redirects from 1.15.5 to 1.15.6 (#1414)
dependabot[bot] Jul 7, 2024
2ab5971
Bump @solana/web3.js from 1.87.6 to 1.87.7 (#1492)
dependabot[bot] Jul 7, 2024
0a27af2
Bump express from 4.18.2 to 4.19.2 (#1430)
dependabot[bot] Jul 7, 2024
0e02367
Bump braces from 3.0.2 to 3.0.3 (#1629)
dependabot[bot] Jul 7, 2024
a1e9e68
Merge branch 'staging' into add_ver_step
mohammadranjbarz Jul 7, 2024
56da750
Merge branch 'staging' of github.com:Giveth/impact-graph into staging
mohammadranjbarz Jul 7, 2024
cb53599
Merge branch 'staging' into feature_new_qf_scoring_model
mohammadranjbarz Jul 7, 2024
dc2009f
Bump undici from 5.28.3 to 5.28.4 (#1454)
dependabot[bot] Jul 7, 2024
4e47ddf
Merge pull request #1666 from Giveth/fix/adminJs_auth_issue
Meriem-BM Jul 7, 2024
596bb99
Merge branch 'staging' into add_ver_step
RamRamez Jul 7, 2024
dc7c369
Merge branch 'staging' into Last-Update-on-project-card-is-not-correc…
RamRamez Jul 7, 2024
a0daa2b
fix types
RamRamez Jul 7, 2024
20a581a
Updated project verification form resolver test
kkatusic Jul 8, 2024
323036d
fix extracting last comment
RamRamez Jul 8, 2024
9836981
get donation to giveth with donation box analytics (#1661)
ae2079 Jul 9, 2024
f4cd115
add test for fetching and refreshing qfroundscore for model
CarlosQ96 Jul 9, 2024
06e747f
Merge pull request #1658 from Giveth/add_ver_step
kkatusic Jul 9, 2024
63671a3
Merge branch 'staging' of github.com:Giveth/impact-graph into staging
mohammadranjbarz Jul 10, 2024
bbecb74
revert changes on package,json
RamRamez Jul 10, 2024
5254fac
Merge branch 'refs/heads/staging' into Last-Update-on-project-card-is…
RamRamez Jul 10, 2024
54363dc
revert changes on package,json
RamRamez Jul 10, 2024
2c2c866
fix migration error
RamRamez Jul 10, 2024
dea4ebc
fix migration error
RamRamez Jul 10, 2024
58ee0c8
Merge pull request #1667 from Giveth/Last-Update-on-project-card-is-n…
RamRamez Jul 10, 2024
dc3a424
fix: turn minimumValidUsdValue to nullable when querying
Meriem-BM Jul 10, 2024
2666a56
remove updatedAt from projects tab
RamRamez Jul 10, 2024
039617e
Remove old donation and add new ones (#1674)
ae2079 Jul 10, 2024
b3a3337
Merge branch 'staging' of github.com:Giveth/impact-graph into staging
mohammadranjbarz Jul 11, 2024
f7462a2
remove verified from projects tab edit menu
RamRamez Jul 11, 2024
8533319
remove verified from projectVerificationTab edit menu
RamRamez Jul 11, 2024
e5403d2
fix total donations query
CarlosQ96 Jul 12, 2024
2d8a829
Merge branch 'staging' of github.com:Giveth/impact-graph into feature…
Meriem-BM Jul 12, 2024
dbb7a8f
fix archived_round totals
CarlosQ96 Jul 12, 2024
62947a4
fix latestUpdate column if not exists
CarlosQ96 Jul 12, 2024
3bf23df
fix join for totals
CarlosQ96 Jul 12, 2024
83f06a9
Merge pull request #1675 from Giveth/hotfix_total_donations_query
CarlosQ96 Jul 12, 2024
cd839dc
fix total donations with subquery
CarlosQ96 Jul 13, 2024
45e5011
Merge branch 'master' into staging
CarlosQ96 Jul 13, 2024
890ca7b
Merge branch 'refs/heads/master' into staging
RamRamez Jul 14, 2024
bbd4bc6
Merge branch 'refs/heads/master' into staging
RamRamez Jul 14, 2024
4f1676c
Reslove conflict and merge from `staging` into `feature_new_qf_scorin…
Meriem-BM Jul 15, 2024
390d8b3
fix add some error handling and remove commented interface
Meriem-BM Jul 15, 2024
d50953c
fix: resolve conflict
Meriem-BM Jul 15, 2024
cde4877
fix: resolve conflict
Meriem-BM Jul 15, 2024
7cabdf5
fix USD value not showing
RamRamez Jul 15, 2024
977a932
fix: convert timestap retrieved from RPC provider to milisconds
Meriem-BM Jul 15, 2024
51afe2f
fix: donation test cases (milliseconds)
Meriem-BM Jul 15, 2024
ba12770
fix: donation test cases (milliseconds)
Meriem-BM Jul 15, 2024
6aa30a6
Endaoment integration (#1663)
mohammadranjbarz Jul 15, 2024
6b96e6c
fix: donation test cases (milliseconds)
Meriem-BM Jul 15, 2024
757bad9
Merge branch 'staging' of github.com:Giveth/impact-graph into staging
mohammadranjbarz Jul 15, 2024
53afd42
fix: donation test cases (milliseconds)
Meriem-BM Jul 15, 2024
9f66159
Merge pull request #1634 from Giveth/feature_new_qf_scoring_model
Meriem-BM Jul 15, 2024
e1ccfc4
Merge branch 'staging' into fix/3456_ethDonation_not_showing
Meriem-BM Jul 15, 2024
c2ce143
Merge pull request #1684 from Giveth/fix/3456_ethDonation_not_showing
Meriem-BM Jul 15, 2024
886ab6a
Modify ormconfig for running migrations
mohammadranjbarz Jul 15, 2024
15a957f
Merge branch 'staging' of github.com:Giveth/impact-graph into staging
mohammadranjbarz Jul 15, 2024
f53c7da
Merge branch 'master' into staging
mohammadranjbarz Jul 15, 2024
d49daae
Run ts files for migrations
mohammadranjbarz Jul 15, 2024
be5325c
Make isRecipient of project_addresses of endaoment project true
mohammadranjbarz Jul 16, 2024
96d4505
Fix type error of one of endaoment projects
mohammadranjbarz Jul 16, 2024
ef0079c
add test case for filling prices
RamRamez Jul 16, 2024
c474a49
Merge pull request #1683 from Giveth/fix-USD-value-not-showing
RamRamez Jul 17, 2024
6770bd8
Modify add endaoment organization migration to pass the tests
mohammadranjbarz Jul 17, 2024
a34c008
fix: convert minimumUserAnalysisScore to Float on qfRound entity
Meriem-BM Jul 17, 2024
4b2b8a7
fix: revert migration changes
Meriem-BM Jul 17, 2024
1f35df3
add log for filling prices
RamRamez Jul 17, 2024
f14a053
Merge pull request #1692 from Giveth/fix/minimumUserAnalysisScore
Meriem-BM Jul 17, 2024
f9b8109
feat: add github on project socialmedia enum
Reshzera Jul 17, 2024
fb57167
Merge master to staging (#1696)
ae2079 Jul 18, 2024
bb71f47
Add organization filter to projectsTab.ts in admin panel
mohammadranjbarz Jul 18, 2024
af850a4
Merge branch 'staging' of github.com:Giveth/impact-graph into staging
mohammadranjbarz Jul 18, 2024
b74a17e
Fill description summary for endaoment projects
mohammadranjbarz Jul 18, 2024
c4dbe05
Fix eslint errors
mohammadranjbarz Jul 18, 2024
67b33fc
Replace special characters of slugs of endaoment projects with -
mohammadranjbarz Jul 18, 2024
40d4b47
Fix eslint errors
mohammadranjbarz Jul 18, 2024
f63c770
return hardcoded as user MBD score
Meriem-BM Jul 18, 2024
5b84c6b
Merge pull request #1699 from Giveth/fix/minimumUserAnalysisScore
Meriem-BM Jul 18, 2024
fef23d3
Merge pull request #1694 from Giveth/feat/issue-4216
RamRamez Jul 18, 2024
ab9fe0b
rename qfRound minimumUserAnalysisScore field
Meriem-BM Jul 18, 2024
2effef3
Merge pull request #1701 from Giveth/fix/minimumUserAnalysisScore
Meriem-BM Jul 18, 2024
7e17ace
Merge branch 'master' into resolve-conflicts
ae2079 Jul 18, 2024
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
Binary file modified .DS_Store
Binary file not shown.
25 changes: 25 additions & 0 deletions .github/workflows/staging-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,33 @@ on:
- staging

jobs:
run-linters:
name: Run linters
runs-on: ubuntu-latest

steps:
- name: Check out Git repository
uses: actions/checkout@v3

- name: Set up Node.js
uses: actions/setup-node@v1
with:
node-version: 20.11.0

# ESLint and Prettier must be in `package.json`
- name: Install Node.js dependencies
run: npm ci

- name: Run linters
uses: wearerequired/lint-action@v2
with:
eslint: true
#prettier: true
continue_on_error: true

test:
runs-on: ubuntu-latest
needs: run-linters
services:
# Label used to access the service container
redis:
Expand Down
11 changes: 2 additions & 9 deletions config/example.env
Original file line number Diff line number Diff line change
Expand Up @@ -85,20 +85,11 @@ QF_ROUND_GOOGLE_SPREADSHEETS_PRIVATE_KEY=
QF_ROUND_GOOGLE_SPREADSHEETS_CLIENT_EMAIL=
QF_ROUND_DONATIONS_GOOGLE_SPREADSHEET_ID=

POIGN_ART_SUBGRAPH_URL=https://api.thegraph.com/subgraphs/name/dan13ram/poignart-rinkeby
POIGN_ART_SERVICE_ACTIVE=true
POIGN_ART_RECIPIENT_ADDRESS=0x10E1439455BD2624878b243819E31CfEE9eb721C
POIGN_ART_ORIGIN_ADDRESS=
SYNC_POIGN_ART_CRONJOB_EXPRESSION=0 1 * * * *

CHANGE_API_KEYS=
CHANGE_API_NON_PROFITS_SEARCH_URL=


FRONTEND_URL=test.giveth.io
DAPP_MAILER_URL=
DAPP_MAILER_AUTHORIZATION_KEY=
ENABLE_DAPP_MAILER=false

GIVETH_IO_DAPP_BASE_URL=https://staging.giveth.io
GIVETH_IO_BACKEND_BASE_URL=http://localhost:3040
Expand Down Expand Up @@ -330,3 +321,5 @@ ZKEVM_MAINNET_NODE_HTTP_URL=

# ZKEVM CARDONA we should fill it as Infura doesnt support polygon zkevm
ZKEVM_CARDONA_NODE_HTTP_URL=

ENDAOMENT_ADMIN_WALLET_ADDRESS=0xfE3524e04E4e564F9935D34bB5e80c5CaB07F5b4
15 changes: 7 additions & 8 deletions config/test.env
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,7 @@ GIVETH_GIV_PRICES_URL=https://givback.develop.giveth.io/givPrice
PINATA_GATEWAY_ADDRESS=https://giveth.mypinata.cloud


POIGN_ART_SUBGRAPH_URL=https://api.thegraph.com/subgraphs/name/dan13ram/poignart-rinkeby
POIGN_ART_SERVICE_ACTIVE=false
POIGN_ART_RECIPIENT_ADDRESS=0x66f59a4181f43b96fe929b711476be15c96b83b3
POIGN_ART_ORIGIN_ADDRESS=0x7a1dc1805f079a07ffd03845d3ec5b51ec8f9373
SYNC_POIGN_ART_CRONJOB_EXPRESSION=0 0 0 * * *

TRACE_FILE_UPLOADER_PASSWORD=hello_trace


Expand All @@ -103,9 +99,6 @@ PRIVATE_ETHERS_SECONDARY_TEST_KEY=0x2f8ca279705d6dfc44fb4507d02f6ef8bd0a50188695
PUBLIC_ETHERS_SECONDARY_TEST_KEY=0x05fCFaDDFEc046F393B97C8273ad0537e83EFC74

FRONTEND_URL=test.giveth.io
DAPP_MAILER_URL=
DAPP_MAILER_AUTHORIZATION_KEY=
ENABLE_DAPP_MAILER=false

GIVETH_IO_DAPP_BASE_URL=https://staging.giveth.io
GIVETH_IO_BACKEND_BASE_URL=http://localhost:3040
Expand Down Expand Up @@ -188,6 +181,10 @@ NUMBER_OF_BALANCE_AGGREGATOR_BATCH=7
QF_ROUND_ESTIMATED_MATCHING_CACHE_DURATION=1
# ! millisecond cache, if we increase cache in test ENV we might get some errors in tests
PROJECT_CAMPAIGNS_CACHE_DURATION=1
# ! millisecond cache, if we increase cache in test ENV we might get some errors in tests
QF_ROUND_AND_MAIN_CATEGORIES_CACHE_DURATION=1
# ! millisecond cache, if we increase cache in test ENV we might get some errors in tests
REFRESH_ESTIMATED_MATCHING_CACHE_DURATION=1


# OPTIONAL - default: *0 */5 * * * ( Every 5 minutes)
Expand Down Expand Up @@ -254,3 +251,5 @@ ZKEVM_MAINNET_NODE_HTTP_URL=https://polygon-zkevm.drpc.org

# ZKEVM CARDONA we should fill it as Infura doesnt support polygon zkevm, I found this rpc link from https://chainlist.org/chain/2442
ZKEVM_CARDONA_NODE_HTTP_URL=https://rpc.cardona.zkevm-rpc.com

ENDAOMENT_ADMIN_WALLET_ADDRESS=0xfE3524e04E4e564F9935D34bB5e80c5CaB07F5b4
5 changes: 5 additions & 0 deletions funding.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"opRetro": {
"projectId": "0xe434930e189c807b137ff0d8e2fa6a95eaa57dde574143a02ca0d7fb31a40bea"
}
}
3 changes: 1 addition & 2 deletions migration/1646305490859-seedOrganizations.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import { MigrationInterface, QueryRunner } from 'typeorm';
import { ORGANIZATION_LABELS } from '../src/entities/organization';

const { GIVETH, GIVING_BLOCK, TRACE, CHANGE } = ORGANIZATION_LABELS;
const { GIVETH, TRACE, CHANGE } = ORGANIZATION_LABELS;

export class seedOrganizations1646305490859 implements MigrationInterface {
async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`INSERT INTO organization (label,name,website) VALUES
('${GIVETH}','Giveth','https://giveth.io'),
('${TRACE}','Trace','https://trace.giveth.io'),
('${GIVING_BLOCK}','Giving Block','https://thegivingblock.com'),
('${CHANGE}','CHANGE','https://getchange.io')
;`);
}
Expand Down
4 changes: 2 additions & 2 deletions migration/1684654545845-add_some_mainnet_donations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import {
} from '../src/services/userService';
import { findProjectById } from '../src/repositories/projectRepository';
import { Project } from '../src/entities/project';
import { updateTotalDonationsOfProject } from '../src/services/donationService';
import { calculateGivbackFactor } from '../src/services/givbackService';
import { AppDataSource } from '../src/orm';
import { updateProjectStatistics } from '../src/services/projectService';

const fromWalletAddress = '0x6bed0ce7be8dc307b69cfdc100f87db51bc3823a';
const txHash =
Expand Down Expand Up @@ -257,7 +257,7 @@ export class addSomeMainnetDonations1684654545845
`);
await updateUserTotalDonated(user.id);
await updateUserTotalReceived(project.adminUser?.id);
await updateTotalDonationsOfProject(tx.projectId as number);
await updateProjectStatistics(tx.projectId as number);
}
}

Expand Down
4 changes: 2 additions & 2 deletions migration/1696918830123-add_octant_donations_to_db.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import {
updateUserTotalDonated,
updateUserTotalReceived,
} from '../src/services/userService';
import { updateTotalDonationsOfProject } from '../src/services/donationService';
import { Donation } from '../src/entities/donation';
import { NETWORK_IDS } from '../src/provider';
import { updateProjectStatistics } from '../src/services/projectService';

const octantDonationTxHash =
'0xe70a8ee39511d3c186ea53c4bdd9fcd34f658d68ca7e1bbbc2b231630ac7fa3b';
Expand Down Expand Up @@ -108,7 +108,7 @@ export class addOctantDonationsToDb1696918830123 implements MigrationInterface {
`);
await updateUserTotalDonated(user.id);
await updateUserTotalReceived(project.adminUser?.id);
await updateTotalDonationsOfProject(tx.projectId as number);
await updateProjectStatistics(tx.projectId as number);
}
}

Expand Down
10 changes: 3 additions & 7 deletions migration/1703398409668-add_missed_op_donations_to_db.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,10 @@ import {
updateUserTotalDonated,
updateUserTotalReceived,
} from '../src/services/userService';
import { updateTotalDonationsOfProject } from '../src/services/donationService';
import { Donation } from '../src/entities/donation';
import { NETWORK_IDS } from '../src/provider';
import {
refreshProjectDonationSummaryView,
refreshProjectEstimatedMatchingView,
} from '../src/services/projectViewsService';
import { refreshProjectEstimatedMatchingView } from '../src/services/projectViewsService';
import { updateProjectStatistics } from '../src/services/projectService';

const QF_ROUND_ID = 5;
const millisecondTimestampToDate = (timestamp: number): Date => {
Expand Down Expand Up @@ -274,11 +271,10 @@ export class addMissedOpDonationsToDb1703398409668

await updateUserTotalDonated(user.id);
await updateUserTotalReceived(project.adminUser?.id);
await updateTotalDonationsOfProject(tx.projectId as number);
await updateProjectStatistics(tx.projectId as number);
}

await refreshProjectEstimatedMatchingView();
await refreshProjectDonationSummaryView();
}

async down(_queryRunner: QueryRunner): Promise<void> {
Expand Down
8 changes: 1 addition & 7 deletions migration/1716549958362-add_donations_mannually_to_db.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,7 @@ import {
updateUserTotalDonated,
updateUserTotalReceived,
} from '../src/services/userService';
import { updateTotalDonationsOfProject } from '../src/services/donationService';
import {
refreshProjectDonationSummaryView,
refreshProjectEstimatedMatchingView,
} from '../src/services/projectViewsService';
import { refreshProjectEstimatedMatchingView } from '../src/services/projectViewsService';
import { updateProjectStatistics } from '../src/services/projectService';

const millisecondTimestampToDate = (timestamp: number): Date => {
Expand Down Expand Up @@ -395,12 +391,10 @@ export class AddDonationsMannuallyToDb1716549958362

await updateUserTotalDonated(user.id);
await updateUserTotalReceived(project.adminUser?.id);
await updateTotalDonationsOfProject(tx.projectId as number);
await updateProjectStatistics(tx.projectId as number);
}

await refreshProjectEstimatedMatchingView();
await refreshProjectDonationSummaryView();
}

async down(_queryRunner: QueryRunner): Promise<void> {
Expand Down
14 changes: 14 additions & 0 deletions migration/1717502321980-dropDonationSummaryView.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class DropDonationSummaryView1717502321980
implements MigrationInterface
{
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`
DROP MATERIALIZED VIEW IF EXISTS project_donation_summary_view;`,
);
}

public async down(_queryRunner: QueryRunner): Promise<void> {}
}
63 changes: 63 additions & 0 deletions migration/1717643016553-ProjectFuturePowerView_V2.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class ProjectFuturePowerViewV21717643016553
implements MigrationInterface
{
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`
DROP
MATERIALIZED VIEW IF EXISTS public.project_future_power_view;
CREATE MATERIALIZED VIEW IF NOT EXISTS public.project_future_power_view AS
SELECT
innerview."projectId",
innerview."totalPower",
rank() OVER (
ORDER BY
innerview."totalPower" DESC
) AS "powerRank",
"powerRound".round + 1 as "round"
FROM
(
SELECT
project.id AS "projectId",
CASE project.verified and project."statusId" = 5 WHEN false THEN 0 :: double precision ELSE COALESCE(
sum(pp."boostedPower"),
0 :: double precision
) END AS "totalPower"
FROM
project project
JOIN (
SELECT
"powerRound".round,
"powerBoostingSnapshot"."projectId",
"powerBoostingSnapshot"."userId",
avg(
"powerBalanceSnapshot".balance * "powerBoostingSnapshot".percentage :: double precision / 100 :: double precision
) AS "boostedPower",
now() AS "updateTime"
FROM
power_round "powerRound"
JOIN power_snapshot "powerSnapshot" ON "powerSnapshot"."roundNumber" = "powerRound".round + 1 and "powerSnapshot".synced = true
JOIN power_balance_snapshot "powerBalanceSnapshot" ON "powerBalanceSnapshot"."powerSnapshotId" = "powerSnapshot".id
JOIN power_boosting_snapshot "powerBoostingSnapshot" ON "powerBoostingSnapshot"."powerSnapshotId" = "powerSnapshot".id
AND "powerBoostingSnapshot"."userId" = "powerBalanceSnapshot"."userId"
GROUP BY
"powerRound".round,
"powerBoostingSnapshot"."projectId",
"powerBoostingSnapshot"."userId"
) pp ON pp."projectId" = project.id
GROUP BY
project.id
) innerview,
power_round "powerRound"
ORDER BY
innerview."totalPower" DESC WITH DATA;
CREATE UNIQUE INDEX project_future_power_view_project_id_unique ON public.project_future_power_view ("projectId");
CREATE INDEX project_future_power_view_project_id ON public.project_future_power_view USING hash ("projectId") TABLESPACE pg_default;
`,
);
}

public async down(_queryRunner: QueryRunner): Promise<void> {}
}
62 changes: 62 additions & 0 deletions migration/1717643739652-ProjectPowerView_V2.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class ProjectPowerViewV21717643739652 implements MigrationInterface {
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`
DROP
MATERIALIZED VIEW IF EXISTS public.project_power_view;
CREATE MATERIALIZED VIEW IF NOT EXISTS public.project_power_view AS
SELECT
innerview."projectId",
ROUND(CAST(innerview."totalPower" as NUMERIC), 2) as "totalPower",
rank() OVER (
ORDER BY
innerview."totalPower" DESC
) AS "powerRank",
"powerRound".round
FROM
(
SELECT
project.id AS "projectId",
CASE project.verified and project."statusId" = 5 WHEN false THEN 0 :: double precision ELSE COALESCE(
sum(pp."boostedPower"),
0 :: double precision
) END AS "totalPower"
FROM
project project
LEFT JOIN (
SELECT
"powerRound".round,
"powerBoostingSnapshot"."projectId",
"powerBoostingSnapshot"."userId",
avg(
"powerBalanceSnapshot".balance * "powerBoostingSnapshot".percentage :: double precision / 100 :: double precision
) AS "boostedPower",
now() AS "updateTime"
FROM
power_round "powerRound"
JOIN power_snapshot "powerSnapshot" ON "powerSnapshot"."roundNumber" = "powerRound".round
JOIN power_balance_snapshot "powerBalanceSnapshot" ON "powerBalanceSnapshot"."powerSnapshotId" = "powerSnapshot".id
JOIN power_boosting_snapshot "powerBoostingSnapshot" ON "powerBoostingSnapshot"."powerSnapshotId" = "powerSnapshot".id
AND "powerBoostingSnapshot"."userId" = "powerBalanceSnapshot"."userId"
GROUP BY
"powerRound".round,
"powerBoostingSnapshot"."projectId",
"powerBoostingSnapshot"."userId"
) pp ON pp."projectId" = project.id
GROUP BY
project.id
) innerview,
power_round "powerRound"
ORDER BY
innerview."totalPower" DESC WITH DATA;
CREATE UNIQUE INDEX project_power_view_project_id_round_unique ON public.project_power_view ("projectId", "round");
CREATE INDEX project_power_view_project_id ON public.project_power_view USING hash ("projectId") TABLESPACE pg_default;
CREATE INDEX project_power_view_total_power ON public.project_power_view USING btree ("totalPower" DESC) TABLESPACE pg_default;
`,
);
}

public async down(_queryRunner: QueryRunner): Promise<void> {}
}
37 changes: 37 additions & 0 deletions migration/1717644442966-ProjectUserInstantPowerView_V2.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class ProjectUserInstantPowerViewV21717644442966
implements MigrationInterface
{
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
DROP MATERIALIZED VIEW IF EXISTS PUBLIC.PROJECT_USER_INSTANT_POWER_VIEW;

CREATE MATERIALIZED VIEW IF NOT EXISTS PUBLIC.PROJECT_USER_INSTANT_POWER_VIEW AS
SELECT "powerBoosting"."id",
"powerBoosting"."projectId",
"powerBoosting"."userId",
("instantPowerBalance".BALANCE * "powerBoosting".PERCENTAGE :: double precision / 100 :: double precision) AS "boostedPower",
NOW() AS "updateTime"
FROM INSTANT_POWER_BALANCE "instantPowerBalance"
JOIN POWER_BOOSTING "powerBoosting" ON "powerBoosting"."userId" = "instantPowerBalance"."userId";
`);

await queryRunner.query(`
CREATE UNIQUE INDEX project_user_instant_power_view_id ON public.project_user_instant_power_view ("id");
`);

await queryRunner.query(`
CREATE UNIQUE INDEX project_user_instant_power_view_project_user_id ON public.project_user_instant_power_view ("projectId", "userId");
`);

await queryRunner.query(`
CREATE INDEX project_user_instant_power_view_project_id ON PUBLIC.PROJECT_USER_INSTANT_POWER_VIEW USING hash ("projectId") TABLESPACE pg_default;
`);
await queryRunner.query(`
CREATE INDEX PROJECT_USER_INSTANT_POWER_VIEW_TOTAL_POWER ON PUBLIC.PROJECT_USER_INSTANT_POWER_VIEW USING BTREE ("boostedPower" DESC) TABLESPACE PG_DEFAULT;
`);
}

public async down(_queryRunner: QueryRunner): Promise<void> {}
}
Loading
Loading