Move shared imports to deps.ts

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

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

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

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

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<OptionalId<UserInDB>>('users');
 

src/services/event.service.ts

@@ -4,16 +4,16 @@
 // updateEvent
 // deleteEvent
 
-import { ObjectId } from '../../deps.ts';
-import { db } from '../database/connect.ts';
 import {
   CompleteEventType,
   Event,
   EventFilter,
   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<FullEvent>('events');

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

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<OptionalId<UserInDB>>('users');
 const events = db.collection<FullEvent>('events');

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

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[] = [

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

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,