diff --git a/packages/api/test/db.ts b/packages/api/test/db.ts index 51902962e..fd4386bfc 100644 --- a/packages/api/test/db.ts +++ b/packages/api/test/db.ts @@ -196,12 +196,14 @@ export const createTestLabel = async ( export const createTestSubscription = async ( user: User, - name: string + name: string, + newsletterEmail: NewsletterEmail ): Promise => { return getRepository(Subscription).save({ user, name, status: SubscriptionStatus.Active, + newsletterEmail, }) } diff --git a/packages/api/test/resolvers/subscriptions.test.ts b/packages/api/test/resolvers/subscriptions.test.ts index c6b34ff86..2ceb71403 100644 --- a/packages/api/test/resolvers/subscriptions.test.ts +++ b/packages/api/test/resolvers/subscriptions.test.ts @@ -4,6 +4,8 @@ import { Subscription } from '../../src/entity/subscription' import { expect } from 'chai' import 'mocha' import { User } from '../../src/entity/user' +import { getRepository } from '../../src/entity/utils' +import { NewsletterEmail } from '../../src/entity/newsletter_email' describe('Subscriptions API', () => { let user: User @@ -19,9 +21,16 @@ describe('Subscriptions API', () => { authToken = res.body.authToken + // create test newsletter subscriptions + const newsletterEmail = await getRepository(NewsletterEmail).save({ + user, + address: 'test@inbox.omnivore.app', + confirmationCode: 'test', + }) + // create testing subscriptions - const sub1 = await createTestSubscription(user, 'sub_1') - const sub2 = await createTestSubscription(user, 'sub_2') + const sub1 = await createTestSubscription(user, 'sub_1', newsletterEmail) + const sub2 = await createTestSubscription(user, 'sub_2', newsletterEmail) subscriptions = [sub2, sub1] }) diff --git a/packages/db/migrations/0105.do.add_foreign_key_to_subscription.sql b/packages/db/migrations/0105.do.add_foreign_key_to_subscription.sql index 11928dd2d..759d96bc5 100755 --- a/packages/db/migrations/0105.do.add_foreign_key_to_subscription.sql +++ b/packages/db/migrations/0105.do.add_foreign_key_to_subscription.sql @@ -5,6 +5,7 @@ BEGIN; ALTER TABLE omnivore.subscriptions + ADD CONSTRAINT subscriptions_user_id_name_key UNIQUE (user_id, name), ADD COLUMN newsletter_email_id uuid REFERENCES omnivore.newsletter_emails(id); -- migrate existing data diff --git a/packages/db/migrations/0105.undo.add_foreign_key_to_subscription.sql b/packages/db/migrations/0105.undo.add_foreign_key_to_subscription.sql index 6b1fb1c6f..708a7863c 100755 --- a/packages/db/migrations/0105.undo.add_foreign_key_to_subscription.sql +++ b/packages/db/migrations/0105.undo.add_foreign_key_to_subscription.sql @@ -6,6 +6,7 @@ BEGIN; -- remove old column ALTER TABLE omnivore.subscriptions + DROP CONSTRAINT subscriptions_user_id_name_key, ADD COLUMN newsletter_email text; -- migrate existing data