kredits/kredits-web
9
0
Fork 0
Code Issues 22 Pull Requests 1 Actions Releases 18 Activity

Use integer for contributor ID everywhere

Browse Source 
closes #145
This commit is contained in:
Basti
2022-05-21 18:16:26 +02:00
parent 466354cff7
commit 4c749bca35
14 changed files with 47 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/components/add-contribution/component.js
+11 -1
View File
@@ -9,7 +9,15 @@ export default Component.extend({
kredits: service(),
attributes: null,
contributors: alias('kredits.contributorsSorted'),
contributors: computed('kredits.contributorsSorted.[]', function() {
return this.kredits.contributorsSorted.map(c => {
return {
id: c.id.toString(),
name: c.name
}
})
}),
isValidContributor: notEmpty('contributorId'),
isValidKind: notEmpty('kind'),
@@ -57,6 +65,8 @@ export default Component.extend({
const attributes = this.getProperties(Object.keys(this.attributes));
attributes.contributorId = parseInt(this.contributorId);
let dateInput = (attributes.date instanceof Array) ?
attributes.date[0] : attributes.date;
app/components/add-contribution/template.hbs
+1 -1
View File
@@ -4,7 +4,7 @@
<p>
<select required onchange={{action (mut this.contributorId) value="target.value"}}>
<option value="" selected disabled hidden></option>
{{#each @contributors as |contributor|}}
{{#each this.contributors as |contributor|}}
<option value={{contributor.id}} selected={{eq this.contributorId contributor.id}}>{{contributor.name}}</option>
{{/each}}
</select>
app/components/contribution-list/component.js
+3 -4
View File
@@ -24,10 +24,9 @@ export default Component.extend({
contributors: sort('kredits.contributors', 'contributorsSorting'),
contributorsActive: computed('contributors.[]', 'contributions', function() {
const activeIds = new Set(this.contributions.mapBy('contributorId')
.map(id => id.toString()));
const activeIds = new Set(this.contributions.mapBy('contributorId'));
return this.contributors.filter(c => activeIds.has(c.id.toString()));
return this.contributors.filter(c => activeIds.has(c.id));
}),
contributionKinds: computed('contributions.[]', function() {
@@ -42,7 +41,7 @@ export default Component.extend({
c.amount <= 500) { included = false; }
if (isPresent(this.contributorId) &&
c.contributorId.toString() !== this.contributorId.toString()) { included = false; }
c.contributorId !== parseInt(this.contributorId)) { included = false; }
if (isPresent(this.contributionKind) &&
c.kind !== this.contributionKind) { included = false; }
app/models/contribution.js
-2
View File
@@ -3,7 +3,6 @@ import { isEmpty, isPresent } from '@ember/utils';
import moment from 'moment';
export default EmberObject.extend({
// Contract
id: null,
contributorId: null,
@@ -48,5 +47,4 @@ export default EmberObject.extend({
serialize () {
return JSON.stringify(this);
}
});
app/models/contributor.js
-1
View File
@@ -22,5 +22,4 @@ export default EmberObject.extend({
serialize () {
return JSON.stringify(this);
}
});
app/routes/contributions/resubmit.js
+2 -6
View File
@@ -6,19 +6,15 @@ export default Route.extend({
kredits: service(),
model(params) {
const contribution = this.kredits.contributions.findBy('id', parseInt(params.id));
contribution.contributorId = contribution.contributorId.toString();
return contribution;
return this.kredits.contributions.findBy('id', parseInt(params.id));
},
setupController (controller, model) {
this._super(controller, model);
controller.set('attributes', model.getProperties([
'kind', 'amount', 'description', 'url', 'details'
'contributorId', 'kind', 'amount', 'description', 'url', 'details'
]));
controller.set('attributes.contributorId', model.contributorId.toString());
controller.set('attributes.date', model.jsDate);
}
app/services/kredits.js
+15 -13
View File
@@ -160,12 +160,12 @@ export default Service.extend({
kreditsByContributor: computed('contributionsUnconfirmed.@each.vetoed', 'contributors.[]', function() {
const contributionsUnconfirmed = this.contributionsUnconfirmed.filterBy('vetoed', false);
const contributionsGrouped = groupBy(contributionsUnconfirmed, 'contributorId');
const contributorsWithUnconfirmed = contributionsGrouped.map(c => c.value.toString());
const contributorsWithUnconfirmed = contributionsGrouped.map(c => c.value);
const contributorsWithOnlyConfirmed = this.contributors.reject(c => contributorsWithUnconfirmed.includes(c.id))
const kreditsByContributor = contributionsGrouped.map(c => {
const amountUnconfirmed = c.items.mapBy('amount').reduce((a, b) => a + b);
const contributor = this.contributors.findBy('id', c.value.toString());
const contributor = this.contributors.findBy('id', c.value);
return EmberObject.create({
contributor: contributor,
@@ -275,7 +275,7 @@ export default Service.extend({
});
},
loadContributorFromData(data) {
loadContributorFromData (data) {
const contributor = Contributor.create(processContributorData(data));
const loadedContributor = this.contributors.findBy('id', contributor.id);
if (loadedContributor) { this.contributors.removeObject(loadedContributor); }
@@ -285,7 +285,7 @@ export default Service.extend({
async cacheLoadedContributors () {
for (const c of this.contributors) {
await this.browserCache.contributors.setItem(c.id, c.serialize());
await this.browserCache.contributors.setItem(c.id.toString(), c.serialize());
}
console.debug(`[kredits] Cached ${this.contributors.length} contributors in browser storage`);
return Promise.resolve();
@@ -340,7 +340,7 @@ export default Service.extend({
loadContributionFromData(data) {
const contribution = Contribution.create(processContributionData(data));
contribution.set('contributor', this.contributors.findBy('id', data.contributorId.toString()));
contribution.set('contributor', this.contributors.findBy('id', data.contributorId));
const loadedContribution = this.contributions.findBy('id', contribution.id);
if (loadedContribution) { this.contributions.removeObject(loadedContribution); }
this.contributions.pushObject(contribution);
@@ -349,7 +349,7 @@ export default Service.extend({
async cacheLoadedContributions () {
for (const c of this.contributions) {
await this.browserCache.contributions.setItem(c.id, c.serialize());
await this.browserCache.contributions.setItem(c.id.toString(), c.serialize());
}
console.debug(`[kredits] Cached ${this.contributions.length} contributions in browser storage`);
return Promise.resolve();
@@ -575,7 +575,7 @@ export default Service.extend({
loadReimbursementFromData(data) {
const obj = Reimbursement.create(processReimbursementData(data));
obj.set('contributor', this.contributors.findBy('id', data.recipientId.toString()));
obj.set('contributor', this.contributors.findBy('id', data.recipientId));
this.removeObjectFromCollectionIfLoaded('reimbursements', obj.id);
this.reimbursements.pushObject(obj);
return obj;
@@ -589,7 +589,7 @@ export default Service.extend({
console.debug('[kredits] add reimbursement response', data);
const reimbursement = Reimbursement.create(attributes);
reimbursement.setProperties({
contributor: this.contributors.findBy('id', attributes.recipientId.toString()),
contributor: this.contributors.findBy('id', attributes.recipientId),
pendingTx: data,
confirmedAt: this.currentBlock + 40320
});
@@ -645,13 +645,15 @@ export default Service.extend({
const contributorData = await this.kredits.Contributor.getById(contributorId);
const newContributor = Contributor.create(contributorData);
const oldContributor = this.contributors.findBy('id', contributorId.toString());
// TODO check for actual differences in the contributor data first
const oldContributor = this.contributors.findBy('id', contributorId);
if (oldContributor) {
console.debug('[kredits] old contributor', oldContributor);
// console.debug('[kredits] cached contributor', oldContributor);
this.contributors.removeObject(oldContributor);
}
console.debug('[kredits] new contributor', newContributor);
// console.debug('[kredits] incoming contributor data', newContributor);
this.contributors.pushObject(newContributor);
},
@@ -660,13 +662,13 @@ export default Service.extend({
const pendingContribution = this.contributions.find(c => {
return (c.id === null) &&
(c.contributorId.toString() === contributorId.toString()) &&
(c.contributorId === contributorId) &&
(c.amount.toString() === amount.toString());
});
if (pendingContribution) {
const attributes = await this.kredits.Contribution.getById(id);
attributes.contributor = this.contributors.findBy('id', attributes.contributorId.toString());
attributes.contributor = this.contributors.findBy('id', attributes.contributorId);
const newContribution = Contribution.create(attributes);
this.contributions.addObject(newContribution);
this.contributions.removeObject(pendingContribution);
app/utils/process-contribution-data.js
+2 -3
View File
@@ -8,9 +8,8 @@ export default function processContributionData(data) {
}
const otherProperties = [
'id', 'contributorId', 'amount', 'vetoed',
'ipfsHash', 'kind', 'description', 'details',
'url', 'date', 'time', 'pendingTx'
'id', 'contributorId', 'amount', 'vetoed', 'ipfsHash', 'kind',
'description', 'details', 'url', 'date', 'time', 'pendingTx'
];
otherProperties.forEach(prop => {
app/utils/process-contributor-data.js
+1 -2
View File
@@ -1,13 +1,12 @@
export default function processContributorData(data) {
const processed = {
id: data.id.toString(),
balance: data.balanceInt,
totalKreditsEarned: data.totalKreditsEarned,
contributionsCount: data.contributionsCount?.toNumber()
}
const otherProperties = [
'account', 'accounts', 'ipfsHash', 'isCore', 'kind', 'name', 'url',
'id', 'account', 'accounts', 'ipfsHash', 'isCore', 'kind', 'name', 'url',
'github_username', 'github_uid', 'wiki_username', 'zoom_display_name'
];