Merge pull request #389 from beabee-communityrm/v0.12.x

Merge v0.12.x changes

src/api/controllers/SignupController.ts

@@ -68,9 +68,9 @@ export class SignupController {
       throw new NotFoundError();
     }
 
-    if (data.firstname || data.lastname) {
-      joinFlow.joinForm.firstname = data.firstname || null;
-      joinFlow.joinForm.lastname = data.lastname || null;
+    // Merge additional data into the join form
+    if (data.firstname || data.lastname || data.vatNumber) {
+      Object.assign(joinFlow.joinForm, data);
       await getRepository(JoinFlow).save(joinFlow);
     }
 

src/api/dto/AddressDto.ts

@@ -1,6 +1,7 @@
-import Address from "@models/Address";
 import { IsDefined, IsOptional, IsString } from "class-validator";
 
+import { Address } from "@type/address";
+
 export class UpdateAddressDto implements Address {
   @IsDefined()
   @IsString()

src/api/dto/SignupFlowDto.ts

@@ -7,11 +7,14 @@ import {
   IsString
 } from "class-validator";
 
+import { UpdateAddressDto } from "@api/dto/AddressDto";
 import { StartContributionDto } from "@api/dto/ContributionDto";
 import { CompleteJoinFlowDto } from "@api/dto/JoinFlowDto";
 import IsPassword from "@api/validators/IsPassword";
 import IsUrl from "@api/validators/IsUrl";
 
+import type JoinForm from "@models/JoinForm";
+
 import { CompleteUrls } from "@type/complete-urls";
 
 export class StartSignupFlowDto implements CompleteUrls {
@@ -37,12 +40,19 @@ export class StartSignupFlowDto implements CompleteUrls {
   contribution?: StartContributionDto;
 }
 
-export class CompleteSignupFlowDto extends CompleteJoinFlowDto {
+export class CompleteSignupFlowDto
+  extends CompleteJoinFlowDto
+  implements Pick<JoinForm, "firstname" | "lastname" | "vatNumber">
+{
   @IsOptional()
   @IsString()
   firstname?: string;
 
   @IsOptional()
   @IsString()
   lastname?: string;
+
+  @IsOptional()
+  @IsString()
+  vatNumber?: string;
 }

src/api/transformers/AddressTransformer.ts

@@ -1,8 +1,8 @@
-import { GetAddressDto } from "@api/dto/AddressDto";
-
-import Address from "@models/Address";
 import { TransformPlainToInstance } from "class-transformer";
 
+import { GetAddressDto } from "@api/dto/AddressDto";
+import { Address } from "@type/address";
+
 // TODO: make Address into a proper model
 class AddressTransformer {
   @TransformPlainToInstance(GetAddressDto)

src/apps/gift/app.ts

@@ -11,9 +11,10 @@ import GiftService from "@core/services/GiftService";
 import ContactsService from "@core/services/ContactsService";
 import OptionsService from "@core/services/OptionsService";
 
-import Address from "@models/Address";
 import GiftFlow, { GiftForm } from "@models/GiftFlow";
 
+import { Address } from "@type/address";
+
 import { createGiftSchema, updateGiftAddressSchema } from "./schema.json";
 
 const app = express();

src/apps/tools/apps/exports/exports/GiftsExport.ts

@@ -3,9 +3,10 @@ import { SelectQueryBuilder } from "typeorm";
 
 import { createQueryBuilder } from "@core/database";
 
-import Address from "@models/Address";
 import GiftFlow from "@models/GiftFlow";
 
+import { Address } from "@type/address";
+
 import BaseExport, { ExportResult } from "./BaseExport";
 
 function addressFields(address: Address | null) {

src/core/providers/payment-flow/GCProvider.ts

@@ -48,7 +48,7 @@ class GCProvider implements PaymentFlowProvider {
     log.info("Completed redirect flow " + redirectFlow.id);
 
     return {
-      paymentMethod: joinFlow.joinForm.paymentMethod,
+      joinForm: joinFlow.joinForm,
       customerId: redirectFlow.links!.customer!,
       mandateId: redirectFlow.links!.mandate!
     };

src/core/providers/payment-flow/StripeProvider.ts

@@ -38,12 +38,13 @@ class StripeProvider implements PaymentFlowProvider {
 
     log.info("Fetched setup intent " + setupIntent.id);
 
-    const paymentMethod = setupIntent.payment_method as string;
+    const siPaymentMethodId = setupIntent.payment_method as string;
 
     return {
-      paymentMethod: joinFlow.joinForm.paymentMethod,
+      // paymentMethod: joinFlow.joinForm.paymentMethod,
+      joinForm: joinFlow.joinForm,
       customerId: "", // Not needed
-      mandateId: paymentMethod
+      mandateId: siPaymentMethodId
     };
   }
 

src/core/providers/payment-flow/index.ts

@@ -1,7 +1,7 @@
-import { PaymentMethod } from "@beabee/beabee-common";
-
-import Address from "@models/Address";
 import JoinFlow from "@models/JoinFlow";
+import JoinForm from "@models/JoinForm";
+
+import { Address } from "@type/address";
 
 export interface PaymentFlow {
   id: string;
@@ -20,7 +20,7 @@ export interface PaymentFlowData {
 }
 
 export interface CompletedPaymentFlow {
-  paymentMethod: PaymentMethod;
+  joinForm: JoinForm;
   customerId: string;
   mandateId: string;
 }

src/core/providers/payment/StripeProvider.ts

@@ -79,28 +79,47 @@ export default class StripeProvider extends PaymentProvider<StripePaymentData> {
     await this.updateData();
   }
 
-  async updatePaymentMethod(
-    completedPaymentFlow: CompletedPaymentFlow
-  ): Promise<void> {
+  async updatePaymentMethod(flow: CompletedPaymentFlow): Promise<void> {
+    const paymentMethod = await stripe.paymentMethods.retrieve(flow.mandateId);
+    const address = paymentMethod.billing_details.address;
+
+    const customerData: Stripe.CustomerUpdateParams = {
+      invoice_settings: {
+        default_payment_method: flow.mandateId
+      },
+      address: address
+        ? {
+            line1: address.line1 || "",
+            ...(address.city && { city: address.city }),
+            ...(address.country && { country: address.country }),
+            ...(address.line2 && { line2: address.line2 }),
+            ...(address.postal_code && { postal_code: address.postal_code }),
+            ...(address.state && { state: address.state })
+          }
+        : null
+    };
+
     if (this.data.customerId) {
       log.info("Attach new payment source to " + this.data.customerId);
-      await stripe.paymentMethods.attach(completedPaymentFlow.mandateId, {
+      await stripe.paymentMethods.attach(flow.mandateId, {
         customer: this.data.customerId
       });
-      await stripe.customers.update(this.data.customerId, {
-        invoice_settings: {
-          default_payment_method: completedPaymentFlow.mandateId
-        }
-      });
+      await stripe.customers.update(this.data.customerId, customerData);
     } else {
       log.info("Create new customer");
       const customer = await stripe.customers.create({
         email: this.contact.email,
         name: `${this.contact.firstname} ${this.contact.lastname}`,
-        payment_method: completedPaymentFlow.mandateId,
-        invoice_settings: {
-          default_payment_method: completedPaymentFlow.mandateId
-        }
+        payment_method: flow.mandateId,
+        ...(flow.joinForm.vatNumber && {
+          tax_id_data: [
+            {
+              type: "eu_vat",
+              value: flow.joinForm.vatNumber
+            }
+          ]
+        }),
+        ...customerData
       });
       this.data.customerId = customer.id;
     }
@@ -110,7 +129,7 @@ export default class StripeProvider extends PaymentProvider<StripePaymentData> {
       await stripe.paymentMethods.detach(this.data.mandateId);
     }
 
-    this.data.mandateId = completedPaymentFlow.mandateId;
+    this.data.mandateId = flow.mandateId;
 
     await this.updateData();
   }

src/core/services/GiftService.ts

@@ -1,22 +1,23 @@
 import { ContributionType, NewsletterStatus } from "@beabee/beabee-common";
 import muhammara from "muhammara";
 import moment from "moment";
-import { getRepository } from "typeorm";
 
+import { getRepository } from "@core/database";
 import { log as mainLogger } from "@core/logging";
 import stripe from "@core/lib/stripe";
 import { isDuplicateIndex } from "@core/utils";
+import { generateContactCode } from "@core/utils/contact";
 
 import EmailService from "@core/services/EmailService";
 import ContactsService from "@core/services/ContactsService";
 import OptionsService from "@core/services/OptionsService";
 
-import Address from "@models/Address";
 import GiftFlow, { GiftForm } from "@models/GiftFlow";
 import ContactRole from "@models/ContactRole";
 
 import config from "@config";
-import { generateContactCode } from "@core/utils/contact";
+
+import { Address } from "@type/address";
 
 const log = mainLogger.child({ app: "gift-service" });
 

src/core/services/PaymentFlowService.ts

@@ -8,8 +8,6 @@ import ContactsService from "@core/services/ContactsService";
 import OptionsService from "@core/services/OptionsService";
 import PaymentService from "@core/services/PaymentService";
 import ResetSecurityFlowService from "./ResetSecurityFlowService";
-
-import Address from "@models/Address";
 import JoinFlow from "@models/JoinFlow";
 import JoinForm from "@models/JoinForm";
 import Contact from "@models/Contact";
@@ -29,6 +27,7 @@ import DuplicateEmailError from "@api/errors/DuplicateEmailError";
 
 import { RESET_SECURITY_FLOW_TYPE } from "@enums/reset-security-flow-type";
 
+import { Address } from "@type/address";
 import { CompleteUrls } from "@type/complete-urls";
 
 const paymentProviders = {
@@ -225,7 +224,7 @@ class PaymentFlowService implements PaymentFlowProvider {
     completedPaymentFlow: CompletedPaymentFlow
   ): Promise<CompletedPaymentFlowData> {
     return paymentProviders[
-      completedPaymentFlow.paymentMethod
+      completedPaymentFlow.joinForm.paymentMethod
     ].getCompletedPaymentFlowData(completedPaymentFlow);
   }
 }

src/core/services/PaymentService.ts

@@ -177,7 +177,7 @@ class PaymentService {
     });
 
     const data = await this.getData(contact);
-    const newMethod = completedPaymentFlow.paymentMethod;
+    const newMethod = completedPaymentFlow.joinForm.paymentMethod;
     if (data.method !== newMethod) {
       log.info(
         "Changing payment method, cancelling any previous contribution",

src/migrations/1712158796671-AddExtraJoinFormFields.ts

@@ -0,0 +1,23 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AddExtraJoinFormFields1712158796671 implements MigrationInterface {
+  name = "AddExtraJoinFormFields1712158796671";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "join_flow" ADD "joinFormBillingaddress" jsonb`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "join_flow" ADD "joinFormVatnumber" character varying`
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "join_flow" DROP COLUMN "joinFormVatnumber"`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "join_flow" DROP COLUMN "joinFormBillingaddress"`
+    );
+  }
+}

src/migrations/1712163090314-RemoveJoinFormBillingAddress.ts

@@ -0,0 +1,19 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class RemoveJoinFormBillingAddress1712163090314
+  implements MigrationInterface
+{
+  name = "RemoveJoinFormBillingAddress1712163090314";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "join_flow" DROP COLUMN "joinFormBillingaddress"`
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "join_flow" ADD "joinFormBillingaddress" jsonb`
+    );
+  }
+}

src/models/ContactProfile.ts

@@ -1,9 +1,10 @@
 import { NewsletterStatus } from "@beabee/beabee-common";
 import { Column, Entity, JoinColumn, OneToOne, PrimaryColumn } from "typeorm";
 
-import type Address from "./Address";
 import type Contact from "./Contact";
 
+import { Address } from "@type/address";
+
 @Entity()
 export default class ContactProfile {
   @PrimaryColumn()

src/models/GiftFlow.ts

@@ -6,9 +6,10 @@ import {
   PrimaryGeneratedColumn
 } from "typeorm";
 
-import type Address from "./Address";
 import type Contact from "./Contact";
 
+import { Address } from "@type/address";
+
 export class GiftForm {
   @Column()
   firstname!: string;

src/models/JoinForm.ts

@@ -1,8 +1,11 @@
 import { ContributionPeriod, PaymentMethod } from "@beabee/beabee-common";
 import { Column } from "typeorm";
+
 import { PaymentForm } from "@core/utils";
 import Password from "./Password";
 
+import { Address } from "@type/address";
+
 export interface ReferralGiftForm {
   referralGift?: string | null;
   referralGiftOptions?: Record<string, string> | null;
@@ -15,12 +18,6 @@ export default class JoinForm implements PaymentForm, ReferralGiftForm {
   @Column(() => Password)
   password!: Password;
 
-  @Column({ type: String, nullable: true })
-  firstname?: string | null;
-
-  @Column({ type: String, nullable: true })
-  lastname?: string | null;
-
   @Column({ type: "real" })
   monthlyAmount!: number;
 
@@ -36,6 +33,15 @@ export default class JoinForm implements PaymentForm, ReferralGiftForm {
   @Column()
   paymentMethod!: PaymentMethod;
 
+  @Column({ type: String, nullable: true })
+  firstname?: string | null;
+
+  @Column({ type: String, nullable: true })
+  lastname?: string | null;
+
+  @Column({ type: String, nullable: true })
+  vatNumber?: string | null;
+
   @Column({ type: String, nullable: true })
   referralCode?: string | null;
 

src/tools/database/import-steady.ts

@@ -14,10 +14,11 @@ import { cleanEmailAddress } from "@core/utils";
 
 import ContactsService from "@core/services/ContactsService";
 
-import Address from "@models/Address";
 import Contact from "@models/Contact";
 import ContactRole from "@models/ContactRole";
 
+import { Address } from "@type/address";
+
 const headers = [
   "first_name",
   "last_name",

src/models/Address.ts → src/type/address.ts

@@ -1,4 +1,4 @@
-export default interface Address {
+export interface Address {
   line1: string;
   line2?: string | undefined;
   city: string;