Merge pull request #248 from traPtitech/feat/remove_openapi_and_meeting_to_event

mehm8128 · web-flow · commit 7c21b8a60689 · 2023-09-16T23:08:08.000+09:00
remove openapi &amp; meeting-&gt;event
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
     "build": "vite build",
     "lint": "eslint --ext .ts,.vue src",
     "type-check": "vue-tsc --noEmit",
-    "gen-api": "node ./scripts/gen-api.js && buf generate https://github.com/traPtitech/Emoine_R.git#subdir=api/proto",
+    "gen-api": "buf generate https://github.com/traPtitech/Emoine_R.git#subdir=api/proto",
     "start-mock": "prism mock -p 8090 -d https://raw.githubusercontent.com/traPtitech/Emoine_R/main/docs/openapi.yml"
   },
   "dependencies": {
diff --git a/scripts/add-api.js b/scripts/add-api.js
diff --git a/scripts/gen-api.js b/scripts/gen-api.js
diff --git a/src/components/CommentPanel/CommentControls.vue b/src/components/CommentPanel/CommentControls.vue
@@ -23,7 +23,7 @@ const toggleIsAnonymous = () => {
 const sendComment = async () => {
   if (!commentValue.value) return
   await client.sendComment({
-    meetingId: props.eventId,
+    eventId: props.eventId,
     text: commentValue.value,
     color: pickedColor.value,
     isAnonymous: isAnonymous.value
diff --git a/src/components/CommentPanel/CommentItem.vue b/src/components/CommentPanel/CommentItem.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { Comment } from '@/lib/apis/generated/proto/emoine_r/v1/schema_pb'
+import { Comment } from '@/lib/apis'
 
 const props = defineProps<{
   comment: Comment
diff --git a/src/components/CommentPanel/CommentList.vue b/src/components/CommentPanel/CommentList.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { Comment } from '@/lib/apis/generated/proto/emoine_r/v1/schema_pb'
+import { Comment } from '@/lib/apis'
 import CommentItem from '@/components/CommentPanel/CommentItem.vue'
 
 defineProps<{
diff --git a/src/components/CommentPanel/CommentPanel.vue b/src/components/CommentPanel/CommentPanel.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import CommentList from '@/components/CommentPanel/CommentList.vue'
-import { Comment } from '@/lib/apis/generated/proto/emoine_r/v1/schema_pb'
+import { Comment } from '@/lib/apis'
 import CommentControls from '@/components/CommentPanel/CommentControls.vue'
 import CommentPanelHeader from '@/components/CommentPanel/CommentPanelHeader.vue'
 
diff --git a/src/components/EventDetail/EventInformation.vue b/src/components/EventDetail/EventInformation.vue
@@ -1,13 +1,13 @@
 <script setup lang="ts">
 import { onMounted, ref } from 'vue'
-import { Meeting } from '@/lib/apis/generated/proto/emoine_r/v1/schema_pb'
+import { Event } from '@/lib/apis'
 import { formatDateTime } from '@/lib/date'
 import { useMenuModal } from '@/composables/useMenuModal'
 import { MenuItem } from '@/components/UI/MenuModal.vue'
 import MenuModal from '@/components/UI/MenuModal.vue'
 import AIcon from '@/components/UI/AIcon.vue'
 
-const props = defineProps<{ event: Meeting }>()
+const props = defineProps<{ event: Event }>()
 const emits = defineEmits<{
   (e: 'updateDescription', description: string): void
   (e: 'delete'): void
diff --git a/src/components/EventDetail/EventTokenItem.vue b/src/components/EventDetail/EventTokenItem.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { Token } from '@/lib/apis/generated/proto/emoine_r/v1/schema_pb'
+import { Token } from '@/lib/apis'
 import { formatDate } from '@/lib/date'
 import AIcon from '@/components/UI/AIcon.vue'
 import EmoineIcon from '@/components/UI/EmoineIcon.vue'
diff --git a/src/components/EventDetail/EventTokenNew.vue b/src/components/EventDetail/EventTokenNew.vue
@@ -4,7 +4,7 @@ import BaseInput from '@/components/UI/BaseInput.vue'
 import BaseDateInput from '@/components/UI/BaseDateInput.vue'
 import AIcon from '@/components/UI/AIcon.vue'
 import { ref } from 'vue'
-import { Token } from '@/lib/apis/generated/proto/emoine_r/v1/schema_pb'
+import { Token } from '@/lib/apis'
 import { useRoute } from 'vue-router'
 import { getEventId } from '@/lib/parsePathParams'
 import EmoineIcon from '@/components/UI/EmoineIcon.vue'
@@ -29,7 +29,7 @@ const handleAddToken = async () => {
   // todo: error handling
   const res = await adminClient.generateToken({
     username: userName.value,
-    meetingId: eventId,
+    eventId: eventId,
     expireAt: Timestamp.fromDate(new Date(expireDate.value + ':00Z')), // fixme: https://github.com/traPtitech/traPortfolio-Dashboard/pull/64#discussion_r1174958146
     description: description.value
   })
diff --git a/src/components/EventDetail/EventTokens.vue b/src/components/EventDetail/EventTokens.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { Token } from '@/lib/apis/generated/proto/emoine_r/v1/schema_pb'
+import { Token } from '@/lib/apis'
 import EventTokenItem from './EventTokenItem.vue'
 import AIcon from '@/components/UI/AIcon.vue'
 import { ref } from 'vue'
diff --git a/src/components/EventThumbnail/EventThumbnail.vue b/src/components/EventThumbnail/EventThumbnail.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
-import { Meeting } from '@/lib/apis/generated/proto/emoine_r/v1/schema_pb'
+import { Event } from '@/lib/apis'
 import DateChip from '@/components/UI/DateChip.vue'
 import { toDayjs } from '@/lib/date'
 
-defineProps<{ event: Meeting }>()
+defineProps<{ event: Event }>()
 </script>
 
 <template>
diff --git a/src/components/Events/EventItem.vue b/src/components/Events/EventItem.vue
@@ -1,12 +1,12 @@
 <script lang="ts" setup>
-import { Meeting } from '@/lib/apis/generated/proto/emoine_r/v1/schema_pb'
+import { Event } from '@/lib/apis'
 import { RouterLink } from 'vue-router'
 import AIcon from '@/components/UI/AIcon.vue'
 import DateChip from '@/components/UI/DateChip.vue'
 import { toDayjs } from '@/lib/date'
 
 defineProps<{
-  event: Meeting
+  event: Event
 }>()
 </script>
 
diff --git a/src/components/StampList/StampList.vue b/src/components/StampList/StampList.vue
@@ -15,7 +15,7 @@ const props = defineProps<{
 const client = useGeneralConnectClient()
 
 const handlePutStamp = async (stampId: string) => {
-  await client.sendReaction({ meetingId: props.eventId, stampId })
+  await client.sendReaction({ eventId: props.eventId, stampId })
 }
 </script>
 
diff --git a/src/lib/apis/index.ts b/src/lib/apis/index.ts
@@ -1,5 +1 @@
-import { Apis, Configuration } from './generated'
-const apis = new Apis(new Configuration({ basePath: '/api' }))
-
-export default apis
-export * from './generated'
+export * from './generated/proto/emoine_r/v1/schema_pb'
diff --git a/src/lib/mock.ts b/src/lib/mock.ts
@@ -1,34 +1,29 @@
 import { AdminAPIService } from '@/lib/apis/generated/proto/emoine_r/v1/admin_api_connect'
 import {
-  CreateMeetingResponse,
+  CreateEventResponse,
   GenerateTokenResponse,
   GetTokensResponse
 } from '@/lib/apis/generated/proto/emoine_r/v1/admin_api_pb'
 import { GeneralAPIService } from '@/lib/apis/generated/proto/emoine_r/v1/general_api_connect'
 import {
-  GetMeetingCommentsResponse,
-  GetMeetingReactionsResponse,
-  GetMeetingResponse,
-  GetMeetingsResponse,
+  GetEventCommentsResponse,
+  GetEventReactionsResponse,
+  GetEventResponse,
+  GetEventsResponse,
   SendCommentResponse,
   SendReactionResponse
 } from '@/lib/apis/generated/proto/emoine_r/v1/general_api_pb'
-import {
-  Meeting,
-  Token,
-  Comment,
-  Reaction
-} from '@/lib/apis/generated/proto/emoine_r/v1/schema_pb'
+import { Event, Token, Comment, Reaction } from '@/lib/apis'
 import { randomDate, randomString } from '@/lib/random'
 import { ServiceImpl } from '@bufbuild/connect'
 import { Timestamp } from '@bufbuild/protobuf'
 
-export const exampleEvents = (n: number): Meeting[] =>
+export const exampleEvents = (n: number): Event[] =>
   Array(n)
     .fill(null)
     .map(
       () =>
-        new Meeting({
+        new Event({
           id: randomString(5, 32),
           videoId: randomString(5, 11),
           description: randomString(5, 100),
@@ -50,7 +45,7 @@ export const exampleTokens = (n: number): Token[] =>
           id: randomString(5, 32),
           raw: randomString(5, 30),
           username: randomString(5, 20),
-          meetingId: randomString(5, 32),
+          eventId: randomString(5, 32),
           creatorId: randomString(5, 32),
           description: randomString(5, 100),
           createdAt: Timestamp.fromDate(randomDate()),
@@ -65,7 +60,7 @@ export const exampleComments = (n: number): Comment[] =>
       () =>
         new Comment({
           id: randomString(5, 32),
-          meetingId: randomString(5, 32),
+          eventId: randomString(5, 32),
           username: randomString(5, 20),
           text: randomString(5, 100),
           isAnonymous: false,
@@ -81,7 +76,7 @@ export const exampleReactions = (n: number): Reaction[] =>
       () =>
         new Reaction({
           id: randomString(5, 32),
-          meetingId: randomString(5, 32),
+          eventId: randomString(5, 32),
           username: randomString(5, 20),
           stampId: randomString(5, 32),
           createdAt: Timestamp.fromDate(randomDate())
@@ -90,32 +85,32 @@ export const exampleReactions = (n: number): Reaction[] =>
 const exampleReaction = exampleReactions(1)[0]
 
 export const generalApiMock: Partial<ServiceImpl<typeof GeneralAPIService>> = {
-  getMeetings: () =>
-    new GetMeetingsResponse({
+  getEvents: () =>
+    new GetEventsResponse({
       total: 100,
-      meetings: exampleEvents(12)
+      events: exampleEvents(12)
     }),
-  getMeeting: () => new GetMeetingResponse({ meeting: exampleEvent }),
-  getMeetingComments: () =>
-    new GetMeetingCommentsResponse({
+  getEvent: () => new GetEventResponse({ event: exampleEvent }),
+  getEventComments: () =>
+    new GetEventCommentsResponse({
       comments: exampleComments(20)
     }),
-  getMeetingReactions: () =>
-    new GetMeetingReactionsResponse({
+  getEventReactions: () =>
+    new GetEventReactionsResponse({
       reactions: exampleReactions(10)
     }),
-  // connectToMeetingStream: () => {}, todo: streamingのmockの書き方が分からなかった
+  // connectToEventStream: () => {}, todo: streamingのmockの書き方が分からなかった
   sendComment: () => new SendCommentResponse({ comment: exampleComment }),
   sendReaction: () => new SendReactionResponse({ reaction: exampleReaction })
 }
 
 export const adminApiMock: ServiceImpl<typeof AdminAPIService> = {
-  createMeeting: () =>
-    new CreateMeetingResponse({
-      meeting: exampleEvent
+  createEvent: () =>
+    new CreateEventResponse({
+      event: exampleEvent
     }),
-  updateMeeting: () => ({}),
-  deleteMeeting: () => ({}),
+  updateEvent: () => ({}),
+  deleteEvent: () => ({}),
   getTokens: () =>
     new GetTokensResponse({
       tokens: exampleTokens(12)
diff --git a/src/pages/EventPage.vue b/src/pages/EventPage.vue
@@ -6,16 +6,13 @@ import CommentPanel from '@/components/CommentPanel/CommentPanel.vue'
 import StampList from '@/components/StampList/StampList.vue'
 import { Stamp } from '@/components/StampList/StampList.vue'
 import { useGeneralConnectClient } from '@/lib/connectClient'
-import {
-  Meeting,
-  Comment
-} from '@/lib/apis/generated/proto/emoine_r/v1/schema_pb'
+import { Event, Comment } from '@/lib/apis'
 
 const route = useRoute()
 const client = useGeneralConnectClient()
 
 const eventId = getEventId(route.params.id)
-const event = ref<Meeting>()
+const event = ref<Event>()
 const comments = ref<Comment[]>()
 
 //TODO: スタンプをなんらかの方法で取ってくる
@@ -25,25 +22,25 @@ const stamps: Stamp[] = Array(10).fill({
   image: 'https://q.trap.jp/api/v3/public/icon/mehm8128'
 })
 
-const fetchMeeting = async () => {
+const fetchevent = async () => {
   //todo: エラーハンドリング
-  const res = await client.getMeeting({ id: eventId })
-  if (!res.meeting) {
-    throw new Error('res.meeting is undefined')
+  const res = await client.getEvent({ id: eventId })
+  if (!res.event) {
+    throw new Error('res.event is undefined')
   }
-  event.value = res.meeting
+  event.value = res.event
 }
 const fetchComments = async () => {
   //todo: エラーハンドリング
-  const res = await client.getMeetingComments({ meetingId: eventId })
+  const res = await client.getEventComments({ eventId: eventId })
   if (!res.comments) {
     throw new Error('res.comment is undefined')
   }
   comments.value = res.comments
 }
 
 onMounted(() => {
-  fetchMeeting()
+  fetchevent()
   fetchComments()
 })
 </script>
diff --git a/src/pages/Index.vue b/src/pages/Index.vue
diff --git a/src/pages/admin/CreateNewEventPage.vue b/src/pages/admin/CreateNewEventPage.vue
diff --git a/src/pages/admin/EventDetailPage.vue b/src/pages/admin/EventDetailPage.vue
diff --git a/src/pages/admin/EventsPage.vue b/src/pages/admin/EventsPage.vue
