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 'apollo_createTransactions' of github.com:gradido/gradido into apollo_createTransactions

Browse Source
This commit is contained in:
einhornimmond 2021-10-06 12:45:13 +02:00
commit 8a68a72dac
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/graphql/resolver/UserResolver.ts
View File

@ -9,6 +9,7 @@ import { SendPasswordResetEmailResponse } from '../model/SendPasswordResetEmailR
import { UpdateUserInfosResponse } from '../model/UpdateUserInfosResponse'
import { User } from '../model/User'
import { UserSettingRepository } from '../../typeorm/repository/UserSettingRepository'
import { UserSettingRepository } from '../../typeorm/repository/UserSettingRepository'
import encode from '../../jwt/encode'
import ChangePasswordArgs from '../arg/ChangePasswordArgs'
import { Setting } from '../../types'
@ -30,6 +31,7 @@ import { UserSettingRepository } from '../../typeorm/repository/UserSettingRepos
import { Setting } from '../enum/Setting'
import { UserRepository } from '../../typeorm/repository/User'
import { getCustomRepository } from 'typeorm'
import { getCustomRepository } from 'typeorm'
@Resolver()
export class UserResolver {

1
backend/src/typeorm/entity/User.ts
View File

@ -1,6 +1,7 @@
import { BaseEntity, Entity, PrimaryGeneratedColumn, Column, OneToMany } from 'typeorm'
import { UserSetting } from './UserSetting'
import { UserSetting } from './UserSetting'
import { UserSetting } from './UserSetting'
// Moriz: I do not like the idea of having two user tables
@Entity('state_users')