chore: Make s3 buckets configurable via env (#685)

* chore: Make s3 buckets configurable via env

* chore: Add some spacing

* fix: Tests

Author: sashko9807

apps/api/src/bank-transactions-file/bank-transactions-file.module.ts

@@ -6,7 +6,7 @@ import { PersonService } from '../person/person.service'
 import { DonationsService } from '../donations/donations.service'
 import { VaultService } from '../vault/vault.service'
 import { CampaignService } from '../campaign/campaign.service'
-import { ConfigService } from '@nestjs/config'
+import { ConfigModule, ConfigService } from '@nestjs/config'
 import { StripeModule } from '@golevelup/nestjs-stripe'
 import { StripeConfigFactory } from '../donations/helpers/stripe-config-factory'
 import { ExportService } from '../export/export.service'
@@ -23,6 +23,7 @@ import { PrismaModule } from '../prisma/prisma.module'
     NotificationModule,
     MarketingNotificationsModule,
     PrismaModule,
+    ConfigModule
   ],
   controllers: [BankTransactionsFileController],
   providers: [

apps/api/src/bank-transactions-file/bank-transactions-file.service.spec.ts

@@ -3,13 +3,14 @@ import { PrismaService } from '../prisma/prisma.service'
 import { S3Service } from '../s3/s3.service'
 import { BankTransactionsFileService } from './bank-transactions-file.service'
 import { MarketingNotificationsModule } from '../notifications/notifications.module'
+import { ConfigModule } from '@nestjs/config'
 
 describe('BankTransactionsFileService', () => {
   let service: BankTransactionsFileService
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
-      imports: [MarketingNotificationsModule],
+      imports: [MarketingNotificationsModule, ConfigModule],
       providers: [BankTransactionsFileService, PrismaService, S3Service],
     }).compile()
 

apps/api/src/bank-transactions-file/bank-transactions-file.service.ts

@@ -4,11 +4,14 @@ import { Readable } from 'stream'
 import { PrismaService } from '../prisma/prisma.service'
 import { S3Service } from '../s3/s3.service'
 import { CreateBankTransactionsFileDto } from './dto/create-bank-transactions-file.dto'
+import { ConfigService } from '@nestjs/config'
 
 @Injectable()
 export class BankTransactionsFileService {
-  private readonly bucketName: string = 'banktransactions-files'
-  constructor(private prisma: PrismaService, private s3: S3Service) {}
+  constructor(private prisma: PrismaService, private s3: S3Service, private readonly configService: ConfigService) { }
+  
+  private readonly S3_BUCKET_NAME = 'banktransactions-files'
+  private readonly bucketName: string = this.configService.get('BANK_TRANSACTION_FILES_BUCKET', this.S3_BUCKET_NAME)
 
   async create(
     type: BankTransactionsFileType,

apps/api/src/campaign-application/campaign-application.service.ts

@@ -30,15 +30,17 @@ function dateMaybe(d?: string) {
 
 @Injectable()
 export class CampaignApplicationService {
-  private readonly bucketName: string = 'campaignapplication-files'
   constructor(
     private prisma: PrismaService,
     private organizerService: OrganizerService,
     private s3: S3Service,
     private emailService: EmailService,
     private readonly configService: ConfigService,
   ) {}
-
+  
+  private readonly S3_BUCKET_NAME = 'campaignapplication-files'
+  private readonly bucketName: string = this.configService.get('CAMPAIGN_APPLICATIONS_FILES_BUCKET', this.S3_BUCKET_NAME)
+  
   async create(createCampaignApplicationDto: CreateCampaignApplicationDto, person: Person) {
     try {
       if (

apps/api/src/campaign-file/campaign-file.module.ts

@@ -8,9 +8,10 @@ import { VaultService } from '../vault/vault.service'
 import { NotificationModule } from '../sockets/notifications/notification.module'
 import { MarketingNotificationsModule } from '../notifications/notifications.module'
 import { PrismaModule } from '../prisma/prisma.module'
+import { ConfigModule } from '@nestjs/config'
 
 @Module({
-  imports: [NotificationModule, MarketingNotificationsModule, PrismaModule],
+  imports: [NotificationModule, MarketingNotificationsModule, PrismaModule, ConfigModule],
 
   controllers: [CampaignFileController],
   providers: [CampaignFileService, S3Service, PersonService, CampaignService, VaultService],

apps/api/src/campaign-file/campaign-file.service.ts

@@ -5,11 +5,14 @@ import { CampaignFile, CampaignFileRole, Person } from '@prisma/client'
 import { S3Service } from '../s3/s3.service'
 import { PrismaService } from '../prisma/prisma.service'
 import { CreateCampaignFileDto } from './dto/create-campaign-file.dto'
+import { ConfigService } from '@nestjs/config'
 
 @Injectable()
 export class CampaignFileService {
-  private readonly bucketName: string = 'campaign-files'
-  constructor(private prisma: PrismaService, private s3: S3Service) {}
+  constructor(private prisma: PrismaService, private s3: S3Service, private readonly configService: ConfigService) { }
+  
+  private readonly S3_BUCKET_NAME =  'campaign-files'
+  private readonly bucketName: string = this.configService.get('CAMPAIGN_FILES_BUCKET', this.S3_BUCKET_NAME)
 
   async create(
     role: CampaignFileRole,

apps/api/src/campaign-news-file/campaign-news-file.module.ts

@@ -6,9 +6,10 @@ import { S3Service } from '../s3/s3.service'
 import { PersonModule } from '../person/person.module'
 import { CampaignNewsModule } from '../campaign-news/campaign-news.module'
 import { PrismaModule } from '../prisma/prisma.module'
+import { ConfigModule } from '@nestjs/config'
 
 @Module({
-  imports: [CampaignNewsModule, PersonModule, PrismaModule],
+  imports: [CampaignNewsModule, PersonModule, PrismaModule, ConfigModule],
   controllers: [CampaignNewsFileController],
   providers: [CampaignNewsFileService, S3Service],
 })

apps/api/src/campaign-news-file/campaign-news-file.service.ts

@@ -6,11 +6,14 @@ import { S3Service } from '../s3/s3.service'
 import { PrismaService } from '../prisma/prisma.service'
 import { CreateCampaignNewsFileDto } from './dto/create-campaign-news-file.dto'
 import { KeycloakTokenParsed, isAdmin } from '../auth/keycloak'
+import { ConfigService } from '@nestjs/config'
 
 @Injectable()
 export class CampaignNewsFileService {
-  private readonly bucketName: string = 'campaign-news-files'
-  constructor(private prisma: PrismaService, private s3: S3Service) {}
+  constructor(private prisma: PrismaService, private s3: S3Service, private readonly configService:ConfigService) { }
+  
+  private readonly S3_BUCKET_NAME =  'campaign-news-files'
+  private readonly bucketName: string = this.configService.get('CAMPAIGN_NEWS_FILES_BUCKET', this.S3_BUCKET_NAME)
 
   async create(
     role: CampaignFileRole,

apps/api/src/expenses/expenses.controller.spec.ts

@@ -8,6 +8,7 @@ import { CreateExpenseDto } from './dto/create-expense.dto'
 import { UpdateExpenseDto } from './dto/update-expense.dto'
 import { S3Service } from '../s3/s3.service'
 import { KeycloakTokenParsed } from '../auth/keycloak'
+import { ConfigModule } from '@nestjs/config'
 
 const mockData = [
   {
@@ -35,6 +36,7 @@ describe('ExpensesController', () => {
     prismaMock.expense.findMany.mockResolvedValue(mockData)
 
     const module: TestingModule = await Test.createTestingModule({
+      imports:[ConfigModule],
       controllers: [ExpensesController],
       providers: [MockPrismaService, ExpensesService, S3Service],
     }).compile()
@@ -43,7 +45,7 @@ describe('ExpensesController', () => {
   })
 
   // Reset the mock after each test
-  afterEach(() => {
+  >  afterEach(() => {
     mockReset(prismaMock)
   })
 

apps/api/src/expenses/expenses.module.ts

@@ -3,9 +3,10 @@ import { ExpensesService } from './expenses.service'
 import { ExpensesController } from './expenses.controller'
 import { S3Service } from '../s3/s3.service'
 import { PrismaModule } from '../prisma/prisma.module'
+import { ConfigModule } from '@nestjs/config'
 
 @Module({
-  imports: [PrismaModule],
+  imports: [PrismaModule, ConfigModule],
   controllers: [ExpensesController],
   providers: [ExpensesService, S3Service],
 })