more campaign info added in campaign-news service

podkrepi-bg · Feb 12, 2024 · b65c7cd · b65c7cd
1 parent 4ff31dc
commit b65c7cd
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 8 deletions.
diff --git a/apps/api/src/campaign-news/campaign-news.service.ts b/apps/api/src/campaign-news/campaign-news.service.ts
@@ -150,8 +150,14 @@ export class CampaignNewsService {
           newsFiles: true,
           campaign: {
             select: {
+              id: true,
               title: true,
               state: true,
+              campaignType: {
+                select: {
+                  category: true,
+                },
+              },
             },
           },
         },
@@ -234,7 +240,23 @@ export class CampaignNewsService {
 
   async findArticleBySlug(slug: string) {
     return await this.prisma.campaignNews
-      .findFirst({ where: { slug: slug }, include: { newsFiles: true } })
+      .findFirst({
+        where: { slug: slug },
+        include: {
+          newsFiles: true,
+          campaign: {
+            select: {
+              title: true,
+              state: true,
+              campaignType: {
+                select: {
+                  category: true,
+                },
+              },
+            },
+          },
+        },
+      })
       .catch((error) => Logger.warn(error))
   }
 

diff --git a/apps/api/src/campaign/campaign.controller.ts b/apps/api/src/campaign/campaign.controller.ts
@@ -128,12 +128,9 @@ export class CampaignController {
   }
 
   @Get('byId/:id')
-  @Roles({
-    roles: [RealmViewSupporters.role, ViewSupporters.role],
-    mode: RoleMatchingMode.ANY,
-  })
+  @Public()
   async findOne(@Param('id') id: string) {
-    return this.campaignService.getCampaignById(id)
+    return await this.campaignService.getCampaignById(id)
   }
 
   @Get('donations/:id')
@@ -176,10 +173,9 @@ export class CampaignController {
   ) {
     if (data.consent === false)
       throw new BadRequestException('Notification consent should be provided')
-
     // Subscribe to campaign notifications list
     await this.campaignService.subscribeToCampaignNotification(id, data)
-
+    
     return { message: 'Success' }
   }