update staff api

Author: jiyuujin

apps/web/app/pages/sharemap.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { useFetch, useHead } from '#imports'
-import type { SpeakerCategory, SpeakerInfo, SponsorCategory, SponsorInfo, StaffInfo } from '@vuejs-jp/model'
+import type { SpeakerCategory, SpeakerInfo, SponsorCategory, SponsorInfo, StaffCategory, StaffInfo } from '@vuejs-jp/model'
 import { useLocaleCurrent } from '~/composables/useLocaleCurrent'
 import { conferenceTitle, linkUrl, ogSharemapDescription } from '~/utils/constants'
 import { generalOg, twitterOg } from '~/utils/og.constants'
@@ -10,7 +10,7 @@ type Speakers = Record<_SpeakerCategory, SpeakerInfo>
 
 type Sponsors = Record<SponsorCategory, SponsorInfo>
 
-type Staffs = Record<'allStaffs', StaffInfo>
+type Staffs = Record<StaffCategory, StaffInfo>
 
 const { data: speakers, error: error1 } = await useFetch('/api/speakers')
 const { sessionSpeakers, lightningTalkSpeakers, sponsorSessionSpeakers } = speakers.value as Speakers
@@ -39,7 +39,7 @@ if (error2.value) {
   console.error(error2.value)
 }
 const { data: staffs, error: error3 } = await useFetch('/api/staffs')
-const { allStaffs } = staffs.value as Staffs
+const { coreStaffs, volunteerStaffs } = staffs.value as Staffs
 if (error3.value) {
   console.error(error3.value)
 }
@@ -117,7 +117,7 @@ useHead({
       <div>
         <VFTitle id="staff">{{ $t('staff.title') }}</VFTitle>
         <VFTextLink
-          v-for="staff in allStaffs.list"
+          v-for="staff in [...coreStaffs.list, ...volunteerStaffs.list]"
           :key="staff.id"
           :href="`/staffs/${staff.detail_page_id}/share`"
           color="vue-blue"

apps/web/app/server/api/staffs.get.ts

@@ -10,13 +10,13 @@ export default defineEventHandler(async (event) => {
   const { data: _staffs } = await client.from('staffs').select().order('display_order') as { data: Staff[] }
   staffs = _staffs
 
-  const allStaffs: StaffInfo = {
-    type: 'staff',
-    title: 'staff',
+  const coreStaffs: StaffInfo = {
+    type: 'core-staff',
+    title: 'core-staff',
     list: staffs
       .filter((staff: Staff) => {
-        if (process.env.NODE_ENV === 'production') return staff.is_open === true
-        return true
+        if (process.env.NODE_ENV === 'production') return staff.is_open === true && staff.is_volunteer === false
+        return staff.is_volunteer === false
       })
       .sort((a: Staff, b: Staff) => {
         if (a.display_order) return -1
@@ -27,5 +27,22 @@ export default defineEventHandler(async (event) => {
       }),
   }
 
-  return { allStaffs }
+  const volunteerStaffs: StaffInfo = {
+    type: 'volunteer-staff',
+    title: 'volunteer-staff',
+    list: staffs
+      .filter((staff: Staff) => {
+        if (process.env.NODE_ENV === 'production') return staff.is_open === true && staff.is_volunteer === true
+        return staff.is_volunteer === true
+      })
+      .sort((a: Staff, b: Staff) => {
+        if (a.display_order) return -1
+        if (b.display_order) return 1
+        if (!a.display_order) return a.name < b.name ? -1 : 1
+        if (!b.display_order) return a.name < b.name ? -1 : 1
+        return a.display_order - b.display_order
+      }),
+  }
+
+  return { coreStaffs, volunteerStaffs }
 })

packages/model/lib/staff.ts

@@ -1,3 +1,7 @@
+export type StaffCategory =
+  | 'coreStaffs'
+  | 'volunteerStaffs'
+
 export type Staff = {
   id?: string
   name: string
@@ -13,7 +17,7 @@ export type Staff = {
 }
 
 export type StaffInfo = {
-  type: 'staff'
+  type: 'core-staff' | 'volunteer-staff'
   title: string
   list: Staff[]
 }