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

Fix linting rules

Browse Source
This commit is contained in:
elweyn 2023-04-04 19:38:17 +02:00
parent f486bc0fd0
commit d09aa6c43d
3 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/apis/KlicktippController.ts
View File

@ -97,7 +97,9 @@ export const addFieldsToSubscriber = async (
newemail = '', newemail = '',
newsmsnumber = '', newsmsnumber = '',
) => { ) => {
// eslint-disable-next-line no-console
console.log('email', email) console.log('email', email)
// eslint-disable-next-line no-console
console.log('fields', fields) console.log('fields', fields)
if (!CONFIG.KLICKTIPP) return true if (!CONFIG.KLICKTIPP) return true
const isLogin = await loginKlicktippUser() const isLogin = await loginKlicktippUser()

9
backend/src/graphql/resolver/util/eventList.ts
View File

@ -2,9 +2,10 @@ import { Event as DbEvent } from '@entity/Event'
import { User } from '@entity/User' import { User } from '@entity/User'
import { UserContact } from '@entity/UserContact' import { UserContact } from '@entity/UserContact'
export const lastDateTimeEvents = async (eventType: string): Promise<DbEvent[]> => { export const lastDateTimeEvents = async (
return DbEvent eventType: string,
.createQueryBuilder('event') ): Promise<{ email: string; value: Date }[]> => {
return DbEvent.createQueryBuilder('event')
.select('MAX(event.created_at)', 'value') .select('MAX(event.created_at)', 'value')
.leftJoin(User, 'user', 'affected_user_id = user.id') .leftJoin(User, 'user', 'affected_user_id = user.id')
.leftJoin(UserContact, 'usercontact', 'user.id = usercontact.user_id') .leftJoin(UserContact, 'usercontact', 'user.id = usercontact.user_id')
@ -13,4 +14,4 @@ export const lastDateTimeEvents = async (eventType: string): Promise<DbEvent[]>
.andWhere('usercontact.email IS NOT NULL') .andWhere('usercontact.email IS NOT NULL')
.groupBy('event.affected_user_id') .groupBy('event.affected_user_id')
.getRawMany() .getRawMany()
} }

34
backend/src/util/klicktipp.ts
View File

@ -1,12 +1,11 @@
// eslint-disable @typescript-eslint/no-explicit-any // eslint-disable @typescript-eslint/no-explicit-any
import { User } from '@entity/User' import { User } from '@entity/User'
import { getKlickTippUser, addFieldsToSubscriber } from '@/apis/KlicktippController' import { getKlickTippUser, addFieldsToSubscriber } from '@/apis/KlicktippController'
import { EventType } from '@/event/EventType'
import { lastDateTimeEvents } from '@/graphql/resolver/util/eventList'
import LogError from '@/server/LogError' import LogError from '@/server/LogError'
import connection from '@/typeorm/connection' import connection from '@/typeorm/connection'
import { lastDateTimeEvents } from '@/graphql/resolver/util/eventList'
import { EventType } from '@/event/EventType'
import { Event as DbEvent } from '@/event/Event'
export async function retrieveNotRegisteredEmails(): Promise<string[]> { export async function retrieveNotRegisteredEmails(): Promise<string[]> {
const con = await connection() const con = await connection()
@ -31,9 +30,12 @@ export async function retrieveNotRegisteredEmails(): Promise<string[]> {
return notRegisteredUser return notRegisteredUser
} }
function klickTippSendFieldToUser(events: any, value: string): void { async function klickTippSendFieldToUser(
for(const event of events) { events: { email: string; value: Date }[],
addFieldsToSubscriber(event.email, { [value]: event.value }) value: string,
): Promise<void> {
for (const event of events) {
await addFieldsToSubscriber(event.email, { [value]: event.value })
} }
} }
@ -44,22 +46,22 @@ export async function exportEventDataToKlickTipp(): Promise<void> {
} }
const lastLoginEvents = await lastDateTimeEvents(EventType.USER_LOGIN) const lastLoginEvents = await lastDateTimeEvents(EventType.USER_LOGIN)
klickTippSendFieldToUser(lastLoginEvents, 'GDD last login') void klickTippSendFieldToUser(lastLoginEvents, 'GDD last login')
const registeredEvents = await lastDateTimeEvents(EventType.USER_ACTIVATE_ACCOUNT) const registeredEvents = await lastDateTimeEvents(EventType.USER_ACTIVATE_ACCOUNT)
klickTippSendFieldToUser(registeredEvents, 'GDD date of registration') void klickTippSendFieldToUser(registeredEvents, 'GDD date of registration')
const receiveTransactionEvents = await lastDateTimeEvents(EventType.TRANSACTION_RECEIVE) const receiveTransactionEvents = await lastDateTimeEvents(EventType.TRANSACTION_RECEIVE)
klickTippSendFieldToUser(receiveTransactionEvents, 'GDD last received') void klickTippSendFieldToUser(receiveTransactionEvents, 'GDD last received')
const contributionCreateEvents = await lastDateTimeEvents(EventType.TRANSACTION_SEND) const contributionCreateEvents = await lastDateTimeEvents(EventType.TRANSACTION_SEND)
klickTippSendFieldToUser(contributionCreateEvents, 'GDD last sent') void klickTippSendFieldToUser(contributionCreateEvents, 'GDD last sent')
const linkRedeemedEvents = await lastDateTimeEvents(EventType.TRANSACTION_LINK_REDEEM) const linkRedeemedEvents = await lastDateTimeEvents(EventType.TRANSACTION_LINK_REDEEM)
klickTippSendFieldToUser(linkRedeemedEvents, 'GDD last invited') void klickTippSendFieldToUser(linkRedeemedEvents, 'GDD last invited')
const confirmContributionEvents = await lastDateTimeEvents(EventType.ADMIN_CONTRIBUTION_CONFIRM) const confirmContributionEvents = await lastDateTimeEvents(EventType.ADMIN_CONTRIBUTION_CONFIRM)
klickTippSendFieldToUser(confirmContributionEvents, 'GDD last created') void klickTippSendFieldToUser(confirmContributionEvents, 'GDD last created')
} }
void exportEventDataToKlickTipp() void exportEventDataToKlickTipp()
// void retrieveNotRegisteredEmails() // void retrieveNotRegisteredEmails()