Merge pull request #3 from codebuilderinc/fix/job-fetching-and-pagination

Author: digitalnomad91

src/common/pagination/pagination.args.ts

@@ -1,8 +1,10 @@
 import { ArgsType } from '@nestjs/graphql';
+import { Type } from 'class-transformer';
 import { Field } from '../decorators/field.decorator';
 
 @ArgsType()
 export class PaginationArgs {
+  @Type(() => Number)
   @Field({
     name: 'skip',
     description: 'Number of records to skip (offset based pagination).',
@@ -36,6 +38,7 @@ export class PaginationArgs {
   })
   before?: string;
 
+  @Type(() => Number)
   @Field({
     name: 'first',
     description: 'Max number of items to return going forward from the cursor.',
@@ -47,6 +50,7 @@ export class PaginationArgs {
   })
   first?: number;
 
+  @Type(() => Number)
   @Field({
     name: 'last',
     description: 'Max number of items to return going backward from the cursor.',

src/events/events.gateway.ts

@@ -32,26 +32,22 @@ export class EventsGateway implements OnGatewayConnection, OnGatewayDisconnect {
   server: Server;
 
   private getClientQuery(client: Socket): Record<string, unknown> {
-    console.log('wtf121212');
     return client.handshake.query;
   }
 
   public broadcastAll(event_name: string, message: Record<string, unknown>) {
-    console.log('assdasda');
     this.server.emit(event_name, message);
   }
 
   public handleConnection(client: Socket) {
-    console.log('whaaaat');
     const { user_id } = this.getClientQuery(client);
-
+    
     console.log('WssGateway: handleConnection', { user_id });
 
     return this.broadcastAll('event', { connected: user_id });
   }
 
   public handleDisconnect(client: Socket) {
-    console.log('hwathwat');
     const { user_id } = this.getClientQuery(client);
 
     console.log('WssGateway: handleDisconnect', { user_id });
@@ -61,21 +57,17 @@ export class EventsGateway implements OnGatewayConnection, OnGatewayDisconnect {
 
   @SubscribeMessage('tick')
   handleEvent(@MessageBody() data: unknown, @ConnectedSocket() client: Socket): WsResponse<unknown> {
-    console.log('wtf111');
     const event = 'events';
     return { event, data };
   }
 
   @SubscribeMessage('tick')
   findAll(@MessageBody() data: any): Observable<WsResponse<number>> {
-    console.log('wtf222");');
     return from([1, 2, 3]).pipe(map((item) => ({ event: 'events', data: item })));
   }
 
   @SubscribeMessage('identity')
   identity(@MessageBody() data: number): number {
-    console.log('wtf23232');
-
     return data;
   }
 }

src/jobs/job.controller.ts

@@ -101,18 +101,8 @@ export class JobController {
   async findByCompany(
     @Param('companyId', ParseIntPipe) companyId: number,
     @Query() paginationArgs: PaginationArgs,
-    @Query() orderBy: JobOrderByDto,
-    @Query('skip') skipParam?: string,
-    @Query('first') firstParam?: string
+    @Query() orderBy: JobOrderByDto
   ) {
-    // Ensure pagination parameters are properly converted to numbers
-    if (skipParam) {
-      paginationArgs.skip = parseInt(skipParam, 10);
-    }
-    if (firstParam) {
-      paginationArgs.first = parseInt(firstParam, 10);
-    }
-
     return this.jobService.findByCompany(companyId, paginationArgs, orderBy);
   }
 
@@ -132,18 +122,8 @@ export class JobController {
   async findByTag(
     @Param('tagName') tagName: string,
     @Query() paginationArgs: PaginationArgs,
-    @Query() orderBy: JobOrderByDto,
-    @Query('skip') skipParam?: string,
-    @Query('first') firstParam?: string
+    @Query() orderBy: JobOrderByDto
   ) {
-    // Ensure pagination parameters are properly converted to numbers
-    if (skipParam) {
-      paginationArgs.skip = parseInt(skipParam, 10);
-    }
-    if (firstParam) {
-      paginationArgs.first = parseInt(firstParam, 10);
-    }
-
     return this.jobService.findByTag(tagName, paginationArgs, orderBy);
   }
 
@@ -187,18 +167,8 @@ export class JobController {
     @Query('companyId', new ParseIntPipe({ optional: true })) companyId?: number,
     @Query('location') location?: string,
     @Query('isRemote') isRemote?: boolean,
-    @Query('tags') tags?: string,
-    @Query('skip') skipParam?: string,
-    @Query('first') firstParam?: string
+    @Query('tags') tags?: string
   ) {
-    // Ensure pagination parameters are properly converted to numbers
-    if (skipParam) {
-      paginationArgs.skip = parseInt(skipParam, 10);
-    }
-    if (firstParam) {
-      paginationArgs.first = parseInt(firstParam, 10);
-    }
-
     console.log('Pagination params:', { skip: paginationArgs.skip, first: paginationArgs.first });
 
     return this.jobService.findAll({

src/jobs/reddit.service.ts

@@ -72,12 +72,11 @@ export class RedditService {
             data: post,
           },
         };
-        // EARLY STOP: if this job already exists we assume all subsequent
-        // posts are older (API returns newest first) and can stop processing.
+        // Check if job already exists - if so, skip it but continue processing others
         const exists = await this.jobService.jobExists(post.url);
         if (exists) {
-          this.logger.log(`Encountered existing Reddit job ${post.url}; stopping further processing.`);
-          break;
+          this.logger.log(`Skipping existing Reddit job ${post.url}`);
+          continue;
         }
         const upsertedJob = await this.jobService.upsertJob(jobInput);
         // Send notifications for new jobs

src/jobs/web3career.service.ts

@@ -52,11 +52,11 @@ export class Web3CareerService {
             data: job,
           },
         };
-        // EARLY STOP: if job already exists assume remaining are older.
+        // Check if job already exists - if so, skip it but continue processing others
         const exists = await this.jobService.jobExists(job.apply_url);
         if (exists) {
-          this.logger.log(`Encountered existing Web3Career job ${job.apply_url}; stopping further processing.`);
-          break;
+          this.logger.log(`Skipping existing Web3Career job ${job.apply_url}`);
+          continue;
         }
         const upserted = await this.jobService.upsertJob(jobInput);
         newJobs.push(upserted);

src/users/user.controller.ts

@@ -12,7 +12,7 @@ export class UserController {
   @UseGuards(RedisAuthGuard)
   @Get('/wallet/:token/sell')
   @Api({ summary: 'Example secured endpoint', description: 'Placeholder user wallet endpoint.', envelope: true })
-  walletTokenSell(@Param('username') _username: string) {
+  walletTokenSell(@Param('token') token: string) {
     return { message: 'Not yet implemented' };
   }
 }

src/users/user.service.ts

@@ -30,7 +30,7 @@ export class UserService {
     const hashedPassword = await this.passwordService.hashPassword(changePassword.newPassword);
 
     return this.prisma.user.update({
-      data: {},
+      data: { password: hashedPassword },
       where: { id: userId },
     });
   }

src/wss/wss.adapter.ts

@@ -24,7 +24,6 @@ export class CustomRedisIoAdapter extends IoAdapter {
   }
 
   public createIOServer(port: number, options?: ServerOptions): Server {
-    //console.log('wut the fuck');
     const server = super.createIOServer(port, {
       ...options,
       cors: cors_options_delegate,

src/wss/wss.gateway.ts

@@ -35,18 +35,14 @@ export class WssGateway implements OnGatewayConnection, OnGatewayDisconnect {
   constructor(private readonly logService: LogService) {}
 
   private getClientQuery(client: io.Socket): { [key: string]: string } {
-    console.log('ASDASDASD');
     return client.handshake.query as { [key: string]: string };
   }
 
   public broadcastAll(event_name: string, message: Record<string, unknown>) {
-    console.log('sadadsdasdasd');
     this.server.emit(event_name, message);
   }
 
-  handleConnection(client: io.Socket) {
-    console.log('wtf');
-    client.join('msgRoom');
+  handleConnection(client: io.Socket) {        client.join('msgRoom');
     const { user_id } = this.getClientQuery(client);
 
     this.logService.info(`WssGateway: handleConnection ${user_id}`);