refactor: scrap infrastructure package 🗑️

apps/member-profile/app/routes/_profile.companies.tsx

@@ -19,7 +19,7 @@ import {
   ListCompaniesWhere,
 } from '@oyster/core/employment';
 import { listCompanies } from '@oyster/core/employment.server';
-import { track } from '@oyster/infrastructure/mixpanel';
+import { track } from '@oyster/core/mixpanel';
 import {
   cx,
   Dashboard,

apps/member-profile/app/routes/_profile.directory_.$id.tsx

@@ -4,7 +4,7 @@ import dayjs from 'dayjs';
 import React, { type PropsWithChildren } from 'react';
 import { BookOpen, Calendar, Globe, Home, Link, MapPin } from 'react-feather';
 
-import { type MixpanelEvent } from '@oyster/infrastructure/mixpanel';
+import { type MixpanelEvent } from '@oyster/core/mixpanel';
 import {
   cx,
   getButtonCn,

apps/member-profile/app/routes/_profile.home.tsx

@@ -15,12 +15,8 @@ import {
 } from 'react-feather';
 import { match } from 'ts-pattern';
 
+import { getIpAddress, setMixpanelProfile, track } from '@oyster/core/mixpanel';
 import { db } from '@oyster/db';
-import {
-  getIpAddress,
-  setMixpanelProfile,
-  track,
-} from '@oyster/infrastructure/mixpanel';
 import {
   type ActivationRequirement,
   StudentActiveStatus,

apps/member-profile/app/routes/_profile.points.tsx

@@ -16,8 +16,8 @@ import { Award, Plus } from 'react-feather';
 import { match } from 'ts-pattern';
 import { z } from 'zod';
 
+import { track } from '@oyster/core/mixpanel';
 import { db } from '@oyster/db';
-import { track } from '@oyster/infrastructure/mixpanel';
 import { type CompletedActivity } from '@oyster/types';
 import {
   Button,

apps/member-profile/app/routes/_profile.profile.general.tsx

@@ -10,7 +10,7 @@ import {
 } from '@remix-run/react';
 import { type z } from 'zod';
 
-import { track } from '@oyster/infrastructure/mixpanel';
+import { track } from '@oyster/core/mixpanel';
 import { Student } from '@oyster/types';
 import {
   Button,

apps/member-profile/app/routes/_profile.recap.$date.resources.tsx

@@ -2,9 +2,9 @@ import { json, type LoaderFunctionArgs } from '@remix-run/node';
 import { useLoaderData } from '@remix-run/react';
 import dayjs from 'dayjs';
 
+import { getPresignedURL } from '@oyster/core/object-storage';
 import { type ResourceType } from '@oyster/core/resources';
 import { listResources } from '@oyster/core/resources.server';
-import { getPresignedURL } from '@oyster/infrastructure/object-storage';
 
 import { getDateRange, Recap } from '@/routes/_profile.recap.$date';
 import { Resource } from '@/shared/components/resource';

apps/member-profile/app/routes/_profile.recap.$date.tsx

@@ -11,9 +11,9 @@ import dayjs from 'dayjs';
 import { type PropsWithChildren } from 'react';
 
 import { listCompanyReviews } from '@oyster/core/employment.server';
+import { track } from '@oyster/core/mixpanel';
 import { listResources } from '@oyster/core/resources.server';
 import { listSlackMessages } from '@oyster/core/slack.server';
-import { track } from '@oyster/infrastructure/mixpanel';
 import { Divider, Text } from '@oyster/ui';
 import { iife } from '@oyster/utils';
 

apps/member-profile/app/routes/_profile.resources.add.tsx

@@ -14,9 +14,9 @@ import {
   useSearchParams,
 } from '@remix-run/react';
 
+import { track } from '@oyster/core/mixpanel';
 import { AddResourceInput } from '@oyster/core/resources';
 import { addResource } from '@oyster/core/resources.server';
-import { track } from '@oyster/infrastructure/mixpanel';
 import {
   Button,
   Divider,

apps/member-profile/app/routes/_profile.resources.tsx

@@ -11,14 +11,14 @@ import dayjs from 'dayjs';
 import { Plus } from 'react-feather';
 
 import { isMemberAdmin } from '@oyster/core/admin.server';
+import { track } from '@oyster/core/mixpanel';
+import { getPresignedURL } from '@oyster/core/object-storage';
 import {
   ListResourcesOrderBy,
   ListResourcesWhere,
   type ResourceType,
 } from '@oyster/core/resources';
 import { listResources, listTags } from '@oyster/core/resources.server';
-import { track } from '@oyster/infrastructure/mixpanel';
-import { getPresignedURL } from '@oyster/infrastructure/object-storage';
 import {
   Dashboard,
   ExistingSearchParams,

apps/member-profile/app/routes/_public.login.oauth.tsx

@@ -1,7 +1,7 @@
 import { type LoaderFunctionArgs, redirect } from '@remix-run/node';
 import jwt from 'jsonwebtoken';
 
-import { track } from '@oyster/infrastructure/mixpanel';
+import { track } from '@oyster/core/mixpanel';
 import { toTitleCase } from '@oyster/utils';
 
 import { Route } from '@/shared/constants';

apps/member-profile/app/routes/_public.login.otp.verify.tsx

@@ -10,7 +10,7 @@ import {
   useLoaderData,
 } from '@remix-run/react';
 
-import { track } from '@oyster/infrastructure/mixpanel';
+import { track } from '@oyster/core/mixpanel';
 import { Button, Form, getErrors, validateForm } from '@oyster/ui';
 
 import { verifyOneTimeCode } from '@/member-profile.server';

apps/member-profile/app/routes/api.mixpanel.track.ts

@@ -1,6 +1,6 @@
 import { type ActionFunctionArgs, json } from '@remix-run/node';
 
-import { track } from '@oyster/infrastructure/mixpanel';
+import { track } from '@oyster/core/mixpanel';
 
 import { getSession, user } from '@/shared/session.server';
 

apps/member-profile/app/routes/api.resources.$id.upvote.ts

@@ -1,7 +1,7 @@
 import { type ActionFunctionArgs, json } from '@remix-run/node';
 
+import { track } from '@oyster/core/mixpanel';
 import { upvoteResource } from '@oyster/core/resources.server';
-import { track } from '@oyster/infrastructure/mixpanel';
 
 import { ensureUserAuthenticated, user } from '@/shared/session.server';
 

apps/member-profile/app/routes/api.resources.$id.view.ts

@@ -1,7 +1,7 @@
 import { type ActionFunctionArgs, json } from '@remix-run/node';
 
+import { track } from '@oyster/core/mixpanel';
 import { viewResource } from '@oyster/core/resources.server';
-import { track } from '@oyster/infrastructure/mixpanel';
 
 import { ensureUserAuthenticated, user } from '@/shared/session.server';
 

apps/member-profile/app/routes/api.tags.add.ts

@@ -1,8 +1,8 @@
 import { type ActionFunctionArgs, json } from '@remix-run/node';
 
+import { track } from '@oyster/core/mixpanel';
 import { CreateTagInput } from '@oyster/core/resources';
 import { createTag } from '@oyster/core/resources.server';
-import { track } from '@oyster/infrastructure/mixpanel';
 import { validateForm } from '@oyster/ui';
 
 import { ensureUserAuthenticated, user } from '@/shared/session.server';

apps/member-profile/app/shared/hooks/use-mixpanel-tracker.tsx

@@ -1,9 +1,6 @@
 import { useFetcher } from '@remix-run/react';
 
-import {
-  type MixpanelEvent,
-  type TrackInput,
-} from '@oyster/infrastructure/mixpanel';
+import { type MixpanelEvent, type TrackInput } from '@oyster/core/mixpanel';
 
 export function useMixpanelTracker() {
   const fetcher = useFetcher();

apps/member-profile/package.json

@@ -18,7 +18,6 @@
     "@aws-sdk/s3-request-presigner": "^3.577.0",
     "@oyster/core": "*",
     "@oyster/db": "*",
-    "@oyster/infrastructure": "*",
     "@oyster/types": "*",
     "@oyster/ui": "*",
     "@oyster/utils": "*",

packages/core/package.json

@@ -16,6 +16,8 @@
     "./admin.server": "./src/modules/admin/index.server.ts",
     "./employment": "./src/modules/employment/index.ts",
     "./employment.server": "./src/modules/employment/index.server.ts",
+    "./mixpanel": "./src/modules/mixpanel/index.ts",
+    "./object-storage": "./src/modules/object-storage/index.ts",
     "./resources": "./src/modules/resource/index.ts",
     "./resources.server": "./src/modules/resource/index.server.ts",
     "./resume-books": "./src/modules/resume-book/index.ts",
@@ -30,10 +32,11 @@
     "type-check": "tsc --noEmit"
   },
   "dependencies": {
+    "@aws-sdk/client-s3": "^3.576.0",
+    "@aws-sdk/s3-request-presigner": "^3.577.0",
     "@mailchimp/mailchimp_marketing": "^3.0.78",
     "@oyster/db": "*",
     "@oyster/email-templates": "*",
-    "@oyster/infrastructure": "*",
     "@oyster/types": "*",
     "@oyster/utils": "*",
     "@react-email/render": "^0.0.6",
@@ -43,10 +46,13 @@
     "dedent": "^0.7.0",
     "googleapis": "^126.0.1",
     "ioredis": "^5.3.2",
+    "is-ip": "^5.0.1",
     "jsonwebtoken": "^9.0.2",
+    "mixpanel": "^0.18.0",
     "nanoid": "^3.0.0",
     "nodemailer": "^6.9.13",
     "postmark": "^3.0.15",
+    "ua-parser-js": "^1.0.36",
     "zod": "^3.20.2"
   },
   "devDependencies": {

packages/core/src/modules/notification/use-cases/send-email.ts

@@ -13,8 +13,8 @@ import {
   StudentAttendedOnboardingEmail,
   StudentRemovedEmail,
 } from '@oyster/email-templates';
-import { getObject } from '@oyster/infrastructure/object-storage';
 
+import { getObject } from '@/modules/object-storage';
 import { ENVIRONMENT } from '@/shared/env';
 import {
   getNodemailerTransporter,

packages/core/src/modules/resource/use-cases/add-resource.ts

@@ -1,8 +1,8 @@
 import { db } from '@oyster/db';
-import { putObject } from '@oyster/infrastructure/object-storage';
 import { id } from '@oyster/utils';
 
 import { job } from '@/infrastructure/bull/use-cases/job';
+import { putObject } from '@/modules/object-storage';
 import { type AddResourceInput } from '@/modules/resource/resource.types';
 
 export async function addResource(input: AddResourceInput) {

packages/core/src/modules/resume-book/use-cases/submit-resume.ts

@@ -2,17 +2,14 @@ import dayjs from 'dayjs';
 import { match } from 'ts-pattern';
 
 import { db, point } from '@oyster/db';
-import {
-  getPresignedURL,
-  putObject,
-} from '@oyster/infrastructure/object-storage';
 import { FORMATTED_RACE } from '@oyster/types';
 import { iife } from '@oyster/utils';
 
 import { job } from '@/infrastructure/bull/use-cases/job';
 import { createAirtableRecord } from '@/modules/airtable/use-cases/create-airtable-record';
 import { updateAirtableRecord } from '@/modules/airtable/use-cases/update-airtable-record';
 import { type DegreeType } from '@/modules/education/education.types';
+import { getPresignedURL, putObject } from '@/modules/object-storage';
 import { getResumeBookSubmission } from '@/modules/resume-book/queries/get-resume-book-submission';
 import { type SubmitResumeInput } from '@/modules/resume-book/resume-book.types';