Merge branch 'staging' of github.com:GeneralMagicio/QAcc-BE into Qacc…

…Notifications

src/adapters/notifications/MockNotificationAdapter.ts

@@ -37,7 +37,7 @@ export class MockNotificationAdapter implements NotificationAdapterInterface {
   async sendUserEmailConfirmation(params: {
     email: string;
     user: User;
-    token: string;
+    code: string;
   }) {
     logger.debug('MockNotificationAdapter sendUserEmailConfirmation', params);
     return Promise.resolve(undefined);

src/adapters/notifications/NotificationAdapterInterface.ts

@@ -65,7 +65,7 @@ export interface NotificationAdapterInterface {
   sendUserEmailConfirmation(params: {
     email: string;
     user: User;
-    token: string;
+    code: string;
   }): Promise<void>;
 
   userSuperTokensCritical(params: {

src/adapters/notifications/NotificationCenterAdapter.ts

@@ -100,16 +100,16 @@ export class NotificationCenterAdapter implements NotificationAdapterInterface {
   async sendUserEmailConfirmation(params: {
     email: string;
     user: User;
-    token: string;
+    code: string;
   }): Promise<void> {
-    const { email, user, token } = params;
+    const { email, code } = params;
     try {
       await callSendNotification({
         eventName: NOTIFICATIONS_EVENT_NAMES.SEND_EMAIL_CONFIRMATION,
         segment: {
           payload: {
             email,
-            verificationLink: `${dappUrl}/verification/user/${user.walletAddress}/${token}`,
+            verificationLink: code, // todo: we just set this for test and we should change the schema
           },
         },
       });

src/entities/entities.ts

@@ -31,11 +31,13 @@ import { ProjectFraud } from './projectFraud';
 import { ProjectActualMatchingView } from './ProjectActualMatchingView';
 import { ProjectSocialMedia } from './projectSocialMedia';
 import { UserQfRoundModelScore } from './userQfRoundModelScore';
+import { UserEmailVerification } from './userEmailVerification';
 
 export const getEntities = (): DataSourceOptions['entities'] => {
   return [
     Organization,
     User,
+    UserEmailVerification,
     ReferredEvent,
     Project,
 

src/entities/user.ts

@@ -192,15 +192,7 @@ export class User extends BaseEntity {
   @Column({ default: false })
   emailConfirmed: boolean;
 
-  @Field(_type => String, { nullable: true })
-  @Column('text', { nullable: true })
-  emailConfirmationToken: string | null;
-
-  @Field(_type => Date, { nullable: true })
-  @Column('timestamptz', { nullable: true })
-  emailConfirmationTokenExpiredAt: Date | null;
-
-  @Field(_type => Boolean, { nullable: true })
+  @Field(_type => Boolean, { nullable: false })
   @Column({ default: false })
   emailConfirmationSent: boolean;
 

src/entities/userEmailVerification.ts

@@ -0,0 +1,16 @@
+import { Entity, PrimaryGeneratedColumn, Column, BaseEntity } from 'typeorm';
+
+@Entity()
+export class UserEmailVerification extends BaseEntity {
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @Column()
+  userId: number;
+
+  @Column('text', { nullable: true })
+  emailVerificationCode: string | null;
+
+  @Column('timestamptz', { nullable: true })
+  emailVerificationCodeExpiredAt: Date | null;
+}