-
Notifications
You must be signed in to change notification settings - Fork 18
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
feat: parse open-payments intervals #1355
Conversation
private parseIntervals(grants: Grant[]) { | ||
for (const grant of grants) | ||
for (const accessElement of grant.access) | ||
if (accessElement.limits?.interval) { | ||
const time = accessElement.limits?.interval.split('/') | ||
const duration = moment.duration(time[2]) | ||
const date = moment(time[1]) | ||
const months = duration.asMonths() | ||
if (months === 1) | ||
accessElement.limits!.interval = `every month from ${date.format('ddd')}` | ||
else if (months > 1 && months < 12) | ||
accessElement.limits!.interval = `every ${months} month from ${date.format('ddd')}` | ||
else if (months === 12) | ||
accessElement.limits!.interval = `every year from ${date.format('ddd')}` | ||
else if (months > 12) { | ||
const years = duration.asYears() | ||
accessElement.limits!.interval = `every ${years} year from ${date.format('ddd')}` | ||
} else if (months < 1 && months > 0) { | ||
const days = duration.asDays() | ||
accessElement.limits!.interval = `every ${days} days from ${date.format('ddd')}` | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How do you feel about an implementation of this method that does not mutate the grants list?
(by using .map)
(This would also imply changes on the usage of the function)
(did not test it out)
private parseIntervals(grants: Grant[]) { | |
for (const grant of grants) | |
for (const accessElement of grant.access) | |
if (accessElement.limits?.interval) { | |
const time = accessElement.limits?.interval.split('/') | |
const duration = moment.duration(time[2]) | |
const date = moment(time[1]) | |
const months = duration.asMonths() | |
if (months === 1) | |
accessElement.limits!.interval = `every month from ${date.format('ddd')}` | |
else if (months > 1 && months < 12) | |
accessElement.limits!.interval = `every ${months} month from ${date.format('ddd')}` | |
else if (months === 12) | |
accessElement.limits!.interval = `every year from ${date.format('ddd')}` | |
else if (months > 12) { | |
const years = duration.asYears() | |
accessElement.limits!.interval = `every ${years} year from ${date.format('ddd')}` | |
} else if (months < 1 && months > 0) { | |
const days = duration.asDays() | |
accessElement.limits!.interval = `every ${days} days from ${date.format('ddd')}` | |
} | |
} | |
private parseIntervals(grants: Grant[]): Grant[] { | |
return grants.map(grant => { | |
const access = grant.access.map(accessElement => { | |
if (accessElement.limits?.interval) { | |
const time = accessElement.limits.interval.split('/') | |
const duration = moment.duration(time[2]) | |
const date = moment(time[1]) | |
const months = duration.asMonths() | |
let interval: string; | |
if (months === 1) { | |
interval = `every month from ${date.format('ddd')}`; | |
} else if (months > 1 && months < 12) { | |
interval = `every ${months} month from ${date.format('ddd')}`; | |
} else if (months === 12) { | |
interval = `every year from ${date.format('ddd')}`; | |
} else if (months > 12) { | |
const years = duration.asYears(); | |
interval = `every ${years} year from ${date.format('ddd')}`; | |
} else if (months < 1 && months > 0) { | |
const days = duration.asDays(); | |
interval = `every ${days} days from ${date.format('ddd')}`; | |
} | |
return { | |
...accessElement, | |
limits: { | |
...accessElement.limits, | |
interval: interval, | |
}, | |
}; | |
} | |
return accessElement; | |
}); | |
return { ...grant, access }; | |
}); | |
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you find it decreases readability, I guess we could settle for mutating the grants in the parse method as well.
Up to you & the others
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@beniaminmunteanu I think that your suggested changes do not decrease readability, but the else if
branches do so. I suggested a small change to those branches here, but I think that this can be somehow simplified even more.
const grants = await this.rafikiAuthService.listGrantsWithPagination(args) | ||
this.parseIntervals(grants.grants.edges.map((it) => it.node)) | ||
return grants |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Usage of the non-mutating function would be sth like:
(Not tested)
const grants = await this.rafikiAuthService.listGrantsWithPagination(args) | |
this.parseIntervals(grants.grants.edges.map((it) => it.node)) | |
return grants | |
const grants = await this.rafikiAuthService.listGrantsWithPagination(args) | |
const parsedGrants = this.parseIntervals(grants.grants.edges.map((it) => it.node)) | |
return { | |
...grants, | |
grants: { | |
...grants.grants, | |
edges: grants.grants.edges.map((edge, index) => ({ ...edge, node: parsedGrants[index] })) | |
} | |
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would be harder to read than the current one.
and it would have more time complexity because we have one more for loop here
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
anything that does not mutate data will implicitly have 1 extra loop
package.json
Outdated
"npm": "pnpm", | ||
"yarn": "pnpm", | ||
"node": "^20.12.1" | ||
}, | ||
"private": true, | ||
"packageManager": "pnpm@9.1.1" | ||
"packageManager": "pnpm@9.1.2" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
doesn't deploy pipeline need to adapt to this as well?
Also i'd prefer keeping such upgrades outside of feature PR's like this one
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I also agree that we should keep these updates outside of feature PRs unless it's necessary.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If I didn't make this change, CI would encounter an error that the pnpm version should be updated.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should still be a separate PR for that merged b4 this one, but ok
package.json
Outdated
"npm": "pnpm", | ||
"yarn": "pnpm", | ||
"node": "^20.12.1" | ||
}, | ||
"private": true, | ||
"packageManager": "pnpm@9.1.1" | ||
"packageManager": "pnpm@9.1.2" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I also agree that we should keep these updates outside of feature PRs unless it's necessary.
else if (months === 12) | ||
accessElement.limits!.interval = `every year from ${date.format('ddd')}` | ||
else if (months > 12) { | ||
const years = duration.asYears() | ||
accessElement.limits!.interval = `every ${years} year from ${date.format('ddd')}` |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These two branches look like they can be merged into one, WDYT? @rico191013
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
their messages are different!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, the choice is between having 2 branches or having string interpolation in just one.
I'm fine with both
private parseIntervals(grants: Grant[]) { | ||
for (const grant of grants) | ||
for (const accessElement of grant.access) | ||
if (accessElement.limits?.interval) { | ||
const time = accessElement.limits?.interval.split('/') | ||
const duration = moment.duration(time[2]) | ||
const date = moment(time[1]) | ||
const months = duration.asMonths() | ||
if (months === 1) | ||
accessElement.limits!.interval = `every month from ${date.format('ddd')}` | ||
else if (months > 1 && months < 12) | ||
accessElement.limits!.interval = `every ${months} month from ${date.format('ddd')}` | ||
else if (months === 12) | ||
accessElement.limits!.interval = `every year from ${date.format('ddd')}` | ||
else if (months > 12) { | ||
const years = duration.asYears() | ||
accessElement.limits!.interval = `every ${years} year from ${date.format('ddd')}` | ||
} else if (months < 1 && months > 0) { | ||
const days = duration.asDays() | ||
accessElement.limits!.interval = `every ${days} days from ${date.format('ddd')}` | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@beniaminmunteanu I think that your suggested changes do not decrease readability, but the else if
branches do so. I suggested a small change to those branches here, but I think that this can be somehow simplified even more.
assetCode: 'USD', | ||
assetScale: 2 | ||
}, | ||
interval: 'R/2016-08-23T08:00:00Z/P1M' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why the mocks are changed but there are no tests to check the interval transformation?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It covers in the list pagination test
# Conflicts: # package.json # packages/boutique/backend/Dockerfile.dev # packages/wallet/backend/Dockerfile.dev # packages/wallet/frontend/Dockerfile.dev
- Cover repetition - Cover end and start intervals
Context
Changes