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

liniting and improved names

Browse Source
This commit is contained in:
Moriz Wahl 2022-11-11 11:30:25 +01:00
parent 37e9482807
commit e3d3f4bb94
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/src/graphql/resolver/util/creations.test.ts
View File

@ -1,23 +1,21 @@
/* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable @typescript-eslint/no-explicit-any */
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
import { testEnvironment, resetToken, cleanDB, contributionDateFormatter } from '@test/helpers' import { testEnvironment, cleanDB, contributionDateFormatter } from '@test/helpers'
import { logger } from '@test/testSetup'
import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg' import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
import { peterLustig } from '@/seeds/users/peter-lustig' import { peterLustig } from '@/seeds/users/peter-lustig'
import { User } from '@entity/User' import { User } from '@entity/User'
import { Contribution } from '@entity/Contribution' import { Contribution } from '@entity/Contribution'
import { userFactory } from '@/seeds/factory/user' import { userFactory } from '@/seeds/factory/user'
import { login, createContribution, adminCreateContribution } from '@/seeds/graphql/mutations' import { login, createContribution, adminCreateContribution } from '@/seeds/graphql/mutations'
import { getUserCreation, validateContribution } from './creations' import { getUserCreation } from './creations'
let mutate: any, query: any, con: any let mutate: any, con: any
let testEnv: any let testEnv: any
beforeAll(async () => { beforeAll(async () => {
testEnv = await testEnvironment() testEnv = await testEnvironment()
mutate = testEnv.mutate mutate = testEnv.mutate
query = testEnv.query
con = testEnv.con con = testEnv.con
await cleanDB() await cleanDB()
}) })
@ -210,7 +208,7 @@ describe('util/creation', () => {
describe('call getUserCreation with PST (GMT-0800)', () => { describe('call getUserCreation with PST (GMT-0800)', () => {
it('returns the expected open contributions', async () => { it('returns the expected open contributions', async () => {
await expect(getUserCreation(user.id, true, 450)).resolves.toEqual([ await expect(getUserCreation(user.id, true, 480)).resolves.toEqual([
expect.decimalEqual(550), expect.decimalEqual(550),
expect.decimalEqual(340), expect.decimalEqual(340),
expect.decimalEqual(350), expect.decimalEqual(350),

10
backend/src/graphql/resolver/util/creations.ts
View File

@ -101,12 +101,12 @@ export const getUserCreation = async (
} }
const getCreationMonths = (timezoneOffset: number): number[] => { const getCreationMonths = (timezoneOffset: number): number[] => {
const now = new Date() const clientNow = new Date()
now.setTime(now.getTime() - timezoneOffset * 60 * 1000) clientNow.setTime(clientNow.getTime() - timezoneOffset * 60 * 1000)
return [ return [
now.getMonth() + 1, clientNow.getMonth() + 1,
new Date(now.getFullYear(), now.getMonth() - 1, 1).getMonth() + 1, new Date(clientNow.getFullYear(), clientNow.getMonth() - 1, 1).getMonth() + 1,
new Date(now.getFullYear(), now.getMonth() - 2, 1).getMonth() + 1, new Date(clientNow.getFullYear(), clientNow.getMonth() - 2, 1).getMonth() + 1,
].reverse() ].reverse()
} }