Merge pull request #625 from dump-hr/lukazuljevic/618-sponzori-sami-unose-fly-talk-podatke

Lukazuljevic/618 sponzori sami unose fly talk podatke

Author: lukazuljevic

apps/admin/.gitignore

@@ -22,3 +22,5 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+
+tsconfig.tsbuildinfo

apps/admin/src/api/company/useCompanyGetAllAdmin.ts

@@ -0,0 +1,14 @@
+import { CompanyDto as CompanyAdminDto } from '@ddays-app/types';
+import { QueryOptions, useQuery } from 'react-query';
+
+import { api } from '..';
+
+const companyGetAllAdmin = async () => {
+  return await api.get<never, CompanyAdminDto[]>('/company/all-for-admin');
+};
+
+export const useCompanyGetAllAdmin = (
+  options?: QueryOptions<CompanyAdminDto[]>,
+) => {
+  return useQuery(['company', 'admin'], companyGetAllAdmin, options);
+};

apps/admin/src/pages/CompanyPage/CompanyPage.tsx

@@ -1,11 +1,11 @@
 import { TableDashboard } from '../../components/TableDashboard';
-import { useCompanyGetAllPublic } from '../../api/company/useCompanyGetAllPublic';
 import { CompanyForm } from '../../forms/CompanyForm';
 import { useCompanyRemove } from '../../api/company/useCompanyRemove';
 import toast from 'react-hot-toast';
+import { useCompanyGetAllAdmin } from '../../api/company/useCompanyGetAllAdmin';
 
 export const CompanyPage = () => {
-  const { data: companies, refetch } = useCompanyGetAllPublic();
+  const { data: companies, refetch } = useCompanyGetAllAdmin();
   const removeCompany = useCompanyRemove();
 
   const handleDelete = async (ids: number[]) => {

apps/admin/tsconfig.tsbuildinfo

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "public"."Company" ADD COLUMN     "flyTalkHolders" JSONB;

apps/api/prisma/migrations/20251018122546_add_fly_talk_holders_to_company_table/migration.sql

@@ -0,0 +1,10 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `flyTalkHolders` on the `Company` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "public"."Company" DROP COLUMN "flyTalkHolders",
+ADD COLUMN     "flytalkHolders" JSONB,
+ADD COLUMN     "flytalkParticipation" BOOLEAN NOT NULL DEFAULT false;

apps/api/prisma/migrations/20251018124430_add_flytalk_participation_column_to_company_table/migration.sql

@@ -97,6 +97,8 @@ model Company {
   notes                      String[]
   campfireParticipation      Boolean                @default(false)
   campfireSpeakers           String[]
+  flytalkParticipation       Boolean                @default(false)
+  flytalkHolders             Json?
   codeId                     Int?
   booth                      Booth?
   code                       Code?                  @relation(fields: [codeId], references: [id], onDelete: NoAction, onUpdate: NoAction)

apps/api/prisma/schema.prisma

@@ -1,7 +1,9 @@
 import {
+  CompanyAdminDto,
   CompanyDto,
   CompanyModifyDescriptionDto,
   CompanyModifyDto,
+  CompanyModifyFlyTalkHoldersDto,
   CompanyPublicDto,
   FloorPlanCompanyDto,
 } from '@ddays-app/types';
@@ -47,6 +49,12 @@ export class CompanyController {
     return await this.companyService.getAllPublic();
   }
 
+  @UseGuards(AdminGuard)
+  @Get('all-for-admin')
+  async getAllForAdmin(): Promise<CompanyAdminDto[]> {
+    return await this.companyService.getAllForAdmin();
+  }
+
   @UseGuards(UserGuard)
   @Get('recommended')
   async getRecommended(
@@ -172,6 +180,16 @@ export class CompanyController {
     return await this.companyService.updateAccreditation(user.id, data);
   }
 
+  @UseGuards(SponsorGuard)
+  @ApiBearerAuth()
+  @Patch('/flytalk-holders')
+  async updateFlyTalkHolders(
+    @Req() { user }: AuthenticatedRequest,
+    @Body() data: CompanyModifyFlyTalkHoldersDto,
+  ) {
+    return await this.companyService.updateFlyTalkHolders(user.id, data);
+  }
+
   @UseGuards(SponsorGuard)
   @ApiBearerAuth()
   @ApiConsumes('multipart/form-data')

apps/api/src/company/company.controller.ts

@@ -1,12 +1,15 @@
 import {
+  CompanyAdminDto,
   CompanyDto,
   CompanyModifyDescriptionDto,
   CompanyModifyDto,
+  CompanyModifyFlyTalkHoldersDto,
   CompanyPublicDto,
   FloorPlanCompanyDto,
 } from '@ddays-app/types';
 import { UserToCompanyDto } from '@ddays-app/types/src/dto/user';
 import { Injectable, NotFoundException } from '@nestjs/common';
+import { InputJsonValue } from '@prisma/client/runtime/library';
 import { BlobService } from 'src/blob/blob.service';
 import { InterestService } from 'src/interest/interest.service';
 import { PrismaService } from 'src/prisma.service';
@@ -60,6 +63,43 @@ export class CompanyService {
     }));
   }
 
+  async getAllForAdmin(): Promise<CompanyAdminDto[]> {
+    const companies = await this.prisma.company.findMany({
+      select: {
+        id: true,
+        category: true,
+        name: true,
+        username: true,
+        password: true,
+        description: true,
+        opportunitiesDescription: true,
+        websiteUrl: true,
+        instagramUrl: true,
+        linkedinUrl: true,
+        logoImage: true,
+        landingImage: true,
+        landingImageCompanyCulture: true,
+        bookOfStandards: true,
+        video: true,
+        peopleForAccreditation: true,
+        swagBag: true,
+        swagBagNumber: true,
+        boothPlan: true,
+        equipment: true,
+        notes: true,
+        codeId: true,
+        flytalkParticipation: true,
+        flytalkHolders: true,
+      },
+      orderBy: { name: 'asc' },
+    });
+
+    return companies.map((company) => ({
+      ...company,
+      flytalkHolders: (company.flytalkHolders as unknown as JSON) || null,
+    }));
+  }
+
   async getTopRatedCompanies(): Promise<CompanyPublicDto[]> {
     const companies = await this.prisma.company.findMany({
       where: {
@@ -104,6 +144,7 @@ export class CompanyService {
 
     return topRated.map(({ ...company }) => ({
       ...company,
+      flytalkHolders: (company.flytalkHolders as unknown as JSON) || null,
     }));
   }
 
@@ -139,6 +180,7 @@ export class CompanyService {
       ...foundCompany,
       booth: foundCompany.booth?.name || null,
       boothId: foundCompany.booth?.id || null,
+      flytalkHolders: (foundCompany.flytalkHolders as unknown as JSON) || null,
       interests,
     };
   }
@@ -338,7 +380,30 @@ export class CompanyService {
       },
     });
 
-    return updatedCompany;
+    return {
+      ...updatedCompany,
+      flytalkHolders:
+        (updatedCompany.flytalkHolders as unknown as JSON) || null,
+    };
+  }
+
+  async updateFlyTalkHolders(
+    companyId: number,
+    data: CompanyModifyFlyTalkHoldersDto,
+  ): Promise<CompanyPublicDto> {
+    const updatedCompany = await this.prisma.company.update({
+      where: { id: companyId },
+      data: {
+        flytalkParticipation: data.flytalkParticipation,
+        flytalkHolders: data.flytalkHolders as unknown as InputJsonValue,
+      },
+    });
+
+    return {
+      ...updatedCompany,
+      flytalkHolders:
+        (updatedCompany.flytalkHolders as unknown as JSON) || null,
+    };
   }
 
   async updateAccreditation(
@@ -352,7 +417,11 @@ export class CompanyService {
       },
     });
 
