From 66aaa0c8b32327b614d049431ad8568ba9dab3c6 Mon Sep 17 00:00:00 2001 From: 42 <33488710+FortyTwoFortyTwo@users.noreply.github.com> Date: Mon, 16 Jun 2025 10:54:41 +0100 Subject: [PATCH] Move shared imports to deps.ts --- .gitmodules | 3 --- deps.ts | 30 +++++++++++++++++++++++++ src/controllers/auth.controller.ts | 6 +++-- src/controllers/event.controller.ts | 11 +++++---- src/controllers/user.controller.ts | 3 +-- src/services/auth.service.ts | 7 +++--- src/services/event.service.ts | 6 ++--- src/services/openai.service.ts | 5 +++-- src/services/user.service.ts | 12 ++++++---- src/utils/event.utils.ts | 6 +---- testing/dummyData/event.samples.ts | 2 +- testing/dummyData/realData.samples.ts | 2 +- testing/testScripts/event.utils.test.ts | 5 +---- 13 files changed, 64 insertions(+), 34 deletions(-) delete mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index f8cb7de..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "shared"] - path = shared - url = https://github.com/fac-31/Pro0428-LocalEventShared diff --git a/deps.ts b/deps.ts index bfb4442..74ec303 100644 --- a/deps.ts +++ b/deps.ts @@ -34,3 +34,33 @@ export { compareSync, hashSync, } from 'https://deno.land/x/bcrypt@v0.2.4/mod.ts'; + +// Shared + +export { + toSafeUser, + UserLogInSchema, + UserSignUpSchema, +} from 'https://raw.githubusercontent.com/fac-31/Pro0428-LocalEventShared/main/src/models/user.model.ts'; + +export type { + NewUser, + UserInDB, + UserLogInInput, + UserSignUpInput, +} from 'https://raw.githubusercontent.com/fac-31/Pro0428-LocalEventShared/main/src/models/user.model.ts'; + +export { + eventFilterSchema, + eventsArraySchema, + eventSchema, +} from 'https://raw.githubusercontent.com/fac-31/Pro0428-LocalEventShared/main/src/models/event.model.ts'; + +export type { + CompleteEventType, + Event, + EventFilter, + EventMode, + FrequencyObject, + FullEvent, +} from 'https://raw.githubusercontent.com/fac-31/Pro0428-LocalEventShared/main/src/models/event.model.ts'; diff --git a/src/controllers/auth.controller.ts b/src/controllers/auth.controller.ts index 92ed325..53817e2 100644 --- a/src/controllers/auth.controller.ts +++ b/src/controllers/auth.controller.ts @@ -1,9 +1,11 @@ // deno-lint-ignore-file require-await -import { Context, RouterContext, Status } from '../../deps.ts'; import { + Context, + RouterContext, + Status, UserLogInSchema, UserSignUpSchema, -} from 'https://raw.githubusercontent.com/fac-31/Pro0428-LocalEventShared/main/src/models/user.model.ts'; +} from '../../deps.ts'; import { authService } from '../services/auth.service.ts'; export const getCurrentUser = async (ctx: Context) => { diff --git a/src/controllers/event.controller.ts b/src/controllers/event.controller.ts index f4c799d..9d8deaf 100644 --- a/src/controllers/event.controller.ts +++ b/src/controllers/event.controller.ts @@ -1,10 +1,13 @@ -import { Context, ObjectId, RouterContext, Status } from '../../deps.ts'; -import { eventService } from '../services/event.service.ts'; -//import { generateEvents } from '../services/openai.service.ts'; import { + Context, eventFilterSchema, FullEvent, -} from 'https://raw.githubusercontent.com/fac-31/Pro0428-LocalEventShared/main/src/models/event.model.ts'; + ObjectId, + RouterContext, + Status, +} from '../../deps.ts'; +import { eventService } from '../services/event.service.ts'; +//import { generateEvents } from '../services/openai.service.ts'; import { verifyToken } from '../utils/token.utils.ts'; import { Payload } from '../../deps.ts'; import { userService } from '../services/user.service.ts'; diff --git a/src/controllers/user.controller.ts b/src/controllers/user.controller.ts index 242874d..a1248c4 100644 --- a/src/controllers/user.controller.ts +++ b/src/controllers/user.controller.ts @@ -1,8 +1,7 @@ // deno-lint-ignore-file require-await -import { Context, Payload, RouterContext } from '../../deps.ts'; +import { Context, Payload, RouterContext, toSafeUser } from '../../deps.ts'; import { userService } from '../services/user.service.ts'; import { Status } from '../../deps.ts'; -import { toSafeUser } from 'https://raw.githubusercontent.com/fac-31/Pro0428-LocalEventShared/main/src/models/user.model.ts'; export const getUserProfile = async (ctx: Context) => { // TODO: Get user data from ctx.state.user ctx.response.body = { message: 'Get user profile' }; diff --git a/src/services/auth.service.ts b/src/services/auth.service.ts index 3b505dc..9e1936e 100644 --- a/src/services/auth.service.ts +++ b/src/services/auth.service.ts @@ -1,14 +1,15 @@ import { db } from '../database/connect.ts'; import { + compareSync, + hashSync, NewUser, + OptionalId, toSafeUser, UserInDB, UserLogInInput, UserSignUpInput, -} from 'https://raw.githubusercontent.com/fac-31/Pro0428-LocalEventShared/main/src/models/user.model.ts'; -import { compareSync, hashSync } from '../../deps.ts'; +} from '../../deps.ts'; import { generateToken } from '../utils/token.utils.ts'; -import type { OptionalId } from '../../deps.ts'; const users = db.collection>('users'); diff --git a/src/services/event.service.ts b/src/services/event.service.ts index 8c054f5..c3b9e96 100644 --- a/src/services/event.service.ts +++ b/src/services/event.service.ts @@ -4,8 +4,6 @@ // updateEvent // deleteEvent -import { ObjectId } from '../../deps.ts'; -import { db } from '../database/connect.ts'; import { CompleteEventType, Event, @@ -13,7 +11,9 @@ import { eventsArraySchema, eventSchema, FullEvent, -} from 'https://raw.githubusercontent.com/fac-31/Pro0428-LocalEventShared/main/src/models/event.model.ts'; + ObjectId, +} from '../../deps.ts'; +import { db } from '../database/connect.ts'; import { normaliseEvents } from '../utils/event.utils.ts'; const events = db.collection('events'); diff --git a/src/services/openai.service.ts b/src/services/openai.service.ts index 1372286..1439403 100644 --- a/src/services/openai.service.ts +++ b/src/services/openai.service.ts @@ -4,8 +4,9 @@ import { CompleteEventType, EventMode, eventsArraySchema, -} from 'https://raw.githubusercontent.com/fac-31/Pro0428-LocalEventShared/main/src/models/event.model.ts'; -import { OpenAI, zodTextFormat } from '../../deps.ts'; + OpenAI, + zodTextFormat, +} from '../../deps.ts'; import 'https://deno.land/std@0.224.0/dotenv/load.ts'; const AI_Key: string | undefined = Deno.env.get('AI_KEY'); diff --git a/src/services/user.service.ts b/src/services/user.service.ts index 7dfdb93..bbf457b 100644 --- a/src/services/user.service.ts +++ b/src/services/user.service.ts @@ -5,10 +5,14 @@ import 'https://deno.land/std@0.224.0/dotenv/load.ts'; import { db } from '../database/connect.ts'; -import { UserInDB } from 'https://raw.githubusercontent.com/fac-31/Pro0428-LocalEventShared/main/src/models/user.model.ts'; -import { hashSync, ObjectId, OptionalId } from '../../deps.ts'; -import { NewUser } from 'https://raw.githubusercontent.com/fac-31/Pro0428-LocalEventShared/main/src/models/user.model.ts'; -import { FullEvent } from 'https://raw.githubusercontent.com/fac-31/Pro0428-LocalEventShared/main/src/models/event.model.ts'; +import { + FullEvent, + hashSync, + NewUser, + ObjectId, + OptionalId, + UserInDB, +} from '../../deps.ts'; const users = db.collection>('users'); const events = db.collection('events'); diff --git a/src/utils/event.utils.ts b/src/utils/event.utils.ts index 34ba3ac..4a36432 100644 --- a/src/utils/event.utils.ts +++ b/src/utils/event.utils.ts @@ -1,8 +1,4 @@ -import { - Event, - FrequencyObject, - FullEvent, -} from 'https://raw.githubusercontent.com/fac-31/Pro0428-LocalEventShared/main/src/models/event.model.ts'; +import { Event, FrequencyObject, FullEvent } from '../../deps.ts'; // Initial cleaning of titles export const normalizeEventTitle = (event: Event): string => { diff --git a/testing/dummyData/event.samples.ts b/testing/dummyData/event.samples.ts index ef8dc9f..38c3ceb 100644 --- a/testing/dummyData/event.samples.ts +++ b/testing/dummyData/event.samples.ts @@ -1,4 +1,4 @@ -import { Event } from 'https://raw.githubusercontent.com/fac-31/Pro0428-LocalEventShared/main/src/models/event.model.ts'; +import { Event } from '../../deps.ts'; // Test event examples export const testEvents: Event[] = [ diff --git a/testing/dummyData/realData.samples.ts b/testing/dummyData/realData.samples.ts index f4afb54..b96c3e4 100644 --- a/testing/dummyData/realData.samples.ts +++ b/testing/dummyData/realData.samples.ts @@ -1,4 +1,4 @@ -import { Event } from 'https://raw.githubusercontent.com/fac-31/Pro0428-LocalEventShared/main/src/models/event.model.ts'; +import { Event } from '../../deps.ts'; export const realData: Array = [ { diff --git a/testing/testScripts/event.utils.test.ts b/testing/testScripts/event.utils.test.ts index fa50db6..8dd5008 100644 --- a/testing/testScripts/event.utils.test.ts +++ b/testing/testScripts/event.utils.test.ts @@ -1,7 +1,4 @@ -import { - FrequencyObject, - FullEvent, -} from 'https://raw.githubusercontent.com/fac-31/Pro0428-LocalEventShared/main/src/models/event.model.ts'; +import { FrequencyObject, FullEvent } from '../../deps.ts'; import { realData } from '../dummyData/realData.samples.ts'; import { addNormalizedProperties,