Develop (#2017)

memser-spaceport · Dec 10, 2024 · 1af5d68 · 1af5d68
2 parents 0acafa8 + 7dfb867
commit 1af5d68
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 7 deletions.
diff --git a/apps/back-office/components/footer-buttons/footer-buttons.tsx b/apps/back-office/components/footer-buttons/footer-buttons.tsx
@@ -76,7 +76,7 @@ export function FooterButtons(props) {
           isOpen={true}
           onClose={onClose}
         >
-          <div className="relative h-[21vh] w-[640px] rounded-[8px] bg-white text-[#000000]">
+          <div className="relative min-h-[21vh] w-[640px] rounded-[8px] bg-white text-[#000000]">
             <div className='absolute top-[10px] right-[10px]'>
               <button onClick={onClose}>
                 <img

diff --git a/apps/back-office/components/member-table/member-table.tsx b/apps/back-office/components/member-table/member-table.tsx
@@ -377,7 +377,7 @@ const MemberTable = (props: any) => {
           isOpen={true}
           onClose={onClose}
         >
-          <div className="relative h-[21vh] w-[640px] rounded-[8px] bg-white text-[#000000]">
+          <div className="relative min-h-[21vh] w-[640px] rounded-[8px] bg-white text-[#000000]">
             <div className='absolute top-[10px] right-[10px]'>
               <button onClick={onClose}>
                 <img

diff --git a/apps/web-api/prisma/migrations/20241209133459_pl_event_guest_team_optional/migration.sql b/apps/web-api/prisma/migrations/20241209133459_pl_event_guest_team_optional/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "PLEventGuest" ALTER COLUMN "teamUid" DROP NOT NULL;
diff --git a/apps/web-api/prisma/schema.prisma b/apps/web-api/prisma/schema.prisma
@@ -405,8 +405,8 @@ model PLEventGuest {
   updatedAt      DateTime @updatedAt
   memberUid      String
   member         Member   @relation(fields: [memberUid], references: [uid], onDelete: Cascade)
-  teamUid        String
-  team           Team     @relation(fields: [teamUid], references: [uid], onDelete: Cascade)
+  teamUid        String?
+  team           Team?     @relation(fields: [teamUid], references: [uid], onDelete: Cascade)
   eventUid       String
   event          PLEvent  @relation(fields: [eventUid], references: [uid], onDelete: Cascade)
   additionalInfo Json?

diff --git a/apps/web-api/src/members/members.service.ts b/apps/web-api/src/members/members.service.ts
@@ -1127,7 +1127,7 @@ export class MembersService {
    * @returns result
    */
   async verifyMembers(memberIds: string[], userEmail): Promise<any> {
-    return await this.prisma.$transaction(async (tx) => {
+    const response = await this.prisma.$transaction(async (tx) => {
       const result = await tx.member.updateMany({
         where: { uid: { in: memberIds } },
         data: {
@@ -1157,8 +1157,11 @@ export class MembersService {
           tx
         );
       }));
+
       return result;
     });
+    await this.cacheService.reset({ service: 'members' });
+    return response;
   }
 
   /**
@@ -1427,6 +1430,7 @@ export class MembersService {
   ): Promise<Member> {
     if (member[field] !== newValue) {
       member = await this.updateMemberByUid(member.uid, { [field]: newValue }, tx);
+      await this.cacheService.reset({ service: 'members' });
     }
     return member;
   }

diff --git a/apps/web-api/src/participants-request/participants-request.service.ts b/apps/web-api/src/participants-request/participants-request.service.ts
@@ -460,6 +460,7 @@ export class ParticipantsRequestService {
         }
       })
     );
+    await this.cacheService.reset({ service: "participants-requests" });
     return { count: successCount, results };
   }
 }
diff --git a/apps/web-api/src/pl-events/pl-events.controller.ts b/apps/web-api/src/pl-events/pl-events.controller.ts
@@ -26,6 +26,7 @@ import { NoCache } from '../decorators/no-cache.decorator';
 import { MembersService } from '../members/members.service';
 import { PLEventLocationsService } from './pl-event-locations.service';
 import { PLEventGuestsService } from './pl-event-guests.service';
+import { isEmpty } from 'lodash';
 
 const server = initNestServer(apiEvents);
 type RouteShape = typeof server.routeShapes;
@@ -90,7 +91,7 @@ export class PLEventsController {
     const member: any = await this.memberService.findMemberByEmail(request["userEmail"]);
     const result = await this.memberService.isMemberPartOfTeams(member, [body.teamUid]) ||
       await this.memberService.checkIfAdminUser(member);
-    if (!result) {
+    if (!result && !isEmpty(body.teamUid) ) {
       throw new ForbiddenException(`Member with email ${userEmail} is not part of 
         team with uid ${body.teamUid} or isn't admin.`);
     }
@@ -117,7 +118,7 @@ export class PLEventsController {
     const member: any = await this.memberService.findMemberByEmail(request["userEmail"]);
     const result = await this.memberService.isMemberPartOfTeams(member, [body.teamUid]) ||
       await this.memberService.checkIfAdminUser(member);
-    if (!result) {
+    if (!result && !isEmpty(body.teamUid)) {
       throw new ForbiddenException(`Member with email ${userEmail} is not part of team with uid ${body.teamUid} or isn't admin`);
     }
     const location = await this.eventLocationService.getPLEventLocationByUid(locationUid);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		-- AlterTable
		ALTER TABLE "PLEventGuest" ALTER COLUMN "teamUid" DROP NOT NULL;
-Original file line number
+Diff line change
@@ Expand Up / @@ -460,6 +460,7 @@ export class ParticipantsRequestService { @@
             }
           })
         );
+        await this.cacheService.reset({ service: "participants-requests" });
         return { count: successCount, results };
       }
     }