-    return updatedCompany;
+    return {
+      ...updatedCompany,
+      flytalkHolders:
+        (updatedCompany.flytalkHolders as unknown as JSON) || null,
+    };
   }
 
   async updateLandingImage(
@@ -370,7 +439,11 @@ export class CompanyService {
       data: { landingImage },
     });
 
-    return updatedCompany;
+    return {
+      ...updatedCompany,
+      flytalkHolders:
+        (updatedCompany.flytalkHolders as unknown as JSON) || null,
+    };
   }
 
   async updateLandingImageCompanyCulture(
@@ -388,7 +461,11 @@ export class CompanyService {
       data: { landingImageCompanyCulture },
     });
 
-    return updatedCompany;
+    return {
+      ...updatedCompany,
+      flytalkHolders:
+        (updatedCompany.flytalkHolders as unknown as JSON) || null,
+    };
   }
 
   async updateBookOfStandards(
@@ -406,7 +483,11 @@ export class CompanyService {
       data: { bookOfStandards },
     });
 
-    return updatedCompany;
+    return {
+      ...updatedCompany,
+      flytalkHolders:
+        (updatedCompany.flytalkHolders as unknown as JSON) || null,
+    };
   }
 
   async updateLogoImage(
@@ -424,7 +505,11 @@ export class CompanyService {
       data: { logoImage },
     });
 
-    return updatedCompany;
+    return {
+      ...updatedCompany,
+      flytalkHolders:
+        (updatedCompany.flytalkHolders as unknown as JSON) || null,
+    };
   }
 
   async updateVideo(
@@ -442,7 +527,11 @@ export class CompanyService {
       data: { video },
     });
 
-    return updatedCompany;
+    return {
+      ...updatedCompany,
+      flytalkHolders:
+        (updatedCompany.flytalkHolders as unknown as JSON) || null,
+    };
   }
 
   async getFloorPlan(): Promise<FloorPlanCompanyDto[]> {

apps/api/src/company/company.service.ts

@@ -0,0 +1,29 @@
+import { CompanyModifyFlyTalkHoldersDto } from '@ddays-app/types';
+import toast from 'react-hot-toast';
+import { useMutation, useQueryClient } from 'react-query';
+
+import { api } from '..';
+
+const companyUpdateFlyTalkHolders = async (
+  dto: CompanyModifyFlyTalkHoldersDto,
+) => {
+  return await api.patch<CompanyModifyFlyTalkHoldersDto, never>(
+    '/company/flytalk-holders',
+    dto,
+  );
+};
+
+export const useCompanyUpdateFlyTalkHolders = () => {
+  const queryClient = useQueryClient();
+
+  return useMutation(companyUpdateFlyTalkHolders, {
+    onSuccess: () => {
+      queryClient.invalidateQueries(['company', 'current']);
+
+      toast.success('FlyTalk holders podaci uspješno spremljeni');
+    },
+    onError: (error: string) => {
+      toast.error(error);
+    },
+  });
+};