From 8b3e3a14406448b3bb9a669677d4ae734ad190db Mon Sep 17 00:00:00 2001
From: Rami Abdou <38056800+ramiAbdou@users.noreply.github.com>
Date: Tue, 30 Jul 2024 20:31:10 -0700
Subject: [PATCH] =?UTF-8?q?refactor:=20use=20`@oyster/db`=20directly=20in?=
 =?UTF-8?q?=20`core`=20=F0=9F=8D=8E=20(#425)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/core/src/infrastructure/database/index.ts          | 1 -
 .../active-status/queries/get-active-streak-leaderboard.ts  | 3 ++-
 .../src/modules/active-status/queries/get-active-streak.ts  | 2 +-
 .../active-status/use-cases/backfill-active-statuses.ts     | 2 +-
 .../active-status/use-cases/create-new-active-statuses.ts   | 2 +-
 packages/core/src/modules/admin/use-cases/add-admin.ts      | 2 +-
 packages/core/src/modules/airtable/airtable.core.ts         | 2 +-
 .../authentication/use-cases/expire-one-time-code.ts        | 3 ++-
 .../modules/authentication/use-cases/login-with-oauth.ts    | 3 ++-
 .../modules/authentication/use-cases/send-one-time-code.ts  | 2 +-
 .../authentication/use-cases/verify-one-time-code.ts        | 3 ++-
 .../core/src/modules/education/use-cases/add-education.ts   | 2 +-
 .../education/use-cases/check-most-recent-education.ts      | 3 ++-
 .../src/modules/education/use-cases/delete-education.ts     | 3 ++-
 .../core/src/modules/education/use-cases/edit-education.ts  | 3 ++-
 .../src/modules/employment/queries/get-work-experience.ts   | 3 +--
 .../core/src/modules/employment/queries/list-job-offers.ts  | 3 ++-
 .../src/modules/employment/queries/list-work-experiences.ts | 2 +-
 .../src/modules/employment/use-cases/add-work-experience.ts | 2 +-
 .../modules/employment/use-cases/delete-work-experience.ts  | 3 ++-
 .../modules/employment/use-cases/edit-work-experience.ts    | 3 ++-
 .../employment/use-cases/save-company-if-necessary.test.ts  | 2 +-
 .../employment/use-cases/save-company-if-necessary.ts       | 3 +--
 .../src/modules/employment/use-cases/upload-job-offer.ts    | 2 +-
 packages/core/src/modules/event/event.core.ts               | 3 ++-
 packages/core/src/modules/event/events/event-registered.ts  | 2 +-
 .../core/src/modules/event/queries/count-event-attendees.ts | 3 +--
 .../core/src/modules/event/queries/count-past-events.ts     | 2 +-
 .../core/src/modules/event/queries/count-upcoming-events.ts | 2 +-
 packages/core/src/modules/event/queries/get-event.ts        | 4 +---
 .../core/src/modules/event/queries/list-event-attendees.ts  | 4 +---
 packages/core/src/modules/event/queries/list-events.ts      | 4 +---
 .../src/modules/event/use-cases/add-event-recording-link.ts | 3 ++-
 packages/core/src/modules/event/use-cases/create-event.ts   | 3 +--
 .../core/src/modules/event/use-cases/register-for-event.ts  | 3 ++-
 .../core/src/modules/event/use-cases/sync-airmeet-event.ts  | 3 ++-
 .../modules/icebreaker/queries/get-icebreaker-prompts.ts    | 4 +---
 .../modules/icebreaker/queries/get-icebreaker-responses.ts  | 4 +---
 .../modules/icebreaker/use-cases/add-icebreaker-prompt.ts   | 2 +-
 .../modules/mailchimp/use-cases/sync-mailchimp-campaign.ts  | 2 +-
 .../src/modules/mailchimp/use-cases/sync-mailchimp-list.ts  | 2 +-
 .../src/modules/member/events/activation-step-completed.ts  | 6 +++---
 packages/core/src/modules/member/events/member-activated.ts | 3 ++-
 packages/core/src/modules/member/events/member-created.ts   | 3 ++-
 .../modules/member/events/member-primary-email-changed.ts   | 3 ++-
 .../core/src/modules/member/queries/get-member-by-email.ts  | 2 +-
 .../core/src/modules/member/use-cases/activate-member.ts    | 3 ++-
 .../modules/member/use-cases/backfill-engagement-records.ts | 3 ++-
 .../modules/member/use-cases/send-birthday-notification.ts  | 3 ++-
 .../member/use-cases/send-profile-views-notification.ts     | 3 ++-
 .../src/modules/member/use-cases/update-member-email.ts     | 2 +-
 .../src/modules/member/use-cases/view-member-profile.ts     | 2 +-
 .../events/onboarding-session-attended.ts                   | 3 ++-
 .../use-cases/add-onboarding-session-attendees.ts           | 2 +-
 .../use-cases/upload-onboarding-session.ts                  | 2 +-
 .../modules/slack/events/slack-profile-picture-changed.ts   | 3 ++-
 .../core/src/modules/slack/events/slack-user-invited.ts     | 3 ++-
 .../core/src/modules/slack/events/slack-workspace-joined.ts | 3 ++-
 .../core/src/modules/slack/queries/count-messages-sent.ts   | 2 +-
 .../core/src/modules/slack/queries/list-slack-messages.ts   | 3 ++-
 .../core/src/modules/slack/use-cases/add-slack-message.ts   | 3 ++-
 .../core/src/modules/slack/use-cases/add-slack-reaction.ts  | 3 ++-
 .../src/modules/slack/use-cases/archive-slack-channel.ts    | 3 ++-
 .../src/modules/slack/use-cases/change-slack-message.ts     | 3 ++-
 .../src/modules/slack/use-cases/create-slack-channel.ts     | 3 ++-
 .../src/modules/slack/use-cases/delete-slack-channel.ts     | 3 ++-
 .../src/modules/slack/use-cases/delete-slack-message.ts     | 3 ++-
 .../src/modules/slack/use-cases/remove-slack-reaction.ts    | 3 ++-
 .../src/modules/slack/use-cases/rename-slack-channel.ts     | 3 ++-
 .../slack/use-cases/send-stackbot-mass-notification.ts      | 3 ++-
 .../src/modules/slack/use-cases/unarchive-slack-channel.ts  | 3 ++-
 .../modules/slack/use-cases/update-birthdates-from-slack.ts | 3 ++-
 packages/core/src/modules/survey/use-cases/create-survey.ts | 2 +-
 .../src/modules/survey/use-cases/import-survey-responses.ts | 2 +-
 .../core/src/modules/swag-pack/use-cases/claim-swag-pack.ts | 3 ++-
 75 files changed, 115 insertions(+), 91 deletions(-)
 delete mode 100644 packages/core/src/infrastructure/database/index.ts

diff --git a/packages/core/src/infrastructure/database/index.ts b/packages/core/src/infrastructure/database/index.ts
deleted file mode 100644
index 536a1ad8..00000000
--- a/packages/core/src/infrastructure/database/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { db } from '@oyster/db';
diff --git a/packages/core/src/modules/active-status/queries/get-active-streak-leaderboard.ts b/packages/core/src/modules/active-status/queries/get-active-streak-leaderboard.ts
index ba2d3395..e0bad716 100644
--- a/packages/core/src/modules/active-status/queries/get-active-streak-leaderboard.ts
+++ b/packages/core/src/modules/active-status/queries/get-active-streak-leaderboard.ts
@@ -1,6 +1,7 @@
 import { sql } from 'kysely';
 
-import { db } from '@/infrastructure/database';
+import { db } from '@oyster/db';
+
 import { cache } from '@/infrastructure/redis';
 import { LeaderboardPosition } from '../shared/active-status.shared';
 
diff --git a/packages/core/src/modules/active-status/queries/get-active-streak.ts b/packages/core/src/modules/active-status/queries/get-active-streak.ts
index 1cc3970e..5a8c874d 100644
--- a/packages/core/src/modules/active-status/queries/get-active-streak.ts
+++ b/packages/core/src/modules/active-status/queries/get-active-streak.ts
@@ -1,6 +1,6 @@
 import { sql } from 'kysely';
 
-import { db } from '@/infrastructure/database';
+import { db } from '@oyster/db';
 
 const streakGroup = sql<number>`
   row_number() over (partition by student_id order by date desc) -
diff --git a/packages/core/src/modules/active-status/use-cases/backfill-active-statuses.ts b/packages/core/src/modules/active-status/use-cases/backfill-active-statuses.ts
index 843d1ed1..1150a6cd 100644
--- a/packages/core/src/modules/active-status/use-cases/backfill-active-statuses.ts
+++ b/packages/core/src/modules/active-status/use-cases/backfill-active-statuses.ts
@@ -1,9 +1,9 @@
 import dayjs from 'dayjs';
 
+import { db } from '@oyster/db';
 import { type StudentActiveStatus } from '@oyster/types';
 
 import { type GetBullJobData } from '@/infrastructure/bull/bull.types';
-import { db } from '@/infrastructure/database';
 
 export async function backfillActiveStatuses({
   studentId,
diff --git a/packages/core/src/modules/active-status/use-cases/create-new-active-statuses.ts b/packages/core/src/modules/active-status/use-cases/create-new-active-statuses.ts
index 7afdb200..79bf61ed 100644
--- a/packages/core/src/modules/active-status/use-cases/create-new-active-statuses.ts
+++ b/packages/core/src/modules/active-status/use-cases/create-new-active-statuses.ts
@@ -1,9 +1,9 @@
 import dayjs from 'dayjs';
 
+import { db } from '@oyster/db';
 import { type StudentActiveStatus } from '@oyster/types';
 
 import { type GetBullJobData } from '@/infrastructure/bull/bull.types';
-import { db } from '@/infrastructure/database';
 
 type CreateNewActiveStatusesInput = GetBullJobData<'student.statuses.new'>;
 
diff --git a/packages/core/src/modules/admin/use-cases/add-admin.ts b/packages/core/src/modules/admin/use-cases/add-admin.ts
index 2d8efe05..9dca184b 100644
--- a/packages/core/src/modules/admin/use-cases/add-admin.ts
+++ b/packages/core/src/modules/admin/use-cases/add-admin.ts
@@ -1,6 +1,6 @@
+import { db } from '@oyster/db';
 import { id } from '@oyster/utils';
 
-import { db } from '@/infrastructure/database';
 import { type AddAdminInput } from '../admin.types';
 
 /**
diff --git a/packages/core/src/modules/airtable/airtable.core.ts b/packages/core/src/modules/airtable/airtable.core.ts
index 6200bd5e..4a0ca86b 100644
--- a/packages/core/src/modules/airtable/airtable.core.ts
+++ b/packages/core/src/modules/airtable/airtable.core.ts
@@ -1,6 +1,7 @@
 import { match } from 'ts-pattern';
 import { z } from 'zod';
 
+import { db } from '@oyster/db';
 import {
   FORMATTED_DEMOGRAPHICS,
   FORMATTED_GENDER,
@@ -13,7 +14,6 @@ import {
   type GetBullJobData,
 } from '@/infrastructure/bull/bull.types';
 import { registerWorker } from '@/infrastructure/bull/use-cases/register-worker';
-import { db } from '@/infrastructure/database';
 import { IS_PRODUCTION } from '@/shared/env';
 import { ColorStackError, ErrorWithContext } from '@/shared/errors';
 import { RateLimiter } from '@/shared/utils/rate-limiter';
diff --git a/packages/core/src/modules/authentication/use-cases/expire-one-time-code.ts b/packages/core/src/modules/authentication/use-cases/expire-one-time-code.ts
index e9d13231..29e57e91 100644
--- a/packages/core/src/modules/authentication/use-cases/expire-one-time-code.ts
+++ b/packages/core/src/modules/authentication/use-cases/expire-one-time-code.ts
@@ -1,5 +1,6 @@
+import { db } from '@oyster/db';
+
 import { type GetBullJobData } from '@/infrastructure/bull/bull.types';
-import { db } from '@/infrastructure/database';
 
 export async function expireOneTimeCode({
   oneTimeCodeId,
diff --git a/packages/core/src/modules/authentication/use-cases/login-with-oauth.ts b/packages/core/src/modules/authentication/use-cases/login-with-oauth.ts
index 9463afde..0bf01b11 100644
--- a/packages/core/src/modules/authentication/use-cases/login-with-oauth.ts
+++ b/packages/core/src/modules/authentication/use-cases/login-with-oauth.ts
@@ -1,6 +1,7 @@
 import { match } from 'ts-pattern';
 
-import { db } from '@/infrastructure/database';
+import { db } from '@oyster/db';
+
 import { getMemberByEmail } from '@/modules/member/queries/get-member-by-email';
 import { signToken } from '@/shared/utils/auth.utils';
 import { type OAuthCodeState } from '../authentication.types';
diff --git a/packages/core/src/modules/authentication/use-cases/send-one-time-code.ts b/packages/core/src/modules/authentication/use-cases/send-one-time-code.ts
index b5a52a26..4366722f 100644
--- a/packages/core/src/modules/authentication/use-cases/send-one-time-code.ts
+++ b/packages/core/src/modules/authentication/use-cases/send-one-time-code.ts
@@ -1,9 +1,9 @@
 import { match } from 'ts-pattern';
 
+import { db } from '@oyster/db';
 import { id } from '@oyster/utils';
 
 import { job } from '@/infrastructure/bull/use-cases/job';
-import { db } from '@/infrastructure/database';
 import { sendEmail } from '@/modules/notification/use-cases/send-email';
 import { IS_DEVELOPMENT } from '@/shared/env';
 import type {
diff --git a/packages/core/src/modules/authentication/use-cases/verify-one-time-code.ts b/packages/core/src/modules/authentication/use-cases/verify-one-time-code.ts
index a10019ee..cb4e2c3f 100644
--- a/packages/core/src/modules/authentication/use-cases/verify-one-time-code.ts
+++ b/packages/core/src/modules/authentication/use-cases/verify-one-time-code.ts
@@ -1,7 +1,8 @@
 import { match } from 'ts-pattern';
 
+import { db } from '@oyster/db';
+
 import { job } from '@/infrastructure/bull/use-cases/job';
-import { db } from '@/infrastructure/database';
 import { IS_DEVELOPMENT } from '@/shared/env';
 import {
   type OneTimeCodePurpose,
diff --git a/packages/core/src/modules/education/use-cases/add-education.ts b/packages/core/src/modules/education/use-cases/add-education.ts
index c2cd94a7..9411b891 100644
--- a/packages/core/src/modules/education/use-cases/add-education.ts
+++ b/packages/core/src/modules/education/use-cases/add-education.ts
@@ -1,7 +1,7 @@
+import { db } from '@oyster/db';
 import { id } from '@oyster/utils';
 
 import { job } from '@/infrastructure/bull/use-cases/job';
-import { db } from '@/infrastructure/database';
 import { checkMostRecentEducation } from './check-most-recent-education';
 import { type AddEducationInput } from '../education.types';
 
diff --git a/packages/core/src/modules/education/use-cases/check-most-recent-education.ts b/packages/core/src/modules/education/use-cases/check-most-recent-education.ts
index debfc2da..b437c62c 100644
--- a/packages/core/src/modules/education/use-cases/check-most-recent-education.ts
+++ b/packages/core/src/modules/education/use-cases/check-most-recent-education.ts
@@ -1,5 +1,6 @@
+import { db } from '@oyster/db';
+
 import { job } from '@/infrastructure/bull/use-cases/job';
-import { db } from '@/infrastructure/database';
 import {
   AIRTABLE_FAMILY_BASE_ID,
   AIRTABLE_MEMBERS_TABLE_ID,
diff --git a/packages/core/src/modules/education/use-cases/delete-education.ts b/packages/core/src/modules/education/use-cases/delete-education.ts
index 03d984b0..f25bcf73 100644
--- a/packages/core/src/modules/education/use-cases/delete-education.ts
+++ b/packages/core/src/modules/education/use-cases/delete-education.ts
@@ -1,5 +1,6 @@
+import { db } from '@oyster/db';
+
 import { job } from '@/infrastructure/bull/use-cases/job';
-import { db } from '@/infrastructure/database';
 import { checkMostRecentEducation } from './check-most-recent-education';
 import { type Education } from '../education.types';
 
diff --git a/packages/core/src/modules/education/use-cases/edit-education.ts b/packages/core/src/modules/education/use-cases/edit-education.ts
index 616ae534..df6dbd07 100644
--- a/packages/core/src/modules/education/use-cases/edit-education.ts
+++ b/packages/core/src/modules/education/use-cases/edit-education.ts
@@ -1,4 +1,5 @@
-import { db } from '@/infrastructure/database';
+import { db } from '@oyster/db';
+
 import { checkMostRecentEducation } from './check-most-recent-education';
 import { type Education } from '../education.types';
 
diff --git a/packages/core/src/modules/employment/queries/get-work-experience.ts b/packages/core/src/modules/employment/queries/get-work-experience.ts
index 67919a0d..25272669 100644
--- a/packages/core/src/modules/employment/queries/get-work-experience.ts
+++ b/packages/core/src/modules/employment/queries/get-work-experience.ts
@@ -1,8 +1,7 @@
 import { type SelectExpression } from 'kysely';
 
-import { type DB } from '@oyster/db';
+import { type DB, db } from '@oyster/db';
 
-import { db } from '@/infrastructure/database';
 import { type WorkExperience } from '../employment.types';
 
 type GetWorkExperienceQuery = Pick<WorkExperience, 'id' | 'studentId'>;
diff --git a/packages/core/src/modules/employment/queries/list-job-offers.ts b/packages/core/src/modules/employment/queries/list-job-offers.ts
index b0639f10..47cea12b 100644
--- a/packages/core/src/modules/employment/queries/list-job-offers.ts
+++ b/packages/core/src/modules/employment/queries/list-job-offers.ts
@@ -1,6 +1,7 @@
 import { sql } from 'kysely';
 
-import { db } from '@/infrastructure/database';
+import { db } from '@oyster/db';
+
 import { type ListJobOffersWhere } from '../employment.types';
 
 type ListJobOffersOptions = {
diff --git a/packages/core/src/modules/employment/queries/list-work-experiences.ts b/packages/core/src/modules/employment/queries/list-work-experiences.ts
index f00a6d65..36b905f1 100644
--- a/packages/core/src/modules/employment/queries/list-work-experiences.ts
+++ b/packages/core/src/modules/employment/queries/list-work-experiences.ts
@@ -1,6 +1,6 @@
 import dayjs from 'dayjs';
 
-import { db } from '@/infrastructure/database';
+import { db } from '@oyster/db';
 
 type ListWorkExperiencesOptions = {
   include?: 'hasReviewed'[];
diff --git a/packages/core/src/modules/employment/use-cases/add-work-experience.ts b/packages/core/src/modules/employment/use-cases/add-work-experience.ts
index 32705524..6b553400 100644
--- a/packages/core/src/modules/employment/use-cases/add-work-experience.ts
+++ b/packages/core/src/modules/employment/use-cases/add-work-experience.ts
@@ -1,7 +1,7 @@
+import { db } from '@oyster/db';
 import { id } from '@oyster/utils';
 
 import { job } from '@/infrastructure/bull/use-cases/job';
-import { db } from '@/infrastructure/database';
 import { saveCompanyIfNecessary } from './save-company-if-necessary';
 import { type AddWorkExperienceInput } from '../employment.types';
 
diff --git a/packages/core/src/modules/employment/use-cases/delete-work-experience.ts b/packages/core/src/modules/employment/use-cases/delete-work-experience.ts
index aa5f8272..c616ea97 100644
--- a/packages/core/src/modules/employment/use-cases/delete-work-experience.ts
+++ b/packages/core/src/modules/employment/use-cases/delete-work-experience.ts
@@ -1,5 +1,6 @@
+import { db } from '@oyster/db';
+
 import { job } from '@/infrastructure/bull/use-cases/job';
-import { db } from '@/infrastructure/database';
 import { type DeleteWorkExperienceInput } from '../employment.types';
 
 /**
diff --git a/packages/core/src/modules/employment/use-cases/edit-work-experience.ts b/packages/core/src/modules/employment/use-cases/edit-work-experience.ts
index d5b8b73a..7ff01956 100644
--- a/packages/core/src/modules/employment/use-cases/edit-work-experience.ts
+++ b/packages/core/src/modules/employment/use-cases/edit-work-experience.ts
@@ -1,4 +1,5 @@
-import { db } from '@/infrastructure/database';
+import { db } from '@oyster/db';
+
 import { saveCompanyIfNecessary } from './save-company-if-necessary';
 import { type EditWorkExperienceInput } from '../employment.types';
 
diff --git a/packages/core/src/modules/employment/use-cases/save-company-if-necessary.test.ts b/packages/core/src/modules/employment/use-cases/save-company-if-necessary.test.ts
index fbfe64cf..a5b4f1d9 100644
--- a/packages/core/src/modules/employment/use-cases/save-company-if-necessary.test.ts
+++ b/packages/core/src/modules/employment/use-cases/save-company-if-necessary.test.ts
@@ -1,6 +1,6 @@
+import { db } from '@oyster/db';
 import { company1, company4 } from '@oyster/db/test/constants';
 
-import { db } from '@/infrastructure/database';
 import { saveCompanyIfNecessary } from './save-company-if-necessary';
 import * as module from '../queries/get-crunchbase-organization';
 
diff --git a/packages/core/src/modules/employment/use-cases/save-company-if-necessary.ts b/packages/core/src/modules/employment/use-cases/save-company-if-necessary.ts
index cdcccaf6..ceaf2080 100644
--- a/packages/core/src/modules/employment/use-cases/save-company-if-necessary.ts
+++ b/packages/core/src/modules/employment/use-cases/save-company-if-necessary.ts
@@ -1,9 +1,8 @@
 import { type Transaction } from 'kysely';
 
-import { type DB } from '@oyster/db';
+import { type DB, db } from '@oyster/db';
 import { id } from '@oyster/utils';
 
-import { db } from '@/infrastructure/database';
 import { getCrunchbaseOrganization } from '../queries/get-crunchbase-organization';
 
 /**
diff --git a/packages/core/src/modules/employment/use-cases/upload-job-offer.ts b/packages/core/src/modules/employment/use-cases/upload-job-offer.ts
index 28458e89..e2841f4c 100644
--- a/packages/core/src/modules/employment/use-cases/upload-job-offer.ts
+++ b/packages/core/src/modules/employment/use-cases/upload-job-offer.ts
@@ -1,8 +1,8 @@
 import { sql } from 'kysely';
 
+import { db } from '@oyster/db';
 import { id } from '@oyster/utils';
 
-import { db } from '@/infrastructure/database';
 import { type UploadJobOfferInput } from '../employment.types';
 
 export async function uploadJobOffer({
diff --git a/packages/core/src/modules/event/event.core.ts b/packages/core/src/modules/event/event.core.ts
index 36d16d2d..23e2a4d7 100644
--- a/packages/core/src/modules/event/event.core.ts
+++ b/packages/core/src/modules/event/event.core.ts
@@ -1,5 +1,6 @@
+import { db } from '@oyster/db';
+
 import { job } from '@/infrastructure/bull/use-cases/job';
-import { db } from '@/infrastructure/database';
 import { ActivityType } from '@/modules/gamification/gamification.types';
 
 type CheckIntoEventInput = {
diff --git a/packages/core/src/modules/event/events/event-registered.ts b/packages/core/src/modules/event/events/event-registered.ts
index d01b536d..97ff9b81 100644
--- a/packages/core/src/modules/event/events/event-registered.ts
+++ b/packages/core/src/modules/event/events/event-registered.ts
@@ -1,9 +1,9 @@
+import { db } from '@oyster/db';
 import type { Gender } from '@oyster/types';
 import { FORMATTED_GENDER } from '@oyster/types';
 
 import { type GetBullJobData } from '@/infrastructure/bull/bull.types';
 import { job } from '@/infrastructure/bull/use-cases/job';
-import { db } from '@/infrastructure/database';
 
 export async function onRegisteredForEvent({
   eventId,
diff --git a/packages/core/src/modules/event/queries/count-event-attendees.ts b/packages/core/src/modules/event/queries/count-event-attendees.ts
index ec412812..9fd932f2 100644
--- a/packages/core/src/modules/event/queries/count-event-attendees.ts
+++ b/packages/core/src/modules/event/queries/count-event-attendees.ts
@@ -1,7 +1,6 @@
+import { db } from '@oyster/db';
 import { type EventAttendee } from '@oyster/types';
 
-import { db } from '@/infrastructure/database';
-
 type CountEventAttendeesOptions = {
   where: Partial<Pick<EventAttendee, 'eventId' | 'studentId'>>;
 };
diff --git a/packages/core/src/modules/event/queries/count-past-events.ts b/packages/core/src/modules/event/queries/count-past-events.ts
index 11411d43..e4c2b6c2 100644
--- a/packages/core/src/modules/event/queries/count-past-events.ts
+++ b/packages/core/src/modules/event/queries/count-past-events.ts
@@ -1,4 +1,4 @@
-import { db } from '@/infrastructure/database';
+import { db } from '@oyster/db';
 
 export async function countPastEvents() {
   const result = await db
diff --git a/packages/core/src/modules/event/queries/count-upcoming-events.ts b/packages/core/src/modules/event/queries/count-upcoming-events.ts
index fb035a0f..0f7c910a 100644
--- a/packages/core/src/modules/event/queries/count-upcoming-events.ts
+++ b/packages/core/src/modules/event/queries/count-upcoming-events.ts
@@ -1,4 +1,4 @@
-import { db } from '@/infrastructure/database';
+import { db } from '@oyster/db';
 
 export async function countUpcomingEvents() {
   const result = await db
diff --git a/packages/core/src/modules/event/queries/get-event.ts b/packages/core/src/modules/event/queries/get-event.ts
index 9ede1725..9473af0b 100644
--- a/packages/core/src/modules/event/queries/get-event.ts
+++ b/packages/core/src/modules/event/queries/get-event.ts
@@ -1,10 +1,8 @@
 import type { SelectExpression } from 'kysely';
 
-import { type DB } from '@oyster/db';
+import { type DB, db } from '@oyster/db';
 import { type EventType } from '@oyster/types';
 
-import { db } from '@/infrastructure/database';
-
 type GetEventOptions = {
   include?: 'isCheckedIn'[];
   memberId?: string;
diff --git a/packages/core/src/modules/event/queries/list-event-attendees.ts b/packages/core/src/modules/event/queries/list-event-attendees.ts
index 3728f736..c9ec213d 100644
--- a/packages/core/src/modules/event/queries/list-event-attendees.ts
+++ b/packages/core/src/modules/event/queries/list-event-attendees.ts
@@ -1,10 +1,8 @@
 import { type SelectExpression } from 'kysely';
 
-import { type DB } from '@oyster/db';
+import { type DB, db } from '@oyster/db';
 import { type EventAttendee } from '@oyster/types';
 
-import { db } from '@/infrastructure/database';
-
 type ListEventAttendeesOptions<Selection> = {
   select: Selection[];
   where: Pick<EventAttendee, 'eventId'>;
diff --git a/packages/core/src/modules/event/queries/list-events.ts b/packages/core/src/modules/event/queries/list-events.ts
index 0644e3bc..a8736f37 100644
--- a/packages/core/src/modules/event/queries/list-events.ts
+++ b/packages/core/src/modules/event/queries/list-events.ts
@@ -1,8 +1,6 @@
 import { type SelectExpression } from 'kysely';
 
-import { type DB } from '@oyster/db';
-
-import { db } from '@/infrastructure/database';
+import { type DB, db } from '@oyster/db';
 
 type ListEventsQuery = Partial<{
   limit: number;
diff --git a/packages/core/src/modules/event/use-cases/add-event-recording-link.ts b/packages/core/src/modules/event/use-cases/add-event-recording-link.ts
index 9f5fa377..b455c4c1 100644
--- a/packages/core/src/modules/event/use-cases/add-event-recording-link.ts
+++ b/packages/core/src/modules/event/use-cases/add-event-recording-link.ts
@@ -1,4 +1,5 @@
-import { db } from '@/infrastructure/database';
+import { db } from '@oyster/db';
+
 import { type AddEventRecordingLinkInput } from '@/modules/event/event.types';
 
 export async function addEventRecordingLink(
diff --git a/packages/core/src/modules/event/use-cases/create-event.ts b/packages/core/src/modules/event/use-cases/create-event.ts
index dc58a481..3e23cff8 100644
--- a/packages/core/src/modules/event/use-cases/create-event.ts
+++ b/packages/core/src/modules/event/use-cases/create-event.ts
@@ -1,10 +1,9 @@
 import dayjs from 'dayjs';
 
+import { db } from '@oyster/db';
 import { type Event } from '@oyster/types';
 import { id } from '@oyster/utils';
 
-import { db } from '@/infrastructure/database';
-
 type CreateEventInput = Pick<Event, 'description' | 'name' | 'type'> & {
   endTime: string;
   startTime: string;
diff --git a/packages/core/src/modules/event/use-cases/register-for-event.ts b/packages/core/src/modules/event/use-cases/register-for-event.ts
index 2e20005d..2cdedfe7 100644
--- a/packages/core/src/modules/event/use-cases/register-for-event.ts
+++ b/packages/core/src/modules/event/use-cases/register-for-event.ts
@@ -1,6 +1,7 @@
+import { db } from '@oyster/db';
+
 import { type GetBullJobData } from '@/infrastructure/bull/bull.types';
 import { job } from '@/infrastructure/bull/use-cases/job';
-import { db } from '@/infrastructure/database';
 import { registerForAirmeetEvent } from '../airmeet-event.service';
 
 export async function registerForEvent({
diff --git a/packages/core/src/modules/event/use-cases/sync-airmeet-event.ts b/packages/core/src/modules/event/use-cases/sync-airmeet-event.ts
index f3ac3f02..5cc9f161 100644
--- a/packages/core/src/modules/event/use-cases/sync-airmeet-event.ts
+++ b/packages/core/src/modules/event/use-cases/sync-airmeet-event.ts
@@ -1,6 +1,7 @@
+import { db } from '@oyster/db';
+
 import { type GetBullJobData } from '@/infrastructure/bull/bull.types';
 import { job } from '@/infrastructure/bull/use-cases/job';
-import { db } from '@/infrastructure/database';
 import { getMemberByEmail } from '@/modules/member/queries/get-member-by-email';
 import { NotFoundError } from '@/shared/errors';
 import {
diff --git a/packages/core/src/modules/icebreaker/queries/get-icebreaker-prompts.ts b/packages/core/src/modules/icebreaker/queries/get-icebreaker-prompts.ts
index 02a32aad..575f1e76 100644
--- a/packages/core/src/modules/icebreaker/queries/get-icebreaker-prompts.ts
+++ b/packages/core/src/modules/icebreaker/queries/get-icebreaker-prompts.ts
@@ -1,8 +1,6 @@
 import type { SelectExpression } from 'kysely';
 
-import { type DB } from '@oyster/db';
-
-import { db } from '@/infrastructure/database';
+import { type DB, db } from '@oyster/db';
 
 export async function getIcebreakerPrompts<
   Selection extends SelectExpression<DB, 'icebreakerPrompts'>,
diff --git a/packages/core/src/modules/icebreaker/queries/get-icebreaker-responses.ts b/packages/core/src/modules/icebreaker/queries/get-icebreaker-responses.ts
index 932519b2..7cab9d9b 100644
--- a/packages/core/src/modules/icebreaker/queries/get-icebreaker-responses.ts
+++ b/packages/core/src/modules/icebreaker/queries/get-icebreaker-responses.ts
@@ -1,8 +1,6 @@
 import type { SelectExpression } from 'kysely';
 
-import { type DB } from '@oyster/db';
-
-import { db } from '@/infrastructure/database';
+import { type DB, db } from '@oyster/db';
 
 export async function getIcebreakerResponses<
   Selection extends SelectExpression<DB, 'icebreakerResponses'>,
diff --git a/packages/core/src/modules/icebreaker/use-cases/add-icebreaker-prompt.ts b/packages/core/src/modules/icebreaker/use-cases/add-icebreaker-prompt.ts
index ce23fc56..b297c647 100644
--- a/packages/core/src/modules/icebreaker/use-cases/add-icebreaker-prompt.ts
+++ b/packages/core/src/modules/icebreaker/use-cases/add-icebreaker-prompt.ts
@@ -1,6 +1,6 @@
+import { db } from '@oyster/db';
 import { id } from '@oyster/utils';
 
-import { db } from '@/infrastructure/database';
 import { type AddIcebreakerPromptInput } from '../icebreaker.types';
 
 export async function addIcebreakerPrompt(input: AddIcebreakerPromptInput) {
diff --git a/packages/core/src/modules/mailchimp/use-cases/sync-mailchimp-campaign.ts b/packages/core/src/modules/mailchimp/use-cases/sync-mailchimp-campaign.ts
index c4c722e1..e12dcffb 100644
--- a/packages/core/src/modules/mailchimp/use-cases/sync-mailchimp-campaign.ts
+++ b/packages/core/src/modules/mailchimp/use-cases/sync-mailchimp-campaign.ts
@@ -1,5 +1,6 @@
 import mailchimp, { type Mailchimp } from '@mailchimp/mailchimp_marketing';
 
+import { db } from '@oyster/db';
 import {
   type EmailCampaign,
   type EmailCampaignClick,
@@ -10,7 +11,6 @@ import { id } from '@oyster/utils';
 
 import { type GetBullJobData } from '@/infrastructure/bull/bull.types';
 import { job } from '@/infrastructure/bull/use-cases/job';
-import { db } from '@/infrastructure/database';
 import { getMemberByEmail } from '@/modules/member/queries/get-member-by-email';
 import { NotFoundError } from '@/shared/errors';
 
diff --git a/packages/core/src/modules/mailchimp/use-cases/sync-mailchimp-list.ts b/packages/core/src/modules/mailchimp/use-cases/sync-mailchimp-list.ts
index 75f1b210..5e903b68 100644
--- a/packages/core/src/modules/mailchimp/use-cases/sync-mailchimp-list.ts
+++ b/packages/core/src/modules/mailchimp/use-cases/sync-mailchimp-list.ts
@@ -1,9 +1,9 @@
 import mailchimp, { type Mailchimp } from '@mailchimp/mailchimp_marketing';
 
+import { db } from '@oyster/db';
 import { type EmailCampaign, type EmailList } from '@oyster/types';
 
 import { job } from '@/infrastructure/bull/use-cases/job';
-import { db } from '@/infrastructure/database';
 import { ENV } from '@/shared/env';
 import { NotFoundError } from '@/shared/errors';
 
diff --git a/packages/core/src/modules/member/events/activation-step-completed.ts b/packages/core/src/modules/member/events/activation-step-completed.ts
index 9cb2d60a..8275b73e 100644
--- a/packages/core/src/modules/member/events/activation-step-completed.ts
+++ b/packages/core/src/modules/member/events/activation-step-completed.ts
@@ -1,10 +1,10 @@
 import dayjs from 'dayjs';
 import dedent from 'dedent';
 
+import { db } from '@oyster/db';
 import { ActivationRequirement, type Student } from '@oyster/types';
 
 import { job } from '@/infrastructure/bull/use-cases/job';
-import { db } from '@/infrastructure/database';
 import { ACTIVATION_FLOW_LAUNCH_DATE } from '@/shared/constants';
 import { ENV } from '@/shared/env';
 import { ErrorWithContext } from '@/shared/errors';
@@ -239,9 +239,9 @@ async function sendProgressNotification({
   if (completedRequirements === totalRequirements) {
     message = dedent`
       Congratulations, ${firstName}! 🎉
-      
+
       You've completed all of your activation requirements, which means...you are now an *activated* ColorStack member.
-      
+
       You can now claim your free swag pack in your <https://app.colorstack.io/home|*Member Profile*>! 🎁
     `;
   } else {
diff --git a/packages/core/src/modules/member/events/member-activated.ts b/packages/core/src/modules/member/events/member-activated.ts
index 844dc9a5..1072fc27 100644
--- a/packages/core/src/modules/member/events/member-activated.ts
+++ b/packages/core/src/modules/member/events/member-activated.ts
@@ -1,6 +1,7 @@
+import { db } from '@oyster/db';
+
 import { type GetBullJobData } from '@/infrastructure/bull/bull.types';
 import { job } from '@/infrastructure/bull/use-cases/job';
-import { db } from '@/infrastructure/database';
 import { ENV } from '@/shared/env';
 
 export async function onMemberActivated({
diff --git a/packages/core/src/modules/member/events/member-created.ts b/packages/core/src/modules/member/events/member-created.ts
index 199eed8f..b62ab7bb 100644
--- a/packages/core/src/modules/member/events/member-created.ts
+++ b/packages/core/src/modules/member/events/member-created.ts
@@ -1,6 +1,7 @@
+import { db } from '@oyster/db';
+
 import { type GetBullJobData } from '@/infrastructure/bull/bull.types';
 import { job } from '@/infrastructure/bull/use-cases/job';
-import { db } from '@/infrastructure/database';
 import { addMailchimpListMember } from '@/modules/mailchimp/use-cases/add-mailchimp-list-member';
 import { reportException } from '@/modules/sentry/use-cases/report-exception';
 
diff --git a/packages/core/src/modules/member/events/member-primary-email-changed.ts b/packages/core/src/modules/member/events/member-primary-email-changed.ts
index 88e1f7ed..6e507a26 100644
--- a/packages/core/src/modules/member/events/member-primary-email-changed.ts
+++ b/packages/core/src/modules/member/events/member-primary-email-changed.ts
@@ -1,6 +1,7 @@
+import { db } from '@oyster/db';
+
 import { type GetBullJobData } from '@/infrastructure/bull/bull.types';
 import { job } from '@/infrastructure/bull/use-cases/job';
-import { db } from '@/infrastructure/database';
 import {
   AIRTABLE_FAMILY_BASE_ID,
   AIRTABLE_MEMBERS_TABLE_ID,
diff --git a/packages/core/src/modules/member/queries/get-member-by-email.ts b/packages/core/src/modules/member/queries/get-member-by-email.ts
index d262d878..4eb45195 100644
--- a/packages/core/src/modules/member/queries/get-member-by-email.ts
+++ b/packages/core/src/modules/member/queries/get-member-by-email.ts
@@ -1,4 +1,4 @@
-import { db } from '@/infrastructure/database';
+import { db } from '@oyster/db';
 
 export function getMemberByEmail(email: string) {
   return db
diff --git a/packages/core/src/modules/member/use-cases/activate-member.ts b/packages/core/src/modules/member/use-cases/activate-member.ts
index 3054e420..7a48ce61 100644
--- a/packages/core/src/modules/member/use-cases/activate-member.ts
+++ b/packages/core/src/modules/member/use-cases/activate-member.ts
@@ -1,5 +1,6 @@
+import { db } from '@oyster/db';
+
 import { job } from '@/infrastructure/bull/use-cases/job';
-import { db } from '@/infrastructure/database';
 
 export async function activateMember(id: string) {
   await db
diff --git a/packages/core/src/modules/member/use-cases/backfill-engagement-records.ts b/packages/core/src/modules/member/use-cases/backfill-engagement-records.ts
index c8af6820..f5147934 100644
--- a/packages/core/src/modules/member/use-cases/backfill-engagement-records.ts
+++ b/packages/core/src/modules/member/use-cases/backfill-engagement-records.ts
@@ -1,6 +1,7 @@
+import { db } from '@oyster/db';
+
 import { type GetBullJobData } from '@/infrastructure/bull/bull.types';
 import { job } from '@/infrastructure/bull/use-cases/job';
-import { db } from '@/infrastructure/database';
 import { getSlackUserByEmail } from '@/modules/slack/services/slack-user.service';
 
 type BackfillEngagementRecordsInput =
diff --git a/packages/core/src/modules/member/use-cases/send-birthday-notification.ts b/packages/core/src/modules/member/use-cases/send-birthday-notification.ts
index 085b3a0f..d1866d93 100644
--- a/packages/core/src/modules/member/use-cases/send-birthday-notification.ts
+++ b/packages/core/src/modules/member/use-cases/send-birthday-notification.ts
@@ -1,8 +1,9 @@
 import { sql } from 'kysely';
 
+import { db } from '@oyster/db';
+
 import { type GetBullJobData } from '@/infrastructure/bull/bull.types';
 import { job } from '@/infrastructure/bull/use-cases/job';
-import { db } from '@/infrastructure/database';
 import { ENV } from '@/shared/env';
 
 export async function sendBirthdayNotification(
diff --git a/packages/core/src/modules/member/use-cases/send-profile-views-notification.ts b/packages/core/src/modules/member/use-cases/send-profile-views-notification.ts
index 763ca76c..eec46330 100644
--- a/packages/core/src/modules/member/use-cases/send-profile-views-notification.ts
+++ b/packages/core/src/modules/member/use-cases/send-profile-views-notification.ts
@@ -1,8 +1,9 @@
 import dayjs from 'dayjs';
 
+import { db } from '@oyster/db';
+
 import { type GetBullJobData } from '@/infrastructure/bull/bull.types';
 import { job } from '@/infrastructure/bull/use-cases/job';
-import { db } from '@/infrastructure/database';
 
 export async function sendProfileViewsNotification(
   _: GetBullJobData<'profile.views.notification.monthly'>
diff --git a/packages/core/src/modules/member/use-cases/update-member-email.ts b/packages/core/src/modules/member/use-cases/update-member-email.ts
index 51b020e7..faa70015 100644
--- a/packages/core/src/modules/member/use-cases/update-member-email.ts
+++ b/packages/core/src/modules/member/use-cases/update-member-email.ts
@@ -1,7 +1,7 @@
+import { db } from '@oyster/db';
 import { type Student } from '@oyster/types';
 
 import { job } from '@/infrastructure/bull/use-cases/job';
-import { db } from '@/infrastructure/database';
 
 type UpdateMemberEmailInput = Pick<Student, 'email' | 'id'>;
 
diff --git a/packages/core/src/modules/member/use-cases/view-member-profile.ts b/packages/core/src/modules/member/use-cases/view-member-profile.ts
index bb246c4e..c27087fb 100644
--- a/packages/core/src/modules/member/use-cases/view-member-profile.ts
+++ b/packages/core/src/modules/member/use-cases/view-member-profile.ts
@@ -1,7 +1,7 @@
+import { db } from '@oyster/db';
 import { id } from '@oyster/utils';
 
 import { type GetBullJobData } from '@/infrastructure/bull/bull.types';
-import { db } from '@/infrastructure/database';
 
 export async function viewMemberProfile({
   profileViewedId,
diff --git a/packages/core/src/modules/onboarding-session/events/onboarding-session-attended.ts b/packages/core/src/modules/onboarding-session/events/onboarding-session-attended.ts
index 3539dec8..c54e5297 100644
--- a/packages/core/src/modules/onboarding-session/events/onboarding-session-attended.ts
+++ b/packages/core/src/modules/onboarding-session/events/onboarding-session-attended.ts
@@ -1,6 +1,7 @@
+import { db } from '@oyster/db';
+
 import { type GetBullJobData } from '@/infrastructure/bull/bull.types';
 import { job } from '@/infrastructure/bull/use-cases/job';
-import { db } from '@/infrastructure/database';
 
 export async function onOnboardingSessionAttended({
   onboardingSessionId,
diff --git a/packages/core/src/modules/onboarding-session/use-cases/add-onboarding-session-attendees.ts b/packages/core/src/modules/onboarding-session/use-cases/add-onboarding-session-attendees.ts
index baaabe6c..3a8abebc 100644
--- a/packages/core/src/modules/onboarding-session/use-cases/add-onboarding-session-attendees.ts
+++ b/packages/core/src/modules/onboarding-session/use-cases/add-onboarding-session-attendees.ts
@@ -1,9 +1,9 @@
 import dayjs from 'dayjs';
 
+import { db } from '@oyster/db';
 import { id } from '@oyster/utils';
 
 import { job } from '@/infrastructure/bull/use-cases/job';
-import { db } from '@/infrastructure/database';
 
 type AddOnboardingSessionAttendeesInput = {
   attendees: string[];
diff --git a/packages/core/src/modules/onboarding-session/use-cases/upload-onboarding-session.ts b/packages/core/src/modules/onboarding-session/use-cases/upload-onboarding-session.ts
index dfe33f2f..313c9c58 100644
--- a/packages/core/src/modules/onboarding-session/use-cases/upload-onboarding-session.ts
+++ b/packages/core/src/modules/onboarding-session/use-cases/upload-onboarding-session.ts
@@ -1,9 +1,9 @@
 import dayjs from 'dayjs';
 
+import { db } from '@oyster/db';
 import { id } from '@oyster/utils';
 
 import { job } from '@/infrastructure/bull/use-cases/job';
-import { db } from '@/infrastructure/database';
 
 type UploadOnboardingSessionInput = {
   attendees: string[];
diff --git a/packages/core/src/modules/slack/events/slack-profile-picture-changed.ts b/packages/core/src/modules/slack/events/slack-profile-picture-changed.ts
index 98768651..b5e5091e 100644
--- a/packages/core/src/modules/slack/events/slack-profile-picture-changed.ts
+++ b/packages/core/src/modules/slack/events/slack-profile-picture-changed.ts
@@ -1,6 +1,7 @@
+import { db } from '@oyster/db';
+
 import { type GetBullJobData } from '@/infrastructure/bull/bull.types';
 import { job } from '@/infrastructure/bull/use-cases/job';
-import { db } from '@/infrastructure/database';
 
 export async function onSlackProfilePictureChanged({
   profilePicture,
diff --git a/packages/core/src/modules/slack/events/slack-user-invited.ts b/packages/core/src/modules/slack/events/slack-user-invited.ts
index 62416496..55c1b8ba 100644
--- a/packages/core/src/modules/slack/events/slack-user-invited.ts
+++ b/packages/core/src/modules/slack/events/slack-user-invited.ts
@@ -1,5 +1,6 @@
+import { db } from '@oyster/db';
+
 import { type GetBullJobData } from '@/infrastructure/bull/bull.types';
-import { db } from '@/infrastructure/database';
 import { getSlackUserByEmail } from '@/modules/slack/services/slack-user.service';
 
 /**
diff --git a/packages/core/src/modules/slack/events/slack-workspace-joined.ts b/packages/core/src/modules/slack/events/slack-workspace-joined.ts
index 58490747..2f5889a5 100644
--- a/packages/core/src/modules/slack/events/slack-workspace-joined.ts
+++ b/packages/core/src/modules/slack/events/slack-workspace-joined.ts
@@ -1,5 +1,6 @@
+import { db } from '@oyster/db';
+
 import { type GetBullJobData } from '@/infrastructure/bull/bull.types';
-import { db } from '@/infrastructure/database';
 import { getMemberByEmail } from '@/modules/member/queries/get-member-by-email';
 import { NotFoundError } from '@/shared/errors';
 
diff --git a/packages/core/src/modules/slack/queries/count-messages-sent.ts b/packages/core/src/modules/slack/queries/count-messages-sent.ts
index e1bd313f..24ac0e31 100644
--- a/packages/core/src/modules/slack/queries/count-messages-sent.ts
+++ b/packages/core/src/modules/slack/queries/count-messages-sent.ts
@@ -1,4 +1,4 @@
-import { db } from '@/infrastructure/database';
+import { db } from '@oyster/db';
 
 export async function countMessagesSent(memberId: string) {
   const row = await db
diff --git a/packages/core/src/modules/slack/queries/list-slack-messages.ts b/packages/core/src/modules/slack/queries/list-slack-messages.ts
index 57f520dd..804e981a 100644
--- a/packages/core/src/modules/slack/queries/list-slack-messages.ts
+++ b/packages/core/src/modules/slack/queries/list-slack-messages.ts
@@ -1,4 +1,5 @@
-import { db } from '@/infrastructure/database';
+import { db } from '@oyster/db';
+
 import { type ListSearchParams } from '@/shared/types';
 
 type ListSlackMessagesOptions = {
diff --git a/packages/core/src/modules/slack/use-cases/add-slack-message.ts b/packages/core/src/modules/slack/use-cases/add-slack-message.ts
index 40167cf7..3a101d4b 100644
--- a/packages/core/src/modules/slack/use-cases/add-slack-message.ts
+++ b/packages/core/src/modules/slack/use-cases/add-slack-message.ts
@@ -1,6 +1,7 @@
+import { db } from '@oyster/db';
+
 import { type GetBullJobData } from '@/infrastructure/bull/bull.types';
 import { job } from '@/infrastructure/bull/use-cases/job';
-import { db } from '@/infrastructure/database';
 import { ErrorWithContext } from '@/shared/errors';
 import { retryWithBackoff } from '@/shared/utils/core.utils';
 import { getSlackMessage } from '../services/slack-message.service';
diff --git a/packages/core/src/modules/slack/use-cases/add-slack-reaction.ts b/packages/core/src/modules/slack/use-cases/add-slack-reaction.ts
index db19b851..ee2944c9 100644
--- a/packages/core/src/modules/slack/use-cases/add-slack-reaction.ts
+++ b/packages/core/src/modules/slack/use-cases/add-slack-reaction.ts
@@ -1,6 +1,7 @@
+import { db } from '@oyster/db';
+
 import { type GetBullJobData } from '@/infrastructure/bull/bull.types';
 import { job } from '@/infrastructure/bull/use-cases/job';
-import { db } from '@/infrastructure/database';
 import { ErrorWithContext } from '@/shared/errors';
 import { retryWithBackoff } from '@/shared/utils/core.utils';
 import { getSlackMessage } from '../services/slack-message.service';
diff --git a/packages/core/src/modules/slack/use-cases/archive-slack-channel.ts b/packages/core/src/modules/slack/use-cases/archive-slack-channel.ts
index 9ef73478..8c5c784f 100644
--- a/packages/core/src/modules/slack/use-cases/archive-slack-channel.ts
+++ b/packages/core/src/modules/slack/use-cases/archive-slack-channel.ts
@@ -1,5 +1,6 @@
+import { db } from '@oyster/db';
+
 import { type GetBullJobData } from '@/infrastructure/bull/bull.types';
-import { db } from '@/infrastructure/database';
 
 export async function archiveSlackChannel({
   id,
diff --git a/packages/core/src/modules/slack/use-cases/change-slack-message.ts b/packages/core/src/modules/slack/use-cases/change-slack-message.ts
index e29aea21..4fc5e561 100644
--- a/packages/core/src/modules/slack/use-cases/change-slack-message.ts
+++ b/packages/core/src/modules/slack/use-cases/change-slack-message.ts
@@ -1,5 +1,6 @@
+import { db } from '@oyster/db';
+
 import { type GetBullJobData } from '@/infrastructure/bull/bull.types';
-import { db } from '@/infrastructure/database';
 
 export async function changeSlackMessage({
   channelId,
diff --git a/packages/core/src/modules/slack/use-cases/create-slack-channel.ts b/packages/core/src/modules/slack/use-cases/create-slack-channel.ts
index 44de09bd..cc00069a 100644
--- a/packages/core/src/modules/slack/use-cases/create-slack-channel.ts
+++ b/packages/core/src/modules/slack/use-cases/create-slack-channel.ts
@@ -1,5 +1,6 @@
+import { db } from '@oyster/db';
+
 import { type GetBullJobData } from '@/infrastructure/bull/bull.types';
-import { db } from '@/infrastructure/database';
 import { joinSlackChannel } from '@/modules/slack/services/slack-channel.service';
 
 export async function createSlackChannel({
diff --git a/packages/core/src/modules/slack/use-cases/delete-slack-channel.ts b/packages/core/src/modules/slack/use-cases/delete-slack-channel.ts
index 93af52e8..34717a1f 100644
--- a/packages/core/src/modules/slack/use-cases/delete-slack-channel.ts
+++ b/packages/core/src/modules/slack/use-cases/delete-slack-channel.ts
@@ -1,5 +1,6 @@
+import { db } from '@oyster/db';
+
 import { type GetBullJobData } from '@/infrastructure/bull/bull.types';
-import { db } from '@/infrastructure/database';
 
 export async function deleteSlackChannel({
   id,
diff --git a/packages/core/src/modules/slack/use-cases/delete-slack-message.ts b/packages/core/src/modules/slack/use-cases/delete-slack-message.ts
index 3968de1b..e605799e 100644
--- a/packages/core/src/modules/slack/use-cases/delete-slack-message.ts
+++ b/packages/core/src/modules/slack/use-cases/delete-slack-message.ts
@@ -1,6 +1,7 @@
+import { db } from '@oyster/db';
+
 import { type GetBullJobData } from '@/infrastructure/bull/bull.types';
 import { job } from '@/infrastructure/bull/use-cases/job';
-import { db } from '@/infrastructure/database';
 import { retryWithBackoff } from '@/shared/utils/core.utils';
 
 export async function deleteSlackMessage({
diff --git a/packages/core/src/modules/slack/use-cases/remove-slack-reaction.ts b/packages/core/src/modules/slack/use-cases/remove-slack-reaction.ts
index 9d4c6c0a..09cf7547 100644
--- a/packages/core/src/modules/slack/use-cases/remove-slack-reaction.ts
+++ b/packages/core/src/modules/slack/use-cases/remove-slack-reaction.ts
@@ -1,6 +1,7 @@
+import { db } from '@oyster/db';
+
 import { type GetBullJobData } from '@/infrastructure/bull/bull.types';
 import { job } from '@/infrastructure/bull/use-cases/job';
-import { db } from '@/infrastructure/database';
 
 export async function removeSlackReaction({
   channelId,
diff --git a/packages/core/src/modules/slack/use-cases/rename-slack-channel.ts b/packages/core/src/modules/slack/use-cases/rename-slack-channel.ts
index f38918d8..5b43d1da 100644
--- a/packages/core/src/modules/slack/use-cases/rename-slack-channel.ts
+++ b/packages/core/src/modules/slack/use-cases/rename-slack-channel.ts
@@ -1,5 +1,6 @@
+import { db } from '@oyster/db';
+
 import { type GetBullJobData } from '@/infrastructure/bull/bull.types';
-import { db } from '@/infrastructure/database';
 
 export async function renameSlackChannel({
   id,
diff --git a/packages/core/src/modules/slack/use-cases/send-stackbot-mass-notification.ts b/packages/core/src/modules/slack/use-cases/send-stackbot-mass-notification.ts
index fa8241b1..c5af6710 100644
--- a/packages/core/src/modules/slack/use-cases/send-stackbot-mass-notification.ts
+++ b/packages/core/src/modules/slack/use-cases/send-stackbot-mass-notification.ts
@@ -1,5 +1,6 @@
+import { db } from '@oyster/db';
+
 import { job } from '@/infrastructure/bull/use-cases/job';
-import { db } from '@/infrastructure/database';
 
 export async function sendStackBotMassNotification(message: string) {
   const members = await db
diff --git a/packages/core/src/modules/slack/use-cases/unarchive-slack-channel.ts b/packages/core/src/modules/slack/use-cases/unarchive-slack-channel.ts
index acae5faa..4e6c8723 100644
--- a/packages/core/src/modules/slack/use-cases/unarchive-slack-channel.ts
+++ b/packages/core/src/modules/slack/use-cases/unarchive-slack-channel.ts
@@ -1,5 +1,6 @@
+import { db } from '@oyster/db';
+
 import { type GetBullJobData } from '@/infrastructure/bull/bull.types';
-import { db } from '@/infrastructure/database';
 
 export async function unarchiveSlackChannel({
   id,
diff --git a/packages/core/src/modules/slack/use-cases/update-birthdates-from-slack.ts b/packages/core/src/modules/slack/use-cases/update-birthdates-from-slack.ts
index 13aa856b..9541218d 100644
--- a/packages/core/src/modules/slack/use-cases/update-birthdates-from-slack.ts
+++ b/packages/core/src/modules/slack/use-cases/update-birthdates-from-slack.ts
@@ -1,4 +1,5 @@
-import { db } from '@/infrastructure/database';
+import { db } from '@oyster/db';
+
 import { slack } from '@/modules/slack/instances';
 import { RateLimiter } from '@/shared/utils/rate-limiter';
 
diff --git a/packages/core/src/modules/survey/use-cases/create-survey.ts b/packages/core/src/modules/survey/use-cases/create-survey.ts
index b708adf1..1900efcd 100644
--- a/packages/core/src/modules/survey/use-cases/create-survey.ts
+++ b/packages/core/src/modules/survey/use-cases/create-survey.ts
@@ -1,6 +1,6 @@
+import { db } from '@oyster/db';
 import { id } from '@oyster/utils';
 
-import { db } from '@/infrastructure/database';
 import { type CreateSurveyInput } from '../survey.types';
 
 export async function createSurvey({
diff --git a/packages/core/src/modules/survey/use-cases/import-survey-responses.ts b/packages/core/src/modules/survey/use-cases/import-survey-responses.ts
index 80ba991a..f0ac183d 100644
--- a/packages/core/src/modules/survey/use-cases/import-survey-responses.ts
+++ b/packages/core/src/modules/survey/use-cases/import-survey-responses.ts
@@ -1,10 +1,10 @@
 import { z } from 'zod';
 
+import { db } from '@oyster/db';
 import { Email } from '@oyster/types';
 import { id } from '@oyster/utils';
 
 import { job } from '@/infrastructure/bull/use-cases/job';
-import { db } from '@/infrastructure/database';
 import { getMemberByEmail } from '@/modules/member/queries/get-member-by-email';
 import { parseCsv } from '@/shared/utils/csv.utils';
 import { AddSurveyResponseInput, SurveyResponse } from '../survey.types';
diff --git a/packages/core/src/modules/swag-pack/use-cases/claim-swag-pack.ts b/packages/core/src/modules/swag-pack/use-cases/claim-swag-pack.ts
index 076bd65a..e11d36ae 100644
--- a/packages/core/src/modules/swag-pack/use-cases/claim-swag-pack.ts
+++ b/packages/core/src/modules/swag-pack/use-cases/claim-swag-pack.ts
@@ -1,4 +1,5 @@
-import { db } from '@/infrastructure/database';
+import { db } from '@oyster/db';
+
 import { orderSwagPack } from '../swag-pack.service';
 import { type ClaimSwagPackInput } from '../swag-pack.types';