Fix invalid buck retrieve from new bucket upload(scrapyd) notificatio…

…n endpoint.

packages/validations/src/validations/itemRoutesValidator.ts

@@ -95,6 +95,13 @@ export const getSimilarItems = z.object({
   limit: z.number(),
 });
 
+export const importNotifiedETL = z.object({
+  bucket_name: z.string(),
+  file_key: z.string(),
+  spider_name: z.string(),
+});
+export type ImportNotifiedETL = z.infer<typeof importNotifiedETL>;
+
 export const importItemHeaders = z.object({
   Name: z.string(),
   Weight: z.string(),

server/src/controllers/item/importItems.ts

@@ -21,7 +21,7 @@ export const importItems = async (c) => {
           const parsedHeaders = results.meta.fields ?? [];
           try {
             const allHeadersPresent = expectedHeaders.every((header) =>
-              (parsedHeaders as string[]).includes(header),
+              parsedHeaders.includes(header),
             );
             if (!allHeadersPresent) {
               return reject(

server/src/controllers/item/importItemsGlobal.ts

@@ -27,7 +27,7 @@ export const importItemsGlobal = async (c: Context) => {
           const parsedHeaders = results.meta.fields ?? [];
           try {
             const allHeadersPresent = expectedHeaders.every((header) =>
-              (parsedHeaders as string[]).includes(header),
+              parsedHeaders.includes(header),
             );
             if (!allHeadersPresent) {
               return reject(
@@ -163,7 +163,7 @@ export function importItemsGlobalRoute() {
             const parsedHeaders = results.meta.fields ?? [];
             try {
               const allHeadersPresent = expectedHeaders.every((header) =>
-                (parsedHeaders as string[]).includes(header),
+                parsedHeaders.includes(header),
               );
               if (!allHeadersPresent) {
                 return reject(

server/src/controllers/item/importNotifiedETL.ts

@@ -1,13 +1,17 @@
+import * as validator from '@packrat/validations';
 import {
   bulkAddItemsGlobalService,
   parseCSVData,
   fetchFromS3,
 } from '../../services/item/item.service';
 import { User } from '../../drizzle/methods/User';
+import { Context } from 'hono';
 
-export const importNotifiedETL = async (c) => {
-  const params = c.req.query();
-  const file_name = params.file_key;
+export const importNotifiedETL = async (c: Context) => {
+  const body = await c.req.json<validator.ImportNotifiedETL>();
+  const file_name = body.file_key;
+  const bucket_name = body.bucket_name;
+  const spider_name = body.spider_name;
 
   const endpoint = c.env.BUCKET_ENDPOINT;
   const bucket = c.env.BUCKET_NAME;
@@ -34,7 +38,7 @@ export const importNotifiedETL = async (c) => {
 
   try {
     const fileData = await fetchFromS3(
-      `${endpoint}/${bucket}/${file_name}`,
+      `${endpoint}/${bucket_name}/${file_name}`,
       method,
       service,
       region,

server/src/controllers/packTemplates/getPackTemplate.ts

@@ -6,9 +6,7 @@ export function getPackTemplateRoute() {
   return protectedProcedure
     .input(validator.getPackTemplate)
     .query(async ({ input }) => {
-      const param = input.id
-        ? { id: input.id }
-        : { name: input.name as string };
+      const param = input.id ? { id: input.id } : { name: input.name };
       return await getPackTemplateService(param);
     });
 }

server/src/controllers/passport/signInGoogle.ts

@@ -52,11 +52,11 @@ export const signInGoogle = async (c: Context) => {
         username,
       });
 
-      await userClass.generateAuthToken(c.env.JWT_SECRET, user!.id);
+      await userClass.generateAuthToken(c.env.JWT_SECRET, user.id);
 
       sendWelcomeEmail(
-        user!.email,
-        user!.name,
+        user.email,
+        user.name,
         c.env.STMP_EMAIL,
         c.env.SEND_GRID_API_KEY,
       );
@@ -68,7 +68,7 @@ export const signInGoogle = async (c: Context) => {
 
       await userClass.generateAuthToken(
         c.env.JWT_SECRET,
-        alreadyGoogleSignin!.id,
+        alreadyGoogleSignin.id,
       );
 
       if (!alreadyGoogleSignin.googleId) {
@@ -140,11 +140,11 @@ export function googleSigninRoute() {
             username,
           });
 
-          await userClass.generateAuthToken(env.JWT_SECRET, user!.id);
+          await userClass.generateAuthToken(env.JWT_SECRET, user.id);
 
           sendWelcomeEmail(
-            user!.email,
-            user!.name,
+            user.email,
+            user.name,
             env.STMP_EMAIL,
             env.SEND_GRID_API_KEY,
           );
@@ -157,7 +157,7 @@ export function googleSigninRoute() {
 
           await userClass.generateAuthToken(
             env.JWT_SECRET,
-            alreadyGoogleSignin!.id,
+            alreadyGoogleSignin.id,
           );
 
           if (!alreadyGoogleSignin.googleId) {

server/src/drizzle/methods/ItemPacks.ts

@@ -14,7 +14,7 @@ export class ItemPacks {
         .values(itemPack)
         .returning()
         .get();
-      await this.updateScoreIfNeeded(itemPack.packId as string);
+      await this.updateScoreIfNeeded(itemPack.packId);
 
       return record;
     } catch (error) {

server/src/drizzle/methods/User.ts

@@ -77,7 +77,7 @@ export class User {
     return DbClient.instance
       .update(UserTable)
       .set({ ...user, username })
-      .where(eq(UserTable.id, user.id!))
+      .where(eq(UserTable.id, user.id))
       .returning()
       .get();
   }

server/src/modules/feed/model/feed.ts

@@ -99,14 +99,14 @@ export class Feed {
         // Cast or conditionally apply .having() only if we have valid conditions
         const havingConditions = this.generateHavingConditions(modifiers, pack);
         if (havingConditions) {
-          packsQuery = (packsQuery as any).having(havingConditions as any);
+          packsQuery = packsQuery.having(havingConditions as any);
         }
       }
 
       if (modifiers) {
         const whereConditions = this.generateWhereConditions(modifiers, pack);
         if (whereConditions) {
-          packsQuery = (packsQuery as any).where(whereConditions as any);
+          packsQuery = packsQuery.where(whereConditions as any);
         }
       }
 
@@ -154,7 +154,7 @@ export class Feed {
 
       let feedQuery: any = null;
       if (packsQuery && tripsQuery) {
-        feedQuery = (packsQuery as any).union(tripsQuery as any);
+        feedQuery = packsQuery.union(tripsQuery);
       } else if (packsQuery) {
         feedQuery = packsQuery;
       } else if (tripsQuery) {
@@ -256,7 +256,7 @@ export class Feed {
     modifiers: Modifiers,
     table: typeof trip | typeof pack,
   ) {
-    const conditions: SQL<unknown>[] = [];
+    const conditions: Array<SQL<unknown>> = [];
 
     if (modifiers?.isPublic !== undefined) {
       conditions.push(eq(table.is_public, modifiers.isPublic));
@@ -277,7 +277,7 @@ export class Feed {
     modifiers: Modifiers,
     table: typeof trip | typeof pack,
   ) {
-    const conditions: SQL<unknown>[] = [];
+    const conditions: Array<SQL<unknown>> = [];
 
     if (modifiers?.ownerId && modifiers.includeUserFavoritesOnly) {
       conditions.push(

server/src/routes/geojsonRoutes.ts

@@ -15,7 +15,7 @@ router.get(
 
       const object = await GeojsonStorageService.retrieve(
         params.resource as ResourceType,
-        params.resourceId as string,
+        params.resourceId,
       );
 
       if (!object) {

server/src/routes/itemRoutes.ts

@@ -46,10 +46,9 @@ router.get(
   tryCatchWrapper(importFromBucket),
 );
 
-router.get(
+router.post(
   '/importNotifiedETL',
-  // authTokenMiddleware,
-  // zodParser(validator.importNotifiedETL, 'query'),
+  zodParser(validator.importNotifiedETL, 'body'),
   tryCatchWrapper(importNotifiedETL),
 );
 

server/src/services/trip/getTripByIdService.ts

@@ -4,11 +4,11 @@ interface TripResult {
   id: string;
   name: string;
   packs?: {
-    itemPacks?: { item: any }[];
+    itemPacks?: Array<{ item: any }>;
   };
-  tripGeojsons?: {
+  tripGeojsons?: Array<{
     geojson?: { geoJSON?: string };
-  }[];
+  }>;
 }
 
 /**

server/src/tests/routes/favorite.spec.ts

@@ -20,12 +20,12 @@ describe('Favorite routes', () => {
       passThroughOnException: () => {},
     };
     caller = await setupTest(env, executionCtx);
-    user = (await userClass.create({
+    user = await userClass.create({
       email: '[email protected]',
       name: 'test',
       username: 'test',
       password: 'test123',
-    })) as User;
+    });
   });
 
   beforeEach(async () => {

server/src/tests/routes/item.spec.ts

@@ -51,12 +51,12 @@ describe('Item routes', () => {
       name: 'test',
       type: 'test',
     });
-    owner = (await userClass.create({
+    owner = await userClass.create({
       email: '[email protected]',
       name: 'test',
       username: 'test',
       password: 'test123',
-    })) as User;
+    });
 
     // clear modules cache to ensure that dependents use the latest mock modules
     // this prevents unusual assertion failures during reruns in watch mode

server/src/tests/routes/pack.spec.ts

@@ -45,12 +45,12 @@ describe('Pack routes', () => {
       passThroughOnException: () => {},
     };
     caller = await setupTest(env, executionCtx);
-    owner = (await userClass.create({
+    owner = await userClass.create({
       email: '[email protected]',
       name: 'test',
       username: 'test',
       password: 'test123',
-    })) as User;
+    });
 
     // clear modules cache to ensure that dependents use the latest mock modules
     // this prevents unusual assertion failures during reruns in watch mode

server/src/tests/routes/template.spec.ts

@@ -31,12 +31,12 @@ describe('Template Routes', () => {
 
   describe('addTemplate', () => {
     it('should create a template', async () => {
-      const user = (await userClass.create({
+      const user = await userClass.create({
         email: '[email protected]',
         name: 'test',
         username: 'test',
         password: 'test123',
-      })) as User;
+      });
       const result = await caller.addTemplate({
         type: 'pack',
         createdBy: user.id,

server/src/tests/routes/trip.spec.ts

@@ -22,12 +22,12 @@ describe('Trip Routes', () => {
       passThroughOnException: () => {},
     };
     caller = await setupTest(env, executionCtx);
-    owner = (await userClass.create({
+    owner = await userClass.create({
       email: '[email protected]',
       name: 'test',
       username: 'test',
       password: 'test123',
-    })) as User;
+    });
     const pack = await packClass.create({
       name: 'test',
       owner_id: owner.id,

server/src/trpc/utils/auth.ts

@@ -43,9 +43,9 @@ const findUser = async (
   let user: User | null = null;
   try {
     const decoded = await jwt.verify(token, jwtSecret);
-    user = (await userRepository.findUser({
+    user = await userRepository.findUser({
       userId: decoded.id as string,
-    })) as User;
+    });
   } catch {
     // pass
   }

server/src/vector/client.ts

@@ -219,10 +219,10 @@ class VectorClient {
       namespace: string;
       metadata: Metadata;
     }>(contentList, (embedding, index) => ({
-      id: records[index]!.id,
+      id: records[index].id,
       values: embedding,
-      namespace: records[index]!.namespace,
-      metadata: records[index]!.metadata,
+      namespace: records[index].namespace,
+      metadata: records[index].metadata,
     }));
 
     await this.upsert(values);