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

solve problems reading user with emailcontact

Browse Source
This commit is contained in:
Claus-Peter Hübner 2022-08-30 00:57:57 +02:00
parent 1d1de2011a
commit 7269b4b67b
5 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/graphql/model/User.ts
View File

@ -14,7 +14,7 @@ export class User {
this.emailId = user.emailId
if (user.emailContact) {
this.email = user.emailContact.email
this.emailContact = user.emailContact
this.emailContact = new UserContact(user.emailContact)
this.emailChecked = user.emailContact.emailChecked
}
this.firstName = user.firstName

4
backend/src/graphql/model/UserContact.ts
View File

@ -1,9 +1,9 @@
import { ObjectType, Field } from 'type-graphql'
import { UserContact as dbUserCOntact} from '@entity/UserContact'
import { UserContact as dbUserContact} from '@entity/UserContact'
@ObjectType()
export class UserContact {
constructor(userContact: dbUserCOntact) {
constructor(userContact: dbUserContact) {
this.id = userContact.id
this.type = userContact.type
this.userId = userContact.userId

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

@ -850,11 +850,7 @@ export class UserResolver {
@Query(() => Boolean)
async hasElopage(@Ctx() context: Context): Promise<boolean> {
logger.info(`hasElopage()...`)
const userEntity = context.user
if (!userEntity) {
logger.info('missing context.user for EloPage-check')
return false
}
const userEntity = getUser(context)
const elopageBuys = hasElopageBuys(userEntity.emailContact.email)
logger.debug(`has ElopageBuys = ${elopageBuys}`)
return elopageBuys

4
database/entity/0048-add_user_contacts_table/User.ts
View File

@ -43,7 +43,7 @@ export class User extends BaseEntity {
@Column({ length: 255, unique: true, nullable: false, collation: 'utf8mb4_unicode_ci' })
email: string
*/
@OneToOne(() => UserContact, (emailContact) => emailContact.userId)
@OneToOne(() => UserContact, (emailContact) => emailContact.user)
@JoinColumn({ name: 'email_id' })
emailContact: UserContact
@ -115,7 +115,7 @@ export class User extends BaseEntity {
@JoinColumn({ name: 'user_id' })
contributions?: Contribution[]
@OneToMany(() => UserContact, (usercontact) => usercontact.userId)
@OneToMany(() => UserContact, (usercontact) => usercontact.user)
@JoinColumn({ name: 'user_id' })
usercontacts?: UserContact[]
}

2
database/entity/0048-add_user_contacts_table/UserContact.ts
View File

@ -53,7 +53,7 @@ export class UserContact extends BaseEntity {
@Column({ name: 'created_at', default: () => 'CURRENT_TIMESTAMP', nullable: false })
createdAt: Date
@DeleteDateColumn({ name: 'updated_at', nullable: true })
@Column({ name: 'updated_at', nullable: true, default: null, type: 'datetime' })
updatedAt: Date | null
@DeleteDateColumn({ name: 'deleted_at', nullable: true })