urdt/ussd
5
0
Fork 1
Code Issues 41 Pull Requests Actions Packages Projects Releases Wiki Activity

voucher-data #138

Merged
lash merged 18 commits from voucher-data into master 2024-10-31 13:44:19 +01:00
Conversation 2 Commits 18 Files Changed 11
+709 -196
Alfred-mk commented 2024-10-25 16:39:18 +02:00
Member
Copy Link
Copy Source
  • Store the voucher contract address and decimals, ahead of send vouchers update
- Store the voucher contract address and decimals, ahead of send vouchers update
Alfred-mk added 2 commits 2024-10-25 16:39:19 +02:00
Store and retrieve the voucher decimals and contract address 3ef64271e7
Merge branch 'master' into voucher-data 6c3ff0e9db
Alfred-mk added 1 commit 2024-10-28 09:08:34 +01:00
formatted code ddae746b9d
Alfred-mk added 1 commit 2024-10-28 09:20:13 +01:00
Updated the TestSetVoucher dc782d87a8
Alfred-mk added 4 commits 2024-10-28 14:31:05 +01:00
Added the PrefixDb interface 5d294b663c
Added the subPrefixDb mock 520f5abdcd
Added the prefixDb to the Handlers struct~ 131f3bcf46
Added tests related to the vouchers list 2c361e5b96
Alfred-mk marked the pull request as ready for review 2024-10-28 14:31:42 +01:00
Alfred-mk requested review from lash 2024-10-28 16:27:38 +01:00
Alfred-mk marked the pull request as work in progress 2024-10-28 16:34:36 +01:00
Alfred-mk added 1 commit 2024-10-28 16:40:51 +01:00
Merge branch 'master' into voucher-data 03c32fd265
Alfred-mk marked the pull request as ready for review 2024-10-28 16:41:26 +01:00
lash requested changes 2024-10-29 12:56:17 +01:00
internal/handlers/ussd/menuhandler.go Outdated
@@ -59,2 +59,4 @@
}
// VoucherMetadata helps organize voucher data fields
type VoucherMetadata struct {
lash commented 2024-10-29 12:42:52 +01:00
Owner
Copy Link
Copy Source

Should we use ussd-data-service/pkg/api/api.go TokenHoldings instead?

Should we use ussd-data-service/pkg/api/api.go TokenHoldings instead?
Alfred-mk commented 2024-10-30 16:41:53 +01:00
Author
Member
Copy Link
Copy Source

This is actually a struct for the strings that are returned as formatted values, to be stored in the subPrefixDb

For example
data := VoucherMetadata{
Symbols: "1:SRF\n2:MILO",
Balances: "1:100\n2:200",
Decimals: "1:6\n2:4",
Addresses: "1:0xd4c288865Ce\n2:0x41c188d63Qa",
}

This is actually a struct for the strings that are returned as formatted values, to be stored in the subPrefixDb For example data := VoucherMetadata{ Symbols: "1:SRF\n2:MILO", Balances: "1:100\n2:200", Decimals: "1:6\n2:4", Addresses: "1:0xd4c288865Ce\n2:0x41c188d63Qa", }
Alfred-mk marked this conversation as resolved
internal/handlers/ussd/menuhandler.go Outdated
@@ -1126,2 +1140,3 @@
func ProcessVouchers(holdings []struct {
// processVouchers converts holdings into formatted strings
func processVouchers(holdings []struct {
ContractAddress string `json:"contractAddress"`
lash commented 2024-10-29 12:37:35 +01:00
Owner
Copy Link
Copy Source

this is now the same struct as VoucherMetadata can we consolidate please?

this is now the same struct as `VoucherMetadata` can we consolidate please?
Alfred-mk marked this conversation as resolved
internal/handlers/ussd/menuhandler.go Outdated
@@ -1222,2 +1217,2 @@
symbols := strings.Split(voucherSymbols, "\n")
balances := strings.Split(voucherBalances, "\n")
// getVoucherData retrieves and matches voucher data
func getVoucherData(ctx context.Context, db storage.PrefixDb, input string) (*VoucherMetadata, error) {
lash commented 2024-10-29 12:56:13 +01:00
Owner
Copy Link
Copy Source

This file is getting long. SHould we extract the voucher related methods to a separate file?

This file is getting long. SHould we extract the voucher related methods to a separate file?
Alfred-mk marked this conversation as resolved
Alfred-mk added 2 commits 2024-10-29 22:53:23 +01:00
Moved voucher related functions to the utils package 0480c02633
Updated the tests 7241cdbfcb
Alfred-mk marked the pull request as work in progress 2024-10-30 12:13:15 +01:00
Alfred-mk added 1 commit 2024-10-30 12:13:59 +01:00
Extract common db operations for the test adaa0c63ef
Alfred-mk added 2 commits 2024-10-30 16:31:01 +01:00
get the ussd-data-service package 66b34eaea4
use the dataserviceapi structs caafe495be
Alfred-mk added 1 commit 2024-10-30 16:40:08 +01:00
make the VoucherMetadata more descriptive 8b399781e8
Alfred-mk added 1 commit 2024-10-30 16:46:31 +01:00
Merge branch 'master' into voucher-data a31cac4e50
Alfred-mk marked the pull request as ready for review 2024-10-30 16:46:49 +01:00
Alfred-mk requested review from lash 2024-10-30 16:46:54 +01:00
lash reviewed 2024-10-30 19:37:56 +01:00
internal/utils/vouchers.go Outdated
@@ -0,0 +77,4 @@
for i, sym := range symList {
parts := strings.SplitN(sym, ":", 2)
if len(parts) != 2 {
lash commented 2024-10-30 19:37:17 +01:00
Owner
Copy Link
Copy Source

When will this condition occur?

When will this condition occur?
Alfred-mk commented 2024-10-31 00:46:01 +01:00
Author
Member
Copy Link
Copy Source

It will only occur if the string is not well formatted in the "1:SRF" format, such as it being "1SRF" or "1 SRF"

Ideally, this will not be encountered but I added this as an edge case in the unlikely event that it does

It will only occur if the string is not well formatted in the "1:SRF" format, such as it being "1SRF" or "1 SRF" Ideally, this will not be encountered but I added this as an edge case in the unlikely event that it does
lash commented 2024-10-31 00:49:30 +01:00
Owner
Copy Link
Copy Source

but shouldnt that raise an error, as it should never happen?

but shouldnt that raise an error, as it should never happen?
Alfred-mk commented 2024-10-31 12:44:50 +01:00
Author
Member
Copy Link
Copy Source

On further assessment, I see it best to remove the code as the condition would never occur.

The data being matched comes from the db, and for this condition to occur means an issue lies with the functions that process and store the data

On further assessment, I see it best to remove the code as the condition would never occur. The data being matched comes from the db, and for this condition to occur means an issue lies with the functions that process and store the data
Alfred-mk marked this conversation as resolved
internal/utils/vouchers.go
@@ -0,0 +154,4 @@
}
// Clear temporary voucher data entries
tempEntries := map[DataTyp][]byte{
lash commented 2024-10-30 19:13:17 +01:00
Owner
Copy Link
Copy Source

Do we need to clear them here? Can't we just overwrite later?

Do we need to clear them here? Can't we just overwrite later?
Alfred-mk commented 2024-10-31 00:47:34 +01:00
Author
Member
Copy Link
Copy Source

They can be left and overwritten with any new temporary data

I wanted to work on this functionality on a different PR, where we'll make use of a single temporary data row

They can be left and overwritten with any new temporary data I wanted to work on this functionality on a different PR, where we'll make use of a single temporary data row
lash commented 2024-10-31 00:49:54 +01:00
Owner
Copy Link
Copy Source

ok just drop the lines then?

ok just drop the lines then?
Alfred-mk marked this conversation as resolved
Alfred-mk added 1 commit 2024-10-31 12:26:34 +01:00
retain the temporary data for it to be overwritten b8bbd88078
Alfred-mk added 1 commit 2024-10-31 12:44:48 +01:00
remove unused code e6a369dcdd
lash merged commit 074345fcf9 into master 2024-10-31 13:44:19 +01:00
Sign in to join this conversation.
Reviewers
No Reviewers
lash
Labels
Clear labels
Compat/Breaking
Breaking change that won't be backward compatible
 Kind/Bug
Something is not working
 Kind/Documentation
Documentation changes
 Kind/Enhancement
Improve existing functionality
 Kind/Feature
New functionality
 Kind/Security
This is security issue
 Kind/Testing
Issue or pull request related to testing
Priority
Critical
The priority is critical
Priority
High
The priority is high
Priority
Low
The priority is low
Priority
Medium
The priority is medium
Reviewed
Confirmed
Issue has been confirmed
Reviewed
Duplicate
This issue or pull request already exists
Reviewed
Invalid
Invalid issue
Reviewed
Won't Fix
This issue won't be fixed
Status
Abandoned
Somebody has started to work on this but abandoned work
Status
Blocked
Something is blocking this issue or pull request
Status
Need More Info
Feedback is required to reproduce issue or to continue work
Activity
Doing
An item actively being worked on currently
Activity
Hold
Not being actively worked on
Activity
Proposal
A proposal for a new feature or enhancement
Activity
QA
Ready for QA testing
Activity
Validate
Dev team validating changes
Runner
AT
Runner
CLI
Runner
HTTP
Runner
SSH
cleanup
devops
documentation
easypeasy
A task that can be completed with little effort
 exchange
relating to swapping of assets and offramps
 i18n
Languages and translations
 legacy
Legacy features from the old ussd system to be ported
 meta
container for other issues
 migration
optimization
privilege
features that have to do with special, privileged axx
 refactor
smell
Code smell
 support
transparency and help with exception states
 tooling
ux
No labels
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
Alfred-mk (Alfred Kamanda) carlos kamikazechaser (Mohamed Sohail) lash willruddick
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: urdt/ussd#138