resolve github actions failure

andrew-bierman · Dec 29, 2024 · a54f429 · a54f429
1 parent 117e3f4
commit a54f429
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 18 deletions.
diff --git a/server/src/services/packTemplate/addPackTemplateService.ts b/server/src/services/packTemplate/addPackTemplateService.ts
@@ -23,7 +23,7 @@ export const addPackTemplateService = async (
     type: '',
     itemPackTemplates: [],
     itemsOwnerId: '',
-  } as validator.AddPackTemplateType,
+  } as const,
   executionCtx: ExecutionContext,
 ): Promise<PackTemplate> => {
   const { name, description, type } = packTemplateData;

diff --git a/server/src/swaggerOptions.ts b/server/src/swaggerOptions.ts
@@ -1,9 +1,7 @@
-// @ts-nocheck
-
-import TripSchema from './models/tripModel';
-import PackSchema from './models/packModel';
-import ItemSchema from './models/itemModel';
-import UserSchema from './models/userModel';
+import { trip } from './db/schema';
+import { pack } from './db/schema';
+import { item } from './db/schema';
+import { user } from './db/schema';
 
 import m2s from 'mongoose-to-swagger';
 import swaggerJsdoc from 'swagger-jsdoc';
@@ -49,10 +47,10 @@ const specs: any = swaggerJsdoc(options);
 // Add the schemas generated by mongoose-to-swagger to the components.schemas property of the specs object
 specs.components = {
   schemas: {
-    User: m2s(UserSchema),
-    Trip: m2s(TripSchema),
-    Pack: m2s(PackSchema),
-    Item: m2s(ItemSchema),
+    User: m2s(user),
+    Trip: m2s(trip),
+    Pack: m2s(pack),
+    Item: m2s(item),
   },
 };
 

diff --git a/server/src/tests/routes/favorite.spec.ts b/server/src/tests/routes/favorite.spec.ts
@@ -15,7 +15,10 @@ describe('Favorite routes', () => {
   let pack: Pack;
 
   beforeAll(async () => {
-    const executionCtx = {} as ExecutionContext;
+    const executionCtx: ExecutionContext = {
+      waitUntil: () => {},
+      passThroughOnException: () => {},
+    };
     caller = await setupTest(env, executionCtx);
     user = (await userClass.create({
       email: '[email protected]',

diff --git a/server/src/tests/routes/item.spec.ts b/server/src/tests/routes/item.spec.ts
@@ -42,7 +42,10 @@ describe('Item routes', () => {
   let owner: User;
 
   beforeAll(async () => {
-    const executionCtx = {} as ExecutionContext;
+    const executionCtx: ExecutionContext = {
+      waitUntil: () => {},
+      passThroughOnException: () => {},
+    };
     caller = await setupTest(env, executionCtx);
     pack = await packClass.create({
       name: 'test',

diff --git a/server/src/tests/routes/osm.spec.ts b/server/src/tests/routes/osm.spec.ts
@@ -18,7 +18,10 @@ describe('OSM routes', () => {
   const nodeClass = new NodeClass();
 
   beforeAll(async () => {
-    const executionCtx = {} as ExecutionContext;
+    const executionCtx: ExecutionContext = {
+      waitUntil: () => {},
+      passThroughOnException: () => {},
+    };
     caller = await setupTest(env, executionCtx);
   });
 

diff --git a/server/src/tests/routes/pack.spec.ts b/server/src/tests/routes/pack.spec.ts
@@ -40,7 +40,10 @@ describe('Pack routes', () => {
   let owner: User;
 
   beforeAll(async () => {
-    executionCtx = {} as ExecutionContext;
+    const executionCtx: ExecutionContext = {
+      waitUntil: () => {},
+      passThroughOnException: () => {},
+    };
     caller = await setupTest(env, executionCtx);
     owner = (await userClass.create({
       email: '[email protected]',

diff --git a/server/src/tests/routes/packTemplate.spec.ts b/server/src/tests/routes/packTemplate.spec.ts
@@ -44,7 +44,10 @@ describe('Pack template routes', () => {
   let packTemplateItems: Item[];
 
   beforeAll(async () => {
-    const executionCtx = {} as ExecutionContext;
+    const executionCtx: ExecutionContext = {
+      waitUntil: () => {},
+      passThroughOnException: () => {},
+    };
     caller = await setupTest(env, executionCtx);
 
     vi.resetModules();

diff --git a/server/src/tests/routes/template.spec.ts b/server/src/tests/routes/template.spec.ts
@@ -14,7 +14,10 @@ describe('Template Routes', () => {
   let createdTemplate: Template;
 
   beforeAll(async () => {
-    const executionCtx = {} as ExecutionContext;
+    const executionCtx: ExecutionContext = {
+      waitUntil: () => {},
+      passThroughOnException: () => {},
+    };
     caller = await setupTest(env, executionCtx);
   });
 

diff --git a/server/src/tests/routes/trip.spec.ts b/server/src/tests/routes/trip.spec.ts
@@ -17,7 +17,10 @@ describe('Trip Routes', () => {
   let owner: User;
 
   beforeAll(async () => {
-    const executionCtx = {} as ExecutionContext;
+    const executionCtx: ExecutionContext = {
+      waitUntil: () => {},
+      passThroughOnException: () => {},
+    };
     caller = await setupTest(env, executionCtx);
     owner = (await userClass.create({
       email: '[email protected]',