refactor: use @oyster/db directly in core 🍎 (#425)

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';
 

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) -

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,

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'>;
 

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';
 
 /**

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';

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,

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';

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 {

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,

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';
 

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,

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';
 

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';
 

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'>;

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 = {

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'[];

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';
 

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';
 
 /**

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';
 

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';
 

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';
 
 /**

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({

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 = {

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,

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'>>;
 };

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

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

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;

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'>;

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;

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(

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;

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({

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 {

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'>,

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'>,

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) {

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';
 

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';