Bug Fixes

bizmatch-server/src/app.module.ts

@@ -14,7 +14,7 @@ import { ListingsModule } from './listings/listings.module.js';
 import { MailModule } from './mail/mail.module.js';
 import { RequestDurationMiddleware } from './request-duration/request-duration.middleware.js';
 import { SelectOptionsModule } from './select-options/select-options.module.js';
-import { SubscriptionsController } from './subscriptions/subscriptions.controller.js';
+
 import { UserModule } from './user/user.module.js';
 
 const __filename = fileURLToPath(import.meta.url);
@@ -47,7 +47,7 @@ const __dirname = path.dirname(__filename);
     SelectOptionsModule,
     ImageModule,
   ],
-  controllers: [AppController, SubscriptionsController],
+  controllers: [AppController],
   providers: [AppService, FileService],
 })
 export class AppModule {

bizmatch-server/src/file/file.service.ts

@@ -6,7 +6,7 @@ import path, { join } from 'path';
 import sharp from 'sharp';
 import { fileURLToPath } from 'url';
 import { Logger } from 'winston';
-import { ImageProperty } from '../models/main.model.js';
+import { ImageProperty, Subscription } from '../models/main.model.js';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
@@ -25,7 +25,7 @@ export class FileService {
     const rawData = readFileSync(filePath, 'utf8');
     this.subscriptions = JSON.parse(rawData);
   }
-  getSubscriptions() {
+  getSubscriptions(): Subscription[] {
     return this.subscriptions;
   }
   async storeProfilePicture(file: Express.Multer.File, userId: string) {

bizmatch-server/src/subscriptions/subscriptions.controller.ts

@@ -1,12 +0,0 @@
-import { Controller, Get } from '@nestjs/common';
-import { FileService } from '../file/file.service.js';
-
-@Controller('subscriptions')
-export class SubscriptionsController {
-    constructor(private readonly fileService: FileService){}
-    @Get()
-    findAll(): any {
-      return this.fileService.getSubscriptions();
-    }
-
-}

bizmatch-server/src/user/user.controller.ts

@@ -2,12 +2,15 @@ import { Body, Controller, Get, Inject, Param, Post, Query } from '@nestjs/commo
 import { WINSTON_MODULE_PROVIDER } from 'nest-winston';
 import { User } from 'src/models/db.model.js';
 import { Logger } from 'winston';
+import { FileService } from '../file/file.service.js';
+import { Subscription } from '../models/main.model.js';
 import { UserService } from './user.service.js';
 
 @Controller('user')
 export class UserController {
   constructor(
     private userService: UserService,
+    private fileService: FileService,
     @Inject(WINSTON_MODULE_PROVIDER) private readonly logger: Logger,
   ) {}
 
@@ -47,4 +50,16 @@ export class UserController {
     this.logger.info(`Found ${result.length} entries`);
     return result;
   }
+
+  @Get('subscriptions/:id')
+  async findSubscriptionsById(@Param('id') id: string): Promise<Subscription[]> {
+    const subscriptions = this.fileService.getSubscriptions();
+    const user = await this.userService.getUserById(id);
+    subscriptions.forEach(s => {
+      s.userId = user.id;
+      s.start = user.created;
+      s.modified = user.created;
+    });
+    return subscriptions;
+  }
 }