beneficiery without mail (#555)

* added: env variable for CAMPAIGN_ADMIN_MAIL in deployment config

* added default build command for vscode

* person email is now nullable

* fixed compiler errors after person.email become nullable

* formatting

* make email optional for createPersonDto

.vscode/tasks.json

@@ -0,0 +1,16 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "type": "npm",
+      "script": "build",
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      },
+      "problemMatcher": [],
+      "label": "npm: build",
+      "detail": "yarn build"
+    }
+  ]
+}

apps/api/src/auth/auth.service.ts

@@ -203,9 +203,9 @@ export class AuthService {
           await this.marketingNotificationsService.provider.addContactsToList({
             contacts: [
               {
-                email: person.email,
-                first_name: person?.firstName || '',
-                last_name: person?.lastName || '',
+                email: registerDto.email,
+                first_name: registerDto.firstName,
+                last_name: registerDto.lastName,
               },
             ],
             list_ids: [mainList],
@@ -327,13 +327,15 @@ export class AuthService {
 
   async sendMailForPasswordChange(forgotPasswordDto: ForgottenPasswordEmailDto) {
     const stage = this.config.get<string>('APP_ENV') === 'development' ? 'APP_URL_LOCAL' : 'APP_URL'
-    const user = await this.prismaService.person.findFirst({
+    const person = await this.prismaService.person.findFirst({
       where: { email: forgotPasswordDto.email },
     })
-    if (!user) {
+
+    if (!person || !person.email) {
       throw new NotFoundException('Invalid email')
     }
-    const payload = { username: user.email, sub: user.keycloakId }
+
+    const payload = { username: person.email, sub: person.keycloakId }
     const jtwSecret = process.env.JWT_SECRET_KEY
     const access_token = this.jwtService.sign(payload, {
       secret: jtwSecret,
@@ -342,12 +344,12 @@ export class AuthService {
     const appUrl = this.config.get<string>(stage)
     const link = `${appUrl}/change-password?token=${access_token}`
     const profile = {
-      email: user.email,
-      firstName: user.firstName,
-      lastName: user.lastName,
+      email: person.email,
+      firstName: person.firstName,
+      lastName: person.lastName,
       link: link,
     }
-    const userEmail = { to: [user.email] }
+    const userEmail = { to: [person.email] }
     const mail = new ForgottenPasswordMailDto(profile)
     await this.sendEmail.sendFromTemplate(mail, userEmail, {
       //Allow users to receive the mail, regardles of unsubscribes

apps/api/src/domain/generated/person/dto/create-person.dto.ts

@@ -1,7 +1,7 @@
 export class CreatePersonDto {
   firstName: string
   lastName: string
-  email: string
+  email?: string
   phone?: string
   company?: string
   newsletter?: boolean

apps/api/src/domain/generated/person/entities/person.entity.ts

@@ -23,7 +23,7 @@ export class Person {
   id: string
   firstName: string
   lastName: string
-  email: string
+  email: string | null
   phone: string | null
   company: string | null
   createdAt: Date

apps/api/src/donations/donations.controller.ts

@@ -12,7 +12,6 @@ import {
   Res,
   Inject,
   forwardRef,
-  NotFoundException,
 } from '@nestjs/common'
 import { ApiQuery, ApiTags } from '@nestjs/swagger'
 import { DonationStatus } from '@prisma/client'
@@ -108,9 +107,7 @@ export class DonationsController {
 
   @Get('user-donations')
   async userDonations(@AuthenticatedUser() user: KeycloakTokenParsed) {
-    const person = await this.personService.findOneByKeycloakId(user.sub)
-    if (!person) throw new NotFoundException('User was not found')
-    return await this.donationsService.getDonationsByUser(user.sub, person.email)
+    return await this.donationsService.getDonationsByUser(user.sub, user.email)
   }
 
   @Get('money')
@@ -178,16 +175,7 @@ export class DonationsController {
 
   @Get('user/:id')
   async userDonationById(@Param('id') id: string, @AuthenticatedUser() user: KeycloakTokenParsed) {
-    const person = await this.personService.findOneByKeycloakId(user.sub)
-    if (!person) throw new NotFoundException('User was not found')
-    const donation = await this.donationsService.getUserDonationById(id, user.sub, person.email)
-    return {
-      ...donation,
-      person: {
-        firstName: person.firstName,
-        lastName: person.lastName,
-      },
-    }
+    return await this.donationsService.getUserDonationById(id, user.sub, user.email)
   }
 
   @Post('payment-intent')

apps/api/src/donations/donations.service.ts

@@ -423,7 +423,7 @@ export class DonationsService {
   async getUserDonationById(
     id: string,
     keycloakId: string,
-    email: string,
+    email?: string,
   ): Promise<(Donation & { person: Person | null }) | null> {
     return await this.prisma.donation.findFirst({
       where: {
@@ -564,7 +564,7 @@ export class DonationsService {
 
         const status = updatePaymentDto.status || currentDonation.status
         let donorId = currentDonation.personId
-        let billingEmail = ''
+        let billingEmail: string | null = ''
         if (
           (updatePaymentDto.targetPersonId &&
             currentDonation.personId !== updatePaymentDto.targetPersonId) ||
@@ -636,7 +636,7 @@ export class DonationsService {
     }
   }
 
-  async getDonationsByUser(keycloakId: string, email: string) {
+  async getDonationsByUser(keycloakId: string, email?: string) {
     const donations = await this.prisma.donation.findMany({
       where: {
         OR: [{ billingEmail: email }, { person: { keycloakId } }],

apps/api/src/notifications/notifications.service.ts

@@ -272,7 +272,7 @@ export class MarketingNotificationsService {
       return new BadRequestException('Failed to get user')
     }
 
-    if (!userInfo) return new BadRequestException('User not found')
+    if (!userInfo || !userInfo.email) return new BadRequestException('User not found')
 
     // Already unsubscribed
     if (!userInfo.newsletter) return { email: userInfo.email, subscribed: false }
@@ -306,7 +306,7 @@ export class MarketingNotificationsService {
       return new BadRequestException('Failed to get user')
     }
 
-    if (!userInfo) return new BadRequestException('User not found')
+    if (!userInfo || !userInfo.email) return new BadRequestException('User not found')
 
     // Already subscribed
     if (userInfo.newsletter) return { email: userInfo.email, subscribed: true }

apps/api/src/person/dto/create-person.dto.ts

@@ -16,7 +16,8 @@ export class CreatePersonDto {
   @ApiProperty()
   @Expose()
   @IsEmail()
-  email: string
+  @IsOptional()
+  email?: string
 
   @ApiProperty()
   @Expose()

apps/api/src/person/person.service.ts

@@ -1,6 +1,6 @@
 import { Injectable, Logger } from '@nestjs/common'
 import { ConfigService } from '@nestjs/config'
-import client from '@sendgrid/client'
+import mailClient from '@sendgrid/client'
 import { Prisma } from '@prisma/client'
 import { PrismaService } from '../prisma/prisma.service'
 import { CreatePersonDto } from './dto/create-person.dto'
@@ -16,7 +16,7 @@ export class PersonService {
     const apiKey = config.get<string>('sendgrid.apiKey')
 
     if (apiKey && this.contactsUrl) {
-      client.setApiKey(apiKey)
+      mailClient.setApiKey(apiKey)
     } else {
       this.enabled = false
       Logger.warn('no apiKey or contactsUrl for sendgrid, will not add user to the contact list')
@@ -138,7 +138,7 @@ export class PersonService {
     }
 
     try {
-      await client.request({
+      await mailClient.request({
         url: this.contactsUrl,
         method: 'PUT',
         body: data,

migrations/20230925152101_make_person_email_optional/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "people" ALTER COLUMN "email" DROP NOT NULL;

podkrepi.dbml

@@ -11,7 +11,7 @@ Table people {
   id String [pk]
   firstName String [not null]
   lastName String [not null]
-  email String [unique, not null]
+  email String [unique]
   phone String
   company String
   createdAt DateTime [default: `now()`, not null]

schema.prisma

@@ -34,7 +34,7 @@ model Person {
   id                 String              @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid
   firstName          String              @map("first_name") @db.VarChar(100)
   lastName           String              @map("last_name") @db.VarChar(100)
-  email              String              @unique @db.Citext
+  email              String?             @unique @db.Citext
   phone              String?             @db.VarChar(50)
   company            String?             @db.VarChar(50)
   createdAt          DateTime            @default(now()) @map("created_at") @db.Timestamptz(6)