fix(record): change back from clubmemberships to membership

Author: qwerzl

components/custom/CAS/Record/view-activity-records/columns.ts

@@ -1,9 +1,9 @@
-import { h } from 'vue'
-import type { ColumnDef } from '@tanstack/vue-table'
 import type { ActivityRecord, Club, ClubMembership } from '@prisma/client'
+import type { ColumnDef } from '@tanstack/vue-table'
+import { Button } from '#components'
 import { ArrowUpDown } from 'lucide-vue-next'
+import { h } from 'vue'
 import DropdownAction from './DataTableAction.vue'
-import { Button } from '#components'
 
 export const columns: ColumnDef<ActivityRecord>[] = [
   {

db/schema.prisma

@@ -35,8 +35,8 @@ model Club {
   ActivityRecord            ActivityRecord[]
   ClubRating                ClubRating[]
   GroupInfo                 GroupInfo[]
+  memberships               ClubMembership[]
   ReservationRecord         ReservationRecord[]
-  ClubMembership            ClubMembership[]
 }
 
 enum ClubMemberRole {

pages/manage/record.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import LazyNewActivityRecord from '~/components/custom/CAS/Record/NewActivityRecord.vue'
-import Skeleton from '~/components/ui/skeleton/Skeleton.vue'
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '~/components/ui/card'
 import ViewMyActivityRecords from '~/components/custom/CAS/Record/ViewMyActivityRecords.vue'
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '~/components/ui/card'
+import Skeleton from '~/components/ui/skeleton/Skeleton.vue'
 
 definePageMeta({
   middleware: ['auth'],

server/api/user/all_clubs.get.ts

@@ -16,7 +16,7 @@ export default eventHandler(async (event) => {
     },
   })).tsimsStudentId
 
-  // const query = getQuery(event)
+  const query = getQuery(event)
 
   return {
     president: await prisma.club.findMany({
@@ -26,7 +26,7 @@ export default eventHandler(async (event) => {
       select: {
         id: true,
         name: true,
-        // memberships: query.includeMemberships === 'true',
+        memberships: query.includeMemberships === 'true',
       },
     }),
     vice: await prisma.club.findMany({
@@ -38,7 +38,7 @@ export default eventHandler(async (event) => {
       select: {
         id: true,
         name: true,
-        // memberships: query.includeMemberships === 'true',
+        memberships: query.includeMemberships === 'true',
       },
     }),
     member: await prisma.club.findMany({
@@ -50,7 +50,7 @@ export default eventHandler(async (event) => {
       select: {
         id: true,
         name: true,
-        // memberships: query.includeMemberships === 'true',
+        memberships: query.includeMemberships === 'true',
       },
     }),
   }