Merge pull request #10 from beabee-communityrm/build/1095-core-db-mig…

…rations build: move database migrations to core
beabee-communityrm · Jul 8, 2024 · a8147ba · a8147ba
2 parents 705a4ce + 53d3e80
commit a8147ba
Show file tree

Hide file tree

Showing 104 changed files with 46 additions and 20 deletions.
diff --git a/apps/backend/docker-compose.yml b/apps/backend/docker-compose.yml
@@ -8,7 +8,8 @@ x-base-app: &base-app
   volumes:
     - ./built:/opt/apps/backend/built
     - ../../packages/common/dist:/opt/packages/common/dist
-    - ./src/migrations:/opt/apps/backend/src/migrations
+    - ../../packages/core/dist:/opt/packages/core/dist
+    - ../../packages/core/src/migrations:/opt/packages/core/src/migrations
   env_file:
     - .env
   environment:

diff --git a/apps/backend/package.json b/apps/backend/package.json
@@ -35,7 +35,7 @@
     "check:prettier": "prettier -c .",
     "check:dependencies": "dpdm -T --no-warning --no-tree --exit-code circular:1 src/app.ts src/webhooks/app.ts src/api/app.ts",
     "format": "prettier --write .",
-    "typeorm": "typeorm -d ./built/core/database.js",
+    "typeorm": "typeorm -d ./built/core/lib/typeorm.js",
     "test": "jest --setupFiles dotenv/config",
     "docker:build": "docker compose build",
     "docker:start": "docker compose up -d",

diff --git a/apps/backend/src/core/lib/typeorm.ts b/apps/backend/src/core/lib/typeorm.ts
@@ -0,0 +1,4 @@
+/**
+ * This is used by the TypeORM CLI to run migrations
+ */
+export { dataSource } from "@beabee/core/database";
diff --git a/packages/core/src/database.ts b/packages/core/src/database.ts
@@ -16,13 +16,12 @@ import config from "./config/config";
 
 const log = mainLogger.child({ app: "database" });
 
-// This is used by the TypeORM CLI to run migrations
 export const dataSource: DataSource = new DataSource({
   type: "postgres",
   url: config.databaseUrl,
   logging: config.dev,
   entities: [__dirname + "/models/*.js"],
-  // TODO: migrations: [__dirname + "/../migrations/*.js"]
+  migrations: [__dirname + "/migrations/*.js"]
 });
 
 export function runTransaction<T>(

diff --git a/.../migrations/1616677358190-SessionTable.ts → .../migrations/1616677358190-SessionTable.ts b/.../migrations/1616677358190-SessionTable.ts → .../migrations/1616677358190-SessionTable.ts
diff --git a/.../migrations/1616679012431-InitDatabase.ts → .../migrations/1616679012431-InitDatabase.ts b/.../migrations/1616679012431-InitDatabase.ts → .../migrations/1616679012431-InitDatabase.ts
diff --git a/...grations/1616693016456-AddSegmentOrder.ts → ...grations/1616693016456-AddSegmentOrder.ts b/...grations/1616693016456-AddSegmentOrder.ts → ...grations/1616693016456-AddSegmentOrder.ts
diff --git a/...tions/1616694307645-AddDefaultSegments.ts → ...tions/1616694307645-AddDefaultSegments.ts b/...tions/1616694307645-AddDefaultSegments.ts → ...tions/1616694307645-AddDefaultSegments.ts
diff --git a/...18488866877-AddSegmentNewsletterListId.ts → ...18488866877-AddSegmentNewsletterListId.ts b/...18488866877-AddSegmentNewsletterListId.ts → ...18488866877-AddSegmentNewsletterListId.ts
diff --git a/...ations/1619099359790-RenameListIdToTag.ts → ...ations/1619099359790-RenameListIdToTag.ts b/...ations/1619099359790-RenameListIdToTag.ts → ...ations/1619099359790-RenameListIdToTag.ts
diff --git a/...ions/1619113429486-OptionalMemberCodes.ts → ...ions/1619113429486-OptionalMemberCodes.ts b/...ions/1619113429486-OptionalMemberCodes.ts → ...ions/1619113429486-OptionalMemberCodes.ts
diff --git a/...ons/1620225385309-DeliveryOptInDefault.ts → ...ons/1620225385309-DeliveryOptInDefault.ts b/...ons/1620225385309-DeliveryOptInDefault.ts → ...ons/1620225385309-DeliveryOptInDefault.ts
diff --git a/...381066389-AddNewsletterFieldsToProfile.ts → ...381066389-AddNewsletterFieldsToProfile.ts b/...381066389-AddNewsletterFieldsToProfile.ts → ...381066389-AddNewsletterFieldsToProfile.ts
diff --git a/...13644609-AddEmailAndPasswordToJoinFlow.ts → ...13644609-AddEmailAndPasswordToJoinFlow.ts b/...13644609-AddEmailAndPasswordToJoinFlow.ts → ...13644609-AddEmailAndPasswordToJoinFlow.ts
@@ -1,6 +1,6 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
 
-import { addThenSetNotNull } from "@core/utils/db";
+import { addThenSetNotNull } from "../utils/db";
 
 export class AddEmailAndPasswordToJoinFlow1621513644609
   implements MigrationInterface

diff --git a/.../1624370860614-AddPollResponsePassword.ts → .../1624370860614-AddPollResponsePassword.ts b/.../1624370860614-AddPollResponsePassword.ts → .../1624370860614-AddPollResponsePassword.ts
diff --git a/...41-RenameJoinFlowAmountToMonthlyAmount.ts → ...41-RenameJoinFlowAmountToMonthlyAmount.ts b/...41-RenameJoinFlowAmountToMonthlyAmount.ts → ...41-RenameJoinFlowAmountToMonthlyAmount.ts
diff --git a/...24469629114-ConvertMonthlyAmountToReal.ts → ...24469629114-ConvertMonthlyAmountToReal.ts b/...24469629114-ConvertMonthlyAmountToReal.ts → ...24469629114-ConvertMonthlyAmountToReal.ts
diff --git a/.../1626344080098-AddMemberActivatedField.ts → .../1626344080098-AddMemberActivatedField.ts b/.../1626344080098-AddMemberActivatedField.ts → .../1626344080098-AddMemberActivatedField.ts
diff --git a/...migrations/1632397910432-AddButtonText.ts → ...migrations/1632397910432-AddButtonText.ts b/...migrations/1632397910432-AddButtonText.ts → ...migrations/1632397910432-AddButtonText.ts
@@ -1,5 +1,5 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
-import { addThenSetNotNull } from "@core/utils/db";
+import { addThenSetNotNull } from "../utils/db";
 
 export class AddButtonText1632397910432 implements MigrationInterface {
   name = "AddButtonText1632397910432";

diff --git a/...31118456-UseEmailInSegmentOngoingEmail.ts → ...31118456-UseEmailInSegmentOngoingEmail.ts b/...31118456-UseEmailInSegmentOngoingEmail.ts → ...31118456-UseEmailInSegmentOngoingEmail.ts
diff --git a/...rc/migrations/1632994213635-AddContent.ts → ...rc/migrations/1632994213635-AddContent.ts b/...rc/migrations/1632994213635-AddContent.ts → ...rc/migrations/1632994213635-AddContent.ts
diff --git a/...1634125137636-AddExcerptAndImageToPoll.ts → ...1634125137636-AddExcerptAndImageToPoll.ts b/...1634125137636-AddExcerptAndImageToPoll.ts → ...1634125137636-AddExcerptAndImageToPoll.ts
@@ -1,5 +1,5 @@
-import { addThenSetNotNull } from "@core/utils/db";
 import { MigrationInterface, QueryRunner } from "typeorm";
+import { addThenSetNotNull } from "../utils/db";
 
 export class AddExcerptAndImageToPoll1634125137636
   implements MigrationInterface

diff --git a/...ons/1634737662792-AddResetPasswordFlow.ts → ...ons/1634737662792-AddResetPasswordFlow.ts b/...ons/1634737662792-AddResetPasswordFlow.ts → ...ons/1634737662792-AddResetPasswordFlow.ts
diff --git a/...ations/1635350051303-RemoveRestartFlow.ts → ...ations/1635350051303-RemoveRestartFlow.ts b/...ations/1635350051303-RemoveRestartFlow.ts → ...ations/1635350051303-RemoveRestartFlow.ts
diff --git a/...grations/1638448727069-FormatEmailBody.ts → ...grations/1638448727069-FormatEmailBody.ts b/...grations/1638448727069-FormatEmailBody.ts → ...grations/1638448727069-FormatEmailBody.ts
diff --git a/.../1638975520912-RemovePasswordResetCode.ts → .../1638975520912-RemovePasswordResetCode.ts b/.../1638975520912-RemovePasswordResetCode.ts → .../1638975520912-RemovePasswordResetCode.ts
diff --git a/...075139123-JoinFlowRedirectFlowOptional.ts → ...075139123-JoinFlowRedirectFlowOptional.ts b/...075139123-JoinFlowRedirectFlowOptional.ts → ...075139123-JoinFlowRedirectFlowOptional.ts
diff --git a/...s/1639655491472-MigrateJoinFlowOptions.ts → ...s/1639655491472-MigrateJoinFlowOptions.ts b/...s/1639655491472-MigrateJoinFlowOptions.ts → ...s/1639655491472-MigrateJoinFlowOptions.ts
diff --git a/...65377317-ChangeDefaultNewsletterStatus.ts → ...65377317-ChangeDefaultNewsletterStatus.ts b/...65377317-ChangeDefaultNewsletterStatus.ts → ...65377317-ChangeDefaultNewsletterStatus.ts
diff --git a/...60915487-AddAllowMultiplePollResponses.ts → ...60915487-AddAllowMultiplePollResponses.ts b/...60915487-AddAllowMultiplePollResponses.ts → ...60915487-AddAllowMultiplePollResponses.ts
diff --git a/...ations/1646649540217-UnifyItemStatuses.ts → ...ations/1646649540217-UnifyItemStatuses.ts b/...ations/1646649540217-UnifyItemStatuses.ts → ...ations/1646649540217-UnifyItemStatuses.ts
diff --git a/...646649663368-MakeImageFieldNonNullable.ts → ...646649663368-MakeImageFieldNonNullable.ts b/...646649663368-MakeImageFieldNonNullable.ts → ...646649663368-MakeImageFieldNonNullable.ts
diff --git a/...96337-ConvertAllPollsToBuilderTemplate.ts → ...96337-ConvertAllPollsToBuilderTemplate.ts b/...96337-ConvertAllPollsToBuilderTemplate.ts → ...96337-ConvertAllPollsToBuilderTemplate.ts
diff --git a/...ns/1650535261889-UpdateDefaultSegments.ts → ...ns/1650535261889-UpdateDefaultSegments.ts b/...ns/1650535261889-UpdateDefaultSegments.ts → ...ns/1650535261889-UpdateDefaultSegments.ts
diff --git a/...s/1650535712817-AddEmptyGeneralContent.ts → ...s/1650535712817-AddEmptyGeneralContent.ts b/...s/1650535712817-AddEmptyGeneralContent.ts → ...s/1650535712817-AddEmptyGeneralContent.ts
diff --git a/...ations/1650537835623-AddDefaultContent.ts → ...ations/1650537835623-AddDefaultContent.ts b/...ations/1650537835623-AddDefaultContent.ts → ...ations/1650537835623-AddDefaultContent.ts
diff --git a/...50900384747-AddPaymentMethodToJoinForm.ts → ...50900384747-AddPaymentMethodToJoinForm.ts b/...50900384747-AddPaymentMethodToJoinForm.ts → ...50900384747-AddPaymentMethodToJoinForm.ts
@@ -1,5 +1,5 @@
-import { addThenSetNotNull } from "@core/utils/db";
 import { MigrationInterface, QueryRunner } from "typeorm";
+import { addThenSetNotNull } from "../utils/db";
 
 export class AddPaymentMethodToJoinForm1650900384747
   implements MigrationInterface

diff --git a/...ns/1650904701374-NonNullRedirectFlowId.ts → ...ns/1650904701374-NonNullRedirectFlowId.ts b/...ns/1650904701374-NonNullRedirectFlowId.ts → ...ns/1650904701374-NonNullRedirectFlowId.ts
diff --git a/...tions/1651058503997-AddContactsContent.ts → ...tions/1651058503997-AddContactsContent.ts b/...tions/1651058503997-AddContactsContent.ts → ...tions/1651058503997-AddContactsContent.ts
diff --git a/...668585-RenameRedirectFlowToPaymentFlow.ts → ...668585-RenameRedirectFlowToPaymentFlow.ts b/...668585-RenameRedirectFlowToPaymentFlow.ts → ...668585-RenameRedirectFlowToPaymentFlow.ts
diff --git a/...ations/1652115873327-AddUrlsToJoinFlow.ts → ...ations/1652115873327-AddUrlsToJoinFlow.ts b/...ations/1652115873327-AddUrlsToJoinFlow.ts → ...ations/1652115873327-AddUrlsToJoinFlow.ts
@@ -1,5 +1,5 @@
-import { addThenSetNotNull } from "@core/utils/db";
 import { MigrationInterface, QueryRunner } from "typeorm";
+import { addThenSetNotNull } from "../utils/db";
 
 export class AddUrlsToJoinFlow1652115873327 implements MigrationInterface {
   name = "AddUrlsToJoinFlow1652115873327";

diff --git a/...ons/1652276361695-AddShareFieldsToPoll.ts → ...ons/1652276361695-AddShareFieldsToPoll.ts b/...ons/1652276361695-AddShareFieldsToPoll.ts → ...ons/1652276361695-AddShareFieldsToPoll.ts
diff --git a/...2285362376-RenameGoCardlessToAutomatic.ts → ...2285362376-RenameGoCardlessToAutomatic.ts b/...2285362376-RenameGoCardlessToAutomatic.ts → ...2285362376-RenameGoCardlessToAutomatic.ts
diff --git a/...igrations/1652966714320-AddPaymentData.ts → ...igrations/1652966714320-AddPaymentData.ts b/...igrations/1652966714320-AddPaymentData.ts → ...igrations/1652966714320-AddPaymentData.ts
diff --git a/...rc/migrations/1653488390953-AddPayment.ts → ...rc/migrations/1653488390953-AddPayment.ts b/...rc/migrations/1653488390953-AddPayment.ts → ...rc/migrations/1653488390953-AddPayment.ts
diff --git a/...ons/1653495059460-MigratePaymentTables.ts → ...ons/1653495059460-MigratePaymentTables.ts b/...ons/1653495059460-MigratePaymentTables.ts → ...ons/1653495059460-MigratePaymentTables.ts
diff --git a/...199299904-RemoveNextContributionAmount.ts → ...199299904-RemoveNextContributionAmount.ts b/...199299904-RemoveNextContributionAmount.ts → ...199299904-RemoveNextContributionAmount.ts
diff --git a/...1655393209607-MigrateManualPaymentData.ts → ...1655393209607-MigrateManualPaymentData.ts b/...1655393209607-MigrateManualPaymentData.ts → ...1655393209607-MigrateManualPaymentData.ts
diff --git a/.../1656001166095-OptionalFromEmailFields.ts → .../1656001166095-OptionalFromEmailFields.ts b/.../1656001166095-OptionalFromEmailFields.ts → .../1656001166095-OptionalFromEmailFields.ts
diff --git a/...-AddOptionalFirstAndLastNameToJoinFlow.ts → ...-AddOptionalFirstAndLastNameToJoinFlow.ts b/...-AddOptionalFirstAndLastNameToJoinFlow.ts → ...-AddOptionalFirstAndLastNameToJoinFlow.ts
diff --git a/...s/1656935238800-ConvertPaymentStatuses.ts → ...s/1656935238800-ConvertPaymentStatuses.ts b/...s/1656935238800-ConvertPaymentStatuses.ts → ...s/1656935238800-ConvertPaymentStatuses.ts
diff --git a/...tions/1659968561064-OptionalButtonText.ts → ...tions/1659968561064-OptionalButtonText.ts b/...tions/1659968561064-OptionalButtonText.ts → ...tions/1659968561064-OptionalButtonText.ts
diff --git a/...grations/1660235362253-AddShareContent.ts → ...grations/1660235362253-AddShareContent.ts b/...grations/1660235362253-AddShareContent.ts → ...grations/1660235362253-AddShareContent.ts
diff --git a/...grations/1660562732237-AddEmailContent.ts → ...grations/1660562732237-AddEmailContent.ts b/...grations/1660562732237-AddEmailContent.ts → ...grations/1660562732237-AddEmailContent.ts
diff --git a/...ons/1665070450970-FixSegmentRuleGroups.ts → ...ons/1665070450970-FixSegmentRuleGroups.ts b/...ons/1665070450970-FixSegmentRuleGroups.ts → ...ons/1665070450970-FixSegmentRuleGroups.ts
diff --git a/...rations/1667846310950-UpdateRuleValues.ts → ...rations/1667846310950-UpdateRuleValues.ts b/...rations/1667846310950-UpdateRuleValues.ts → ...rations/1667846310950-UpdateRuleValues.ts
diff --git a/.../migrations/1670242308699-RenameModels.ts → .../migrations/1670242308699-RenameModels.ts b/.../migrations/1670242308699-RenameModels.ts → .../migrations/1670242308699-RenameModels.ts
diff --git a/...ns/1670257047310-RenameModelReferences.ts → ...ns/1670257047310-RenameModelReferences.ts b/...ns/1670257047310-RenameModelReferences.ts → ...ns/1670257047310-RenameModelReferences.ts
diff --git a/...670258044685-RenameAutoGeneratedKeyIds.ts → ...670258044685-RenameAutoGeneratedKeyIds.ts b/...670258044685-RenameAutoGeneratedKeyIds.ts → ...670258044685-RenameAutoGeneratedKeyIds.ts
diff --git a/...670260399264-RenamePollModelReferences.ts → ...670260399264-RenamePollModelReferences.ts b/...670260399264-RenamePollModelReferences.ts → ...670260399264-RenamePollModelReferences.ts
diff --git a/...1676460782435-AddCalloutResponseBucket.ts → ...1676460782435-AddCalloutResponseBucket.ts b/...1676460782435-AddCalloutResponseBucket.ts → ...1676460782435-AddCalloutResponseBucket.ts
diff --git a/...ns/1676623400914-FixContactProfileKeys.ts → ...ns/1676623400914-FixContactProfileKeys.ts b/...ns/1676623400914-FixContactProfileKeys.ts → ...ns/1676623400914-FixContactProfileKeys.ts
diff --git a/...migrations/1676654870090-AddCalloutTag.ts → ...migrations/1676654870090-AddCalloutTag.ts b/...migrations/1676654870090-AddCalloutTag.ts → ...migrations/1676654870090-AddCalloutTag.ts
diff --git a/...ns/1676655715419-AddCalloutResponseTag.ts → ...ns/1676655715419-AddCalloutResponseTag.ts b/...ns/1676655715419-AddCalloutResponseTag.ts → ...ns/1676655715419-AddCalloutResponseTag.ts
diff --git a/...1678287340165-AddCalloutResponseNumber.ts → ...1678287340165-AddCalloutResponseNumber.ts b/...1678287340165-AddCalloutResponseNumber.ts → ...1678287340165-AddCalloutResponseNumber.ts
diff --git a/...ns/1678358909981-MakeBucketNonNullable.ts → ...ns/1678358909981-MakeBucketNonNullable.ts b/...ns/1678358909981-MakeBucketNonNullable.ts → ...ns/1678358909981-MakeBucketNonNullable.ts
diff --git a/...78884024926-AddCalloutResponseAssignee.ts → ...78884024926-AddCalloutResponseAssignee.ts b/...78884024926-AddCalloutResponseAssignee.ts → ...78884024926-AddCalloutResponseAssignee.ts
diff --git a/...8737358-AddCalloutResponseCommentTable.ts → ...8737358-AddCalloutResponseCommentTable.ts b/...8737358-AddCalloutResponseCommentTable.ts → ...8737358-AddCalloutResponseCommentTable.ts
diff --git a/...5-AddUpdatedAtToCalloutResponseComment.ts → ...5-AddUpdatedAtToCalloutResponseComment.ts b/...5-AddUpdatedAtToCalloutResponseComment.ts → ...5-AddUpdatedAtToCalloutResponseComment.ts
diff --git a/...3924-ModifyCommentForeignKeyRestraints.ts → ...3924-ModifyCommentForeignKeyRestraints.ts b/...3924-ModifyCommentForeignKeyRestraints.ts → ...3924-ModifyCommentForeignKeyRestraints.ts
diff --git a/.../1679064034052-RemoveDefaultFormSchema.ts → .../1679064034052-RemoveDefaultFormSchema.ts b/.../1679064034052-RemoveDefaultFormSchema.ts → .../1679064034052-RemoveDefaultFormSchema.ts
diff --git a/...igrations/1685528456765-AddApiKeyModel.ts → ...igrations/1685528456765-AddApiKeyModel.ts b/...igrations/1685528456765-AddApiKeyModel.ts → ...igrations/1685528456765-AddApiKeyModel.ts
diff --git a/...ations/1686233596892-UpdateApiKeyModel.ts → ...ations/1686233596892-UpdateApiKeyModel.ts b/...ations/1686233596892-UpdateApiKeyModel.ts → ...ations/1686233596892-UpdateApiKeyModel.ts
diff --git a/.../1686233847551-ApiKeyDescriptioNotNull.ts → .../1686233847551-ApiKeyDescriptioNotNull.ts b/.../1686233847551-ApiKeyDescriptioNotNull.ts → .../1686233847551-ApiKeyDescriptioNotNull.ts
diff --git a/...ions/1690389664790-AddCalloutMapSchema.ts → ...ions/1690389664790-AddCalloutMapSchema.ts b/...ions/1690389664790-AddCalloutMapSchema.ts → ...ions/1690389664790-AddCalloutMapSchema.ts
diff --git a/...migrations/1691577150283-AddUploadFlow.ts → ...migrations/1691577150283-AddUploadFlow.ts b/...migrations/1691577150283-AddUploadFlow.ts → ...migrations/1691577150283-AddUploadFlow.ts
diff --git a/...rations/1691597308499-AddUploadUsedCol.ts → ...rations/1691597308499-AddUploadUsedCol.ts b/...rations/1691597308499-AddUploadUsedCol.ts → ...rations/1691597308499-AddUploadUsedCol.ts
diff --git a/...289610630-AddCalloutResponseViewSchema.ts → ...289610630-AddCalloutResponseViewSchema.ts b/...289610630-AddCalloutResponseViewSchema.ts → ...289610630-AddCalloutResponseViewSchema.ts
diff --git a/...s/1694009247783-PaymentDataCancelledAt.ts → ...s/1694009247783-PaymentDataCancelledAt.ts b/...s/1694009247783-PaymentDataCancelledAt.ts → ...s/1694009247783-PaymentDataCancelledAt.ts
diff --git a/...ations/1696506058706-RenamePollOptions.ts → ...ations/1696506058706-RenamePollOptions.ts b/...ations/1696506058706-RenamePollOptions.ts → ...ations/1696506058706-RenamePollOptions.ts
diff --git a/...tions/1696600862719-UpdateGCNextAmount.ts → ...tions/1696600862719-UpdateGCNextAmount.ts b/...tions/1696600862719-UpdateGCNextAmount.ts → ...tions/1696600862719-UpdateGCNextAmount.ts
@@ -1,7 +1,7 @@
 import { ContributionPeriod, PaymentMethod } from "@beabee/beabee-common";
 import { MigrationInterface, QueryRunner } from "typeorm";
 
-import { getChargeableAmount } from "@core/utils/payment";
+import { getChargeableAmount } from "../utils/payment";
 
 interface PaymentQueryResults {
   id: string;

diff --git a/...ns/1697020619835-NewCalloutSlideSchema.ts → ...ns/1697020619835-NewCalloutSlideSchema.ts b/...ns/1697020619835-NewCalloutSlideSchema.ts → ...ns/1697020619835-NewCalloutSlideSchema.ts
diff --git a/.../migrations/1698338165267-DeleteOld2FA.ts → .../migrations/1698338165267-DeleteOld2FA.ts b/.../migrations/1698338165267-DeleteOld2FA.ts → .../migrations/1698338165267-DeleteOld2FA.ts
diff --git a/...migrations/1698418165066-AddContactMfa.ts → ...migrations/1698418165066-AddContactMfa.ts b/...migrations/1698418165066-AddContactMfa.ts → ...migrations/1698418165066-AddContactMfa.ts
diff --git a/...ions/1698938717666-AddApiKeyExpiryDate.ts → ...ions/1698938717666-AddApiKeyExpiryDate.ts b/...ions/1698938717666-AddApiKeyExpiryDate.ts → ...ions/1698938717666-AddApiKeyExpiryDate.ts
diff --git a/...700131647453-RenameToResetSecurityFlow.ts → ...700131647453-RenameToResetSecurityFlow.ts b/...700131647453-RenameToResetSecurityFlow.ts → ...700131647453-RenameToResetSecurityFlow.ts
diff --git a/...migrations/1701968585255-UpdateIndexes.ts → ...migrations/1701968585255-UpdateIndexes.ts b/...migrations/1701968585255-UpdateIndexes.ts → ...migrations/1701968585255-UpdateIndexes.ts
diff --git a/...rations/1703247945472-UpdateCalloutTag.ts → ...rations/1703247945472-UpdateCalloutTag.ts b/...rations/1703247945472-UpdateCalloutTag.ts → ...rations/1703247945472-UpdateCalloutTag.ts
diff --git a/.../1706113195469-ConvertChargeDateToDate.ts → .../1706113195469-ConvertChargeDateToDate.ts b/.../1706113195469-ConvertChargeDateToDate.ts → .../1706113195469-ConvertChargeDateToDate.ts
diff --git a/.../migrations/1708615794655-AddCalloutId.ts → .../migrations/1708615794655-AddCalloutId.ts b/.../migrations/1708615794655-AddCalloutId.ts → .../migrations/1708615794655-AddCalloutId.ts
diff --git a/...ations/1708685548000-AddCalloutVariant.ts → ...ations/1708685548000-AddCalloutVariant.ts b/...ations/1708685548000-AddCalloutVariant.ts → ...ations/1708685548000-AddCalloutVariant.ts
diff --git a/...708688873027-ChangeVariantLocaleToName.ts → ...708688873027-ChangeVariantLocaleToName.ts b/...708688873027-ChangeVariantLocaleToName.ts → ...708688873027-ChangeVariantLocaleToName.ts
diff --git a/...s/1709217978680-AddCalloutCaptchaField.ts → ...s/1709217978680-AddCalloutCaptchaField.ts b/...s/1709217978680-AddCalloutCaptchaField.ts → ...s/1709217978680-AddCalloutCaptchaField.ts
diff --git a/...09297783048-AddCalloutVariantFormTexts.ts → ...09297783048-AddCalloutVariantFormTexts.ts b/...09297783048-AddCalloutVariantFormTexts.ts → ...09297783048-AddCalloutVariantFormTexts.ts
diff --git a/...s/1712158796671-AddExtraJoinFormFields.ts → ...s/1712158796671-AddExtraJoinFormFields.ts b/...s/1712158796671-AddExtraJoinFormFields.ts → ...s/1712158796671-AddExtraJoinFormFields.ts
diff --git a/...163090314-RemoveJoinFormBillingAddress.ts → ...163090314-RemoveJoinFormBillingAddress.ts b/...163090314-RemoveJoinFormBillingAddress.ts → ...163090314-RemoveJoinFormBillingAddress.ts
diff --git a/...RenamePaymentDataToContactContribution.ts → ...RenamePaymentDataToContactContribution.ts b/...RenamePaymentDataToContactContribution.ts → ...RenamePaymentDataToContactContribution.ts
diff --git a/.../1713434533086-FlattenContributionData.ts → .../1713434533086-FlattenContributionData.ts b/.../1713434533086-FlattenContributionData.ts → .../1713434533086-FlattenContributionData.ts
diff --git a/...rations/1715184967411-callout-channels.ts → ...rations/1715184967411-callout-channels.ts b/...rations/1715184967411-callout-channels.ts → ...rations/1715184967411-callout-channels.ts
diff --git a/...1715355140741-ImproveContactFieldTypes.ts → ...1715355140741-ImproveContactFieldTypes.ts b/...1715355140741-ImproveContactFieldTypes.ts → ...1715355140741-ImproveContactFieldTypes.ts
diff --git a/packages/core/src/models/Contact.ts b/packages/core/src/models/Contact.ts
@@ -13,7 +13,7 @@ import {
   PrimaryGeneratedColumn
 } from "typeorm";
 
-import { getActualAmount } from "../utils";
+import { getActualAmount } from "../utils/payment";
 import config from "../config/config";
 
 import type ContactContribution from "./ContactContribution";

diff --git a/apps/backend/src/core/utils/db.ts → packages/core/src/utils/db.ts b/apps/backend/src/core/utils/db.ts → packages/core/src/utils/db.ts
diff --git a/packages/core/src/utils/index.ts b/packages/core/src/utils/index.ts
@@ -1,4 +1,3 @@
-import { ContributionPeriod } from "@beabee/beabee-common";
 import { RequestHandler } from "express";
 
 export function wrapAsync(fn: RequestHandler): RequestHandler {
@@ -11,14 +10,6 @@ export function wrapAsync(fn: RequestHandler): RequestHandler {
   };
 }
 
-export function getActualAmount(
-  amount: number,
-  period: ContributionPeriod
-): number {
-  // TODO: fix this properly
-  return Math.round(amount * (period === ContributionPeriod.Annually ? 12 : 1));
-}
-
 export function extractToken(authHeader?: string): string | null {
   if (!authHeader) return null;
   if (authHeader?.startsWith("Bearer ")) {

diff --git a/packages/core/src/utils/payment.ts b/packages/core/src/utils/payment.ts
@@ -0,0 +1,31 @@
+import { calcPaymentFee, ContributionPeriod, PaymentForm, PaymentMethod } from "@beabee/beabee-common";
+import config from "../config/config";
+
+export function getActualAmount(
+  amount: number,
+  period: ContributionPeriod
+): number {
+  // TODO: fix this properly
+  return Math.round(amount * (period === ContributionPeriod.Annually ? 12 : 1));
+}
+
+/**
+ * Calculate the amount to charge including the payment fee if applicable
+ *
+ * @param paymentForm The payment form
+ * @param paymentMethod The payment method
+ * @returns The chargeable amount in cents
+ */
+export function getChargeableAmount(
+  paymentForm: PaymentForm,
+  paymentMethod: PaymentMethod
+): number {
+  const amount = getActualAmount(paymentForm.monthlyAmount, paymentForm.period);
+  const fee = paymentForm.payFee
+    ? calcPaymentFee(
+        { amount, period: paymentForm.period, paymentMethod },
+        config.stripe.country
+      )
+    : 0;
+  return Math.round((amount + fee) * 100);
+}