Merge branch '2876-add-fields-to-subscriber' into 2878-trigger-export-klicktipp

backend/src/event/EVENT_NEWSLETTER_SUBSCRIBE.ts

@@ -3,5 +3,5 @@ import { User as DbUser } from '@entity/User'
 
 import { Event, EventType } from './Event'
 
-export const EVENT_SUBSCRIBE_NEWSLETTER = async (user: DbUser): Promise<DbEvent> =>
-  Event(EventType.SUBSCRIBE_NEWSLETTER, user, user).save()
+export const EVENT_NEWSLETTER_SUBSCRIBE = async (user: DbUser): Promise<DbEvent> =>
+  Event(EventType.NEWSLETTER_SUBSCRIBE, user, user).save()

backend/src/event/EVENT_NEWSLETTER_UNSUBSCRIBE.ts

@@ -3,5 +3,5 @@ import { User as DbUser } from '@entity/User'
 
 import { Event, EventType } from './Event'
 
-export const EVENT_UNSUBSCRIBE_NEWSLETTER = async (user: DbUser): Promise<DbEvent> =>
-  Event(EventType.UNSUBSCRIBE_NEWSLETTER, user, user).save()
+export const EVENT_NEWSLETTER_UNSUBSCRIBE = async (user: DbUser): Promise<DbEvent> =>
+  Event(EventType.NEWSLETTER_UNSUBSCRIBE, user, user).save()

backend/src/event/Event.ts

@@ -58,13 +58,13 @@ export { EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION } from './EVENT_EMAIL_ACCOUNT_MUL
 export { EVENT_EMAIL_ADMIN_CONFIRMATION } from './EVENT_EMAIL_ADMIN_CONFIRMATION'
 export { EVENT_EMAIL_CONFIRMATION } from './EVENT_EMAIL_CONFIRMATION'
 export { EVENT_EMAIL_FORGOT_PASSWORD } from './EVENT_EMAIL_FORGOT_PASSWORD'
-export { EVENT_SUBSCRIBE_NEWSLETTER } from './EVENT_SUBSCRIBE_NEWSLETTER'
+export { EVENT_NEWSLETTER_SUBSCRIBE } from './EVENT_NEWSLETTER_SUBSCRIBE'
 export { EVENT_TRANSACTION_SEND } from './EVENT_TRANSACTION_SEND'
 export { EVENT_TRANSACTION_RECEIVE } from './EVENT_TRANSACTION_RECEIVE'
 export { EVENT_TRANSACTION_LINK_CREATE } from './EVENT_TRANSACTION_LINK_CREATE'
 export { EVENT_TRANSACTION_LINK_DELETE } from './EVENT_TRANSACTION_LINK_DELETE'
 export { EVENT_TRANSACTION_LINK_REDEEM } from './EVENT_TRANSACTION_LINK_REDEEM'
-export { EVENT_UNSUBSCRIBE_NEWSLETTER } from './EVENT_UNSUBSCRIBE_NEWSLETTER'
+export { EVENT_NEWSLETTER_UNSUBSCRIBE } from './EVENT_NEWSLETTER_UNSUBSCRIBE'
 export { EVENT_USER_ACTIVATE_ACCOUNT } from './EVENT_USER_ACTIVATE_ACCOUNT'
 export { EVENT_USER_INFO_UPDATE } from './EVENT_USER_INFO_UPDATE'
 export { EVENT_USER_LOGIN } from './EVENT_USER_LOGIN'

backend/src/event/EventType.ts

@@ -21,13 +21,13 @@ export enum EventType {
   EMAIL_ADMIN_CONFIRMATION = 'EMAIL_ADMIN_CONFIRMATION',
   EMAIL_CONFIRMATION = 'EMAIL_CONFIRMATION',
   EMAIL_FORGOT_PASSWORD = 'EMAIL_FORGOT_PASSWORD',
-  SUBSCRIBE_NEWSLETTER = 'SUBSCRIBE_NEWSLETTER',
+  NEWSLETTER_SUBSCRIBE = 'NEWSLETTER_SUBSCRIBE',
+  NEWSLETTER_UNSUBSCRIBE = 'NEWSLETTER_UNSUBSCRIBE',
   TRANSACTION_SEND = 'TRANSACTION_SEND',
   TRANSACTION_RECEIVE = 'TRANSACTION_RECEIVE',
   TRANSACTION_LINK_CREATE = 'TRANSACTION_LINK_CREATE',
   TRANSACTION_LINK_DELETE = 'TRANSACTION_LINK_DELETE',
   TRANSACTION_LINK_REDEEM = 'TRANSACTION_LINK_REDEEM',
-  UNSUBSCRIBE_NEWSLETTER = 'UNSUBSCRIBE_NEWSLETTER',
   USER_ACTIVATE_ACCOUNT = 'ACTIVATE_ACCOUNT',
   USER_INFO_UPDATE = 'USER_INFO_UPDATE',
   USER_LOGIN = 'USER_LOGIN',

backend/src/graphql/resolver/KlicktippResolver.ts

@@ -2,7 +2,7 @@ import { Resolver, Authorized, Mutation, Ctx } from 'type-graphql'
 
 import { unsubscribe, klicktippSignIn } from '@/apis/KlicktippController'
 import { RIGHTS } from '@/auth/RIGHTS'
-import { EVENT_UNSUBSCRIBE_NEWSLETTER, EVENT_SUBSCRIBE_NEWSLETTER } from '@/event/Event'
+import { EVENT_NEWSLETTER_SUBSCRIBE, EVENT_NEWSLETTER_UNSUBSCRIBE } from '@/event/Event'
 import { Context, getUser } from '@/server/context'
 
 @Resolver()
@@ -11,7 +11,7 @@ export class KlicktippResolver {
   @Mutation(() => Boolean)
   async unsubscribeNewsletter(@Ctx() context: Context): Promise<boolean> {
     const user = getUser(context)
-    await EVENT_UNSUBSCRIBE_NEWSLETTER(user)
+    await EVENT_NEWSLETTER_UNSUBSCRIBE(user)
     return unsubscribe(user.emailContact.email)
   }
 
@@ -19,7 +19,7 @@ export class KlicktippResolver {
   @Mutation(() => Boolean)
   async subscribeNewsletter(@Ctx() context: Context): Promise<boolean> {
     const user = getUser(context)
-    await EVENT_SUBSCRIBE_NEWSLETTER(user)
+    await EVENT_NEWSLETTER_SUBSCRIBE(user)
     return klicktippSignIn(user.emailContact.email, user.language)
   }
 }