feat: contact contribution history

apps/backend/barrelsby.json

@@ -0,0 +1,16 @@
+{
+  "delete": true,
+  "local": true,
+  "directory": [
+    "./src/api/controllers",
+    "./src/api/decorators",
+    "./src/api/dto",
+    "./src/api/interceptors",
+    "./src/api/middlewares",
+    "./src/api/params",
+    "./src/api/transformers",
+    "./src/api/utils",
+    "./src/api/validators",
+    "./src/type"
+  ]
+}

apps/backend/package.json

@@ -28,8 +28,8 @@
     "dev:api:watch": "tsc-watch -p tsconfig.build.json --noClear --onSuccess 'docker compose restart api_app router'",
     "dev:api:logs": "yarn exec bash -c 'while true; do docker compose logs -f --tail=0 api_app; sleep 1; done'",
     "build": "rimraf built/ && gulp build && tsc -p ./tsconfig.build.json",
-    "generate:index": "ts-node scripts/generate-index.ts",
-    "watch": "tsc-watch -p tsconfig.build.json --noClear",
+    "generate:index": "barrelsby -c barrelsby.json",
+    "watch": "tsc -p tsconfig.build.json --watch --preserveWatchOutput",
     "check": "concurrently 'yarn:check:*'",
     "check:tsc": "tsc --noEmit",
     "check:prettier": "prettier -c .",
@@ -108,6 +108,7 @@
     "@types/pug": "^2.0.10",
     "@types/uuid": "^9.0.8",
     "autoprefixer": "^10.4.19",
+    "barrelsby": "^2.8.1",
     "concurrently": "^8.2.2",
     "dotenv": "^16.4.5",
     "dpdm": "^3.14.0",
@@ -121,7 +122,6 @@
     "rimraf": "^5.0.7",
     "sass": "^1.77.4",
     "ts-jest": "^29.1.4",
-    "ts-node": "^10.9.2",
     "tsc-watch": "^6.2.0",
     "tsconfig": "^7.0.0",
     "typescript": "^5.4.5"

apps/backend/src/api/controllers/index.ts

@@ -1,17 +1,21 @@
-export * from "./ApiKeyController.js";
-export * from "./AuthController.js";
-export * from "./CalloutController.js";
-export * from "./CalloutResponseCommentController.js";
-export * from "./CalloutResponseController.js";
-export * from "./ContactController.js";
-export * from "./ContentController.js";
-export * from "./EmailController.js";
-export * from "./NoticeController.js";
-export * from "./PaymentController.js";
-export * from "./ResetDeviceController.js";
-export * from "./ResetPasswordController.js";
-export * from "./RootController.js";
-export * from "./SegmentController.js";
-export * from "./SignupController.js";
-export * from "./StatsController.js";
-export * from "./UploadController.js";
+/**
+ * @file Automatically generated by barrelsby.
+ */
+
+export * from "./ApiKeyController";
+export * from "./AuthController";
+export * from "./CalloutController";
+export * from "./CalloutResponseCommentController";
+export * from "./CalloutResponseController";
+export * from "./ContactController";
+export * from "./ContentController";
+export * from "./EmailController";
+export * from "./NoticeController";
+export * from "./PaymentController";
+export * from "./ResetDeviceController";
+export * from "./ResetPasswordController";
+export * from "./RootController";
+export * from "./SegmentController";
+export * from "./SignupController";
+export * from "./StatsController";
+export * from "./UploadController";

apps/backend/src/api/decorators/index.ts

@@ -1,4 +1,8 @@
-export * from "./CalloutId.js";
-export * from "./CurrentAuth.js";
-export * from "./PartialBody.js";
-export * from "./TargetUser.js";
+/**
+ * @file Automatically generated by barrelsby.
+ */
+
+export * from "./CalloutId";
+export * from "./CurrentAuth";
+export * from "./PartialBody";
+export * from "./TargetUser";

apps/backend/src/api/dto/ContactDto.ts

@@ -1,4 +1,5 @@
 import {
+  ContributionInfo,
   ContributionPeriod,
   ContributionType,
   GetContactWith,
@@ -37,8 +38,6 @@ import { ForceUpdateContributionDto } from "@api/dto/ContributionDto";
 
 import IsPassword from "@api/validators/IsPassword";
 
-import { ContributionInfo } from "@beabee/core/type";
-
 const contactSortFields = [
   "firstname",
   "lastname",

apps/backend/src/api/dto/PaymentFlowDto.ts

@@ -1,7 +1,6 @@
+import { PaymentFlowParams } from "@beabee/beabee-common";
 import { IsOptional, IsString } from "class-validator";
 
-import { PaymentFlowParams } from "@beabee/core/type";
-
 export class GetPaymentFlowDto implements PaymentFlowParams {
   @IsOptional()
   @IsString()

apps/backend/src/api/dto/index.ts

@@ -1,30 +1,34 @@
-export * from "./AddressDto.js";
-export * from "./ApiKeyDto.js";
-export * from "./BaseDto.js";
-export * from "./CalloutDto.js";
-export * from "./CalloutFormDto.js";
-export * from "./CalloutResponseCommentDto.js";
-export * from "./CalloutResponseDto.js";
-export * from "./CalloutTagDto.js";
-export * from "./CalloutVariantDto.js";
-export * from "./ContactDto.js";
-export * from "./ContactMfaDto.js";
-export * from "./ContactProfileDto.js";
-export * from "./ContactRoleDto.js";
-export * from "./ContentDto.js";
-export * from "./ContentTelegramDto.js";
-export * from "./ContributionDto.js";
-export * from "./EmailDto.js";
-export * from "./JoinFlowDto.js";
-export * from "./LinkDto.js";
-export * from "./LoginDto.js";
-export * from "./NoticeDto.js";
-export * from "./PaginatedDto.js";
-export * from "./PaymentDto.js";
-export * from "./PaymentFlowDto.js";
-export * from "./ResetDeviceDto.js";
-export * from "./ResetPasswordDto.js";
-export * from "./SegmentDto.js";
-export * from "./SignupFlowDto.js";
-export * from "./StatsDto.js";
-export * from "./UploadFlowDto.js";
+/**
+ * @file Automatically generated by barrelsby.
+ */
+
+export * from "./AddressDto";
+export * from "./ApiKeyDto";
+export * from "./BaseDto";
+export * from "./CalloutDto";
+export * from "./CalloutFormDto";
+export * from "./CalloutResponseCommentDto";
+export * from "./CalloutResponseDto";
+export * from "./CalloutTagDto";
+export * from "./CalloutVariantDto";
+export * from "./ContactDto";
+export * from "./ContactMfaDto";
+export * from "./ContactProfileDto";
+export * from "./ContactRoleDto";
+export * from "./ContentDto";
+export * from "./ContentTelegramDto";
+export * from "./ContributionDto";
+export * from "./EmailDto";
+export * from "./JoinFlowDto";
+export * from "./LinkDto";
+export * from "./LoginDto";
+export * from "./NoticeDto";
+export * from "./PaginatedDto";
+export * from "./PaymentDto";
+export * from "./PaymentFlowDto";
+export * from "./ResetDeviceDto";
+export * from "./ResetPasswordDto";
+export * from "./SegmentDto";
+export * from "./SignupFlowDto";
+export * from "./StatsDto";
+export * from "./UploadFlowDto";

apps/backend/src/api/interceptors/index.ts

@@ -1 +1,5 @@
-export * from "./ValidateResponseInterceptor.js";
+/**
+ * @file Automatically generated by barrelsby.
+ */
+
+export * from "./ValidateResponseInterceptor";

apps/backend/src/api/middlewares/index.ts

@@ -1 +1,5 @@
-export * from "./AuthMiddleware.js";
+/**
+ * @file Automatically generated by barrelsby.
+ */
+
+export * from "./AuthMiddleware";

apps/backend/src/api/params/index.ts

@@ -1,4 +1,8 @@
-export * from "./ContactRoleParams.js";
-export * from "./ContentParams.js";
-export * from "./SignupConfirmEmailParams.js";
-export * from "./UUIDParams.js";
+/**
+ * @file Automatically generated by barrelsby.
+ */
+
+export * from "./ContactRoleParams";
+export * from "./ContentParams";
+export * from "./SignupConfirmEmailParams";
+export * from "./UUIDParams";

apps/backend/src/api/transformers/ContactExporter.ts

@@ -2,8 +2,6 @@ import { RoleType } from "@beabee/beabee-common";
 import { stringify } from "csv-stringify/sync";
 import { SelectQueryBuilder } from "typeorm";
 
-import { getMembershipStatus } from "@beabee/core/services/PaymentService";
-
 import { GetExportQuery } from "@api/dto/BaseDto";
 import { ExportContactDto } from "@api/dto/ContactDto";
 
@@ -27,14 +25,14 @@ class ContactExporter extends BaseContactTransformer<
       Joined: contact.joined.toISOString(),
       Tags: contact.profile.tags.join(", "),
       ContributionType: contact.contributionType,
-      ContributionMonthlyAmount: contact.contributionMonthlyAmount,
-      ContributionPeriod: contact.contributionPeriod,
+      ContributionMonthlyAmount: contact.contribution.monthlyAmount,
+      ContributionPeriod: contact.contribution.period,
       ContributionDescription: contact.contributionDescription,
       ContributionCancelled:
         contact.contribution.cancelledAt?.toISOString() || "",
       MembershipStarts: contact.membership?.dateAdded.toISOString() || "",
       MembershipExpires: contact.membership?.dateExpires?.toISOString() || "",
-      MembershipStatus: getMembershipStatus(contact),
+      MembershipStatus: contact.membershipStatus,
       NewsletterStatus: contact.profile.newsletterStatus,
       DeliveryOptIn: contact.profile.deliveryOptIn,
       DeliveryAddressLine1: contact.profile.deliveryAddress?.line1 || "",
@@ -51,7 +49,11 @@ class ContactExporter extends BaseContactTransformer<
     qb.orderBy(`${fieldPrefix}joined`);
     qb.leftJoinAndSelect(`${fieldPrefix}roles`, "roles");
     qb.leftJoinAndSelect(`${fieldPrefix}profile`, "profile");
-    qb.leftJoinAndSelect(`${fieldPrefix}contribution`, "contribution");
+    qb.leftJoinAndSelect(
+      `${fieldPrefix}contributions`,
+      "contributions",
+      "contributions.status = 'current'"
+    );
   }
 
   async export(

apps/backend/src/api/transformers/ContactTransformer.ts

@@ -38,11 +38,11 @@ class ContactTransformer extends BaseContactTransformer<
       ...(contact.lastSeen && {
         lastSeen: contact.lastSeen
       }),
-      ...(contact.contributionAmount && {
-        contributionAmount: contact.contributionAmount
+      ...(contact.contribution.amount && {
+        contributionAmount: contact.contribution.amount
       }),
-      ...(contact.contributionPeriod && {
-        contributionPeriod: contact.contributionPeriod
+      ...(contact.contribution.period && {
+        contributionPeriod: contact.contribution.period
       }),
       ...(opts?.with?.includes(GetContactWith.Profile) &&
         contact.profile && {
@@ -84,6 +84,13 @@ class ContactTransformer extends BaseContactTransformer<
     query: ListContactsDto
   ): void {
     {
+      // Will only ever return one contribution
+      qb.innerJoinAndSelect(
+        `${fieldPrefix}contributions`,
+        "contributions",
+        "contributions.status = 'current'"
+      );
+
       if (query.with?.includes(GetContactWith.Profile)) {
         qb.innerJoinAndSelect(`${fieldPrefix}profile`, "profile");
       }

apps/backend/src/api/transformers/index.ts

@@ -1,20 +1,24 @@
-export * from "./AddressTransformer.js";
-export * from "./ApiKeyTransformer.js";
-export * from "./BaseCalloutResponseTransformer.js";
-export * from "./BaseContactTransformer.js";
-export * from "./BaseTransformer.js";
-export * from "./CalloutResponseCommentTransformer.js";
-export * from "./CalloutResponseExporter.js";
-export * from "./CalloutResponseMapTransformer.js";
-export * from "./CalloutResponseTransformer.js";
-export * from "./CalloutTagTransformer.js";
-export * from "./CalloutTransformer.js";
-export * from "./CalloutVariantTransformer.js";
-export * from "./ContactExporter.js";
-export * from "./ContactProfileTransformer.js";
-export * from "./ContactRoleTransformer.js";
-export * from "./ContactTransformer.js";
-export * from "./ContentTransformer.js";
-export * from "./NoticeTransformer.js";
-export * from "./PaymentTransformer.js";
-export * from "./SegmentTransformer.js";
+/**
+ * @file Automatically generated by barrelsby.
+ */
+
+export * from "./AddressTransformer";
+export * from "./ApiKeyTransformer";
+export * from "./BaseCalloutResponseTransformer";
+export * from "./BaseContactTransformer";
+export * from "./BaseTransformer";
+export * from "./CalloutResponseCommentTransformer";
+export * from "./CalloutResponseExporter";
+export * from "./CalloutResponseMapTransformer";
+export * from "./CalloutResponseTransformer";
+export * from "./CalloutTagTransformer";
+export * from "./CalloutTransformer";
+export * from "./CalloutVariantTransformer";
+export * from "./ContactExporter";
+export * from "./ContactProfileTransformer";
+export * from "./ContactRoleTransformer";
+export * from "./ContactTransformer";
+export * from "./ContentTransformer";
+export * from "./NoticeTransformer";
+export * from "./PaymentTransformer";
+export * from "./SegmentTransformer";

apps/backend/src/api/utils/index.ts

@@ -1,4 +1,8 @@
-export * from "./auth.js";
-export * from "./objects.js";
-export * from "./rules.js";
-export * from "./validation.js";
+/**
+ * @file Automatically generated by barrelsby.
+ */
+
+export * from "./auth";
+export * from "./objects";
+export * from "./rules";
+export * from "./validation";