IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-decay-rounding-with-transaction-links

Browse Source
This commit is contained in:
Moriz Wahl 2022-04-25 16:12:40 +02:00 committed by GitHub
commit ecbb59281e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 116 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/src/graphql/createPendingCreation.js
View File

@ -3,7 +3,7 @@ import gql from 'graphql-tag'
export const createPendingCreation = gql`
mutation (
$email: String!
$amount: Float!
$amount: Decimal!
$memo: String!
$creationDate: String!
$moderator: Int!

2
admin/src/graphql/updatePendingCreation.js
View File

@ -4,7 +4,7 @@ export const updatePendingCreation = gql`
mutation (
$id: Int!
$email: String!
$amount: Float!
$amount: Decimal!
$memo: String!
$creationDate: String!
$moderator: Int!

2
backend/src/config/index.ts
View File

@ -10,7 +10,7 @@ Decimal.set({
})
const constants = {
DB_VERSION: '0034-drop_server_user_table',
DB_VERSION: '0035-admin_pending_creations_decimal.ts',
DECAY_START_TIME: new Date('2021-05-13 17:46:31'), // GMT+0
CONFIG_VERSION: {
DEFAULT: 'DEFAULT',

7
backend/src/graphql/arg/CreatePendingCreationArgs.ts
View File

@ -1,4 +1,5 @@
import { ArgsType, Field, Float, InputType, Int } from 'type-graphql'
import { ArgsType, Field, InputType, Int } from 'type-graphql'
import Decimal from 'decimal.js-light'
@InputType()
@ArgsType()
@ -6,8 +7,8 @@ export default class CreatePendingCreationArgs {
@Field(() => String)
email: string
@Field(() => Float)
amount: number
@Field(() => Decimal)
amount: Decimal
@Field(() => String)
memo: string

7
backend/src/graphql/arg/UpdatePendingCreationArgs.ts
View File

@ -1,4 +1,5 @@
import { ArgsType, Field, Float, Int } from 'type-graphql'
import { ArgsType, Field, Int } from 'type-graphql'
import Decimal from 'decimal.js-light'
@ArgsType()
export default class UpdatePendingCreationArgs {
@ -8,8 +9,8 @@ export default class UpdatePendingCreationArgs {
@Field(() => String)
email: string
@Field(() => Float)
amount: number
@Field(() => Decimal)
amount: Decimal
@Field(() => String)
memo: string

9
backend/src/graphql/model/PendingCreation.ts
View File

@ -1,4 +1,5 @@
import { ObjectType, Field, Int } from 'type-graphql'
import Decimal from 'decimal.js-light'
@ObjectType()
export class PendingCreation {
@ -23,12 +24,12 @@ export class PendingCreation {
@Field(() => String)
memo: string
@Field(() => Number)
amount: number
@Field(() => Decimal)
amount: Decimal
@Field(() => Number)
moderator: number
@Field(() => [Number])
creation: number[]
@Field(() => [Decimal])
creation: Decimal[]
}

9
backend/src/graphql/model/UpdatePendingCreation.ts
View File

@ -1,4 +1,5 @@
import { ObjectType, Field } from 'type-graphql'
import Decimal from 'decimal.js-light'
@ObjectType()
export class UpdatePendingCreation {
@ -8,12 +9,12 @@ export class UpdatePendingCreation {
@Field(() => String)
memo: string
@Field(() => Number)
amount: number
@Field(() => Decimal)
amount: Decimal
@Field(() => Number)
moderator: number
@Field(() => [Number])
creation: number[]
@Field(() => [Decimal])
creation: Decimal[]
}

9
backend/src/graphql/model/UserAdmin.ts
View File

@ -1,9 +1,10 @@
import { User } from '@entity/User'
import { ObjectType, Field, Int } from 'type-graphql'
import Decimal from 'decimal.js-light'
import { User } from '@entity/User'
@ObjectType()
export class UserAdmin {
constructor(user: User, creation: number[], hasElopage: boolean, emailConfirmationSend: string) {
constructor(user: User, creation: Decimal[], hasElopage: boolean, emailConfirmationSend: string) {
this.userId = user.id
this.email = user.email
this.firstName = user.firstName
@ -27,8 +28,8 @@ export class UserAdmin {
@Field(() => String)
lastName: string
@Field(() => [Number])
creation: number[]
@Field(() => [Decimal])
creation: Decimal[]
@Field(() => Boolean)
emailChecked: boolean

28
backend/src/graphql/resolver/AdminResolver.ts
View File

@ -43,7 +43,7 @@ import CONFIG from '@/config'
// const EMAIL_OPT_IN_REGISTER = 1
// const EMAIL_OPT_UNKNOWN = 3 // elopage?
const MAX_CREATION_AMOUNT = 1000
const MAX_CREATION_AMOUNT = new Decimal(1000)
const FULL_CREATION_AVAILABLE = [MAX_CREATION_AMOUNT, MAX_CREATION_AMOUNT, MAX_CREATION_AMOUNT]
@Resolver()
@ -170,7 +170,7 @@ export class AdminResolver {
@Mutation(() => [Number])
async createPendingCreation(
@Args() { email, amount, memo, creationDate, moderator }: CreatePendingCreationArgs,
): Promise<number[]> {
): Promise<Decimal[]> {
const user = await dbUser.findOne({ email }, { withDeleted: true })
if (!user) {
throw new Error(`Could not find user with email: ${email}`)
@ -186,7 +186,7 @@ export class AdminResolver {
if (isCreationValid(creations, amount, creationDateObj)) {
const adminPendingCreation = AdminPendingCreation.create()
adminPendingCreation.userId = user.id
adminPendingCreation.amount = BigInt(amount)
adminPendingCreation.amount = amount
adminPendingCreation.created = new Date()
adminPendingCreation.date = creationDateObj
adminPendingCreation.memo = memo
@ -251,14 +251,14 @@ export class AdminResolver {
if (!isCreationValid(creations, amount, creationDateObj)) {
throw new Error('Creation is not valid')
}
pendingCreationToUpdate.amount = BigInt(amount)
pendingCreationToUpdate.amount = amount
pendingCreationToUpdate.memo = memo
pendingCreationToUpdate.date = new Date(creationDate)
pendingCreationToUpdate.moderator = moderator
await AdminPendingCreation.save(pendingCreationToUpdate)
const result = new UpdatePendingCreation()
result.amount = parseInt(amount.toString())
result.amount = amount
result.memo = pendingCreationToUpdate.memo
result.date = pendingCreationToUpdate.date
result.moderator = pendingCreationToUpdate.moderator
@ -286,7 +286,7 @@ export class AdminResolver {
return {
...pendingCreation,
amount: Number(pendingCreation.amount.toString()),
amount: pendingCreation.amount,
firstName: user ? user.firstName : '',
lastName: user ? user.lastName : '',
email: user ? user.email : '',
@ -318,7 +318,7 @@ export class AdminResolver {
if (user.deletedAt) throw new Error('This user was deleted. Cannot confirm a creation.')
const creations = await getUserCreation(pendingCreation.userId, false)
if (!isCreationValid(creations, Number(pendingCreation.amount), pendingCreation.date)) {
if (!isCreationValid(creations, pendingCreation.amount, pendingCreation.date)) {
throw new Error('Creation is not valid!!')
}
@ -448,10 +448,10 @@ export class AdminResolver {
interface CreationMap {
id: number
creations: number[]
creations: Decimal[]
}
async function getUserCreation(id: number, includePending = true): Promise<number[]> {
async function getUserCreation(id: number, includePending = true): Promise<Decimal[]> {
const creations = await getUserCreations([id], includePending)
return creations[0] ? creations[0].creations : FULL_CREATION_AVAILABLE
}
@ -493,30 +493,30 @@ async function getUserCreations(ids: number[], includePending = true): Promise<C
(raw: { month: string; id: string; creation: number[] }) =>
parseInt(raw.month) === month && parseInt(raw.id) === id,
)
return MAX_CREATION_AMOUNT - (creation ? Number(creation.sum) : 0)
return MAX_CREATION_AMOUNT.minus(creation ? creation.sum : 0)
}),
}
})
}
function updateCreations(creations: number[], pendingCreation: AdminPendingCreation): number[] {
function updateCreations(creations: Decimal[], pendingCreation: AdminPendingCreation): Decimal[] {
const index = getCreationIndex(pendingCreation.date.getMonth())
if (index < 0) {
throw new Error('You cannot create GDD for a month older than the last three months.')
}
creations[index] += parseInt(pendingCreation.amount.toString())
creations[index] = creations[index].plus(pendingCreation.amount)
return creations
}
function isCreationValid(creations: number[], amount: number, creationDate: Date) {
function isCreationValid(creations: Decimal[], amount: Decimal, creationDate: Date) {
const index = getCreationIndex(creationDate.getMonth())
if (index < 0) {
throw new Error(`No Creation found!`)
}
if (amount > creations[index]) {
if (amount.greaterThan(creations[index])) {
throw new Error(
`The amount (${amount} GDD) to be created exceeds the available amount (${creations[index]} GDD) for this month.`,
)

33
database/entity/0035-admin_pending_creations_decimal/AdminPendingCreation.ts Normal file
View File

@ -0,0 +1,33 @@
import Decimal from 'decimal.js-light'
import { BaseEntity, Column, Entity, PrimaryGeneratedColumn } from 'typeorm'
import { DecimalTransformer } from '../../src/typeorm/DecimalTransformer'
@Entity('admin_pending_creations')
export class AdminPendingCreation extends BaseEntity {
@PrimaryGeneratedColumn('increment', { unsigned: true })
id: number
@Column({ unsigned: true, nullable: false })
userId: number
@Column({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP' })
created: Date
@Column({ type: 'datetime', nullable: false })
date: Date
@Column({ length: 255, nullable: false, collation: 'utf8mb4_unicode_ci' })
memo: string
@Column({
type: 'decimal',
precision: 40,
scale: 20,
nullable: false,
transformer: DecimalTransformer,
})
amount: Decimal
@Column()
moderator: number
}

2
database/entity/AdminPendingCreation.ts
View File

@ -1 +1 @@
export { AdminPendingCreation } from './0015-admin_pending_creations/AdminPendingCreation'
export { AdminPendingCreation } from './0035-admin_pending_creations_decimal/AdminPendingCreation'

42
database/migrations/0035-admin_pending_creations_decimal.ts Normal file
View File

@ -0,0 +1,42 @@
/* MIGRATION TO CHANGE SEVERAL FIELDS ON `admin_pending_creations`
* - `amount` FIELD TYPE TO `Decimal`
* - `memo` FIELD TYPE TO `varchar(255)`, collate `utf8mb4_unicode_ci`
*/
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
/* eslint-disable @typescript-eslint/no-explicit-any */
export async function upgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
// rename `amount` to `amount_bigint`
await queryFn('ALTER TABLE `admin_pending_creations` RENAME COLUMN `amount` TO `amount_bigint`;')
// add `amount` (decimal)
await queryFn(
'ALTER TABLE `admin_pending_creations` ADD COLUMN `amount` DECIMAL(40,20) DEFAULT NULL AFTER `amount_bigint`;',
)
// fill new `amount` column
await queryFn('UPDATE `admin_pending_creations` SET `amount` = `amount_bigint` DIV 10000;')
// make `amount` not nullable
await queryFn(
'ALTER TABLE `admin_pending_creations` MODIFY COLUMN `amount` DECIMAL(40,20) NOT NULL;',
)
// drop `amount_bitint` column
await queryFn('ALTER TABLE `admin_pending_creations` DROP COLUMN `amount_bigint`;')
// change `memo` to varchar(255), collate utf8mb4_unicode_ci
await queryFn(
'ALTER TABLE `admin_pending_creations` MODIFY COLUMN `memo` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL;',
)
}
export async function downgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
await queryFn('ALTER TABLE `admin_pending_creations` MODIFY COLUMN `memo` text DEFAULT NULL;')
await queryFn(
'ALTER TABLE `admin_pending_creations` ADD COLUMN `amount_bigint` bigint(20) DEFAULT NULL AFTER `amount`;',
)
await queryFn('UPDATE `admin_pending_creations` SET `amount_bigint` = `amount` * 10000;')
await queryFn(
'ALTER TABLE `admin_pending_creations` MODIFY COLUMN `amount_bigint` bigint(20) NOT NULL;',
)
await queryFn('ALTER TABLE `admin_pending_creations` DROP COLUMN `amount`;')
await queryFn('ALTER TABLE `admin_pending_creations` RENAME COLUMN `amount_bigint` TO `amount`;')
}