Remove i18n, change state to status.

This commit is contained in:
elweyn 2023-01-25 16:40:32 +01:00
parent 9e7da0f451
commit 8b3423b91b
3 changed files with 12 additions and 33 deletions

View File

@ -180,38 +180,27 @@ export class ContributionResolver {
async listAllContributions(
@Args()
{ currentPage = 1, pageSize = 5, order = Order.DESC }: Paginated,
@Arg('filterState', () => [ContributionStatus], { nullable: true })
filterStates: ContributionStatus[] | null,
@Ctx() context: Context,
@Arg('statusFilter', () => [ContributionStatus], { nullable: true })
statusFilters: ContributionStatus[] | null,
): Promise<ContributionListResult> {
const where: {
contributionStatus?: FindOperator<string> | null
} = {}
const typeStatus = Object.values(ContributionStatus)
const user = getUser(context)
i18n.setLocale(user.language)
if (filterStates !== null) {
const filterStateArray = []
const length = filterStates.length
if (statusFilters !== null) {
const statusFilterArray = []
const length = statusFilters.length
let i = 0
for (i; i < length; i++) {
const filterState = filterStates[i]
if (!typeStatus.includes(filterState)) {
logger.error(
`${i18n.__('error.contributions.wrongFilterState', {
contributionState: filterStates[i],
})}`,
)
throw new Error(
`${i18n.__('error.contributions.wrongFilterState', {
contributionState: filterStates[i],
})}`,
)
const statusFilter = statusFilters[i]
if (!typeStatus.includes(statusFilter)) {
logger.error(`Nicht definierter Status wurde gesendet: ${statusFilters[i]}`)
throw new Error(`Nicht definierter Status wurde gesendet: ${statusFilters[i]}`)
}
filterStateArray.push(filterState)
statusFilterArray.push(statusFilter)
}
if (filterStateArray.length > 0) {
where.contributionStatus = In(filterStateArray)
if (statusFilterArray.length > 0) {
where.contributionStatus = In(statusFilterArray)
}
}

View File

@ -55,11 +55,6 @@
"subject": "Gradido: {senderFirstName} {senderLastName} hat dir {transactionAmount} Gradido gesendet"
}
},
"error": {
"contributions": {
"wrongFilterState": "Nicht definierter Status wurde gesendet: {contributionState}"
}
},
"general": {
"decimalSeparator": ",",
"imprint": "Gradido-Akademie\nInstitut für Wirtschaftsbionik\nPfarrweg 2\n74653 Künzelsau\nDeutschland",

View File

@ -56,11 +56,6 @@
"subject": "Gradido: {senderFirstName} {senderLastName} has sent you {transactionAmount} Gradido"
}
},
"error": {
"contributions": {
"wrongFilterState": "Send a state that isn't defined: {contributionState}"
}
},
"general": {
"decimalSeparator": ".",
"imprint": "Gradido-Akademie\nInstitut für Wirtschaftsbionik\nPfarrweg 2\n74653 Künzelsau\nDeutschland",