Skip to content

Commit

Permalink
type startTime in Room/OpenRoom is string
Browse files Browse the repository at this point in the history
  • Loading branch information
Mogge committed Jun 27, 2024
1 parent 3e4db09 commit 7d72b50
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 24 deletions.
6 changes: 3 additions & 3 deletions backend/src/graphql/models/RoomModel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export class OpenRoom {
constructor(meeting: MeetingInfo, link: string) {
this.meetingID = meeting.meetingID
this.meetingName = meeting.meetingName
this.startTime = meeting.startTime
this.startTime = meeting.startTime.toString()
this.participantCount = meeting.participantCount
this.attendees =
typeof meeting.attendees !== 'string'
Expand All @@ -41,8 +41,8 @@ export class OpenRoom {
@Field()
meetingName: string

@Field(() => Int)
startTime: number
@Field(() => String)
startTime: string

@Field(() => Int)
participantCount: number
Expand Down
6 changes: 3 additions & 3 deletions backend/src/graphql/resolvers/RoomResolver.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ describe('RoomResolver', () => {
meetingName: 'Dreammall Entwicklung',
meetingID: 'Dreammall-Entwicklung',
participantCount: 0,
startTime: 1718189,
startTime: '1718189',
attendees: [],
joinLink: 'https://my-link',
},
Expand Down Expand Up @@ -650,7 +650,7 @@ describe('RoomResolver', () => {
meetingName: 'Dreammall Entwicklung',
meetingID: 'Dreammall-Entwicklung',
participantCount: 0,
startTime: 1718189,
startTime: '1718189',
joinLink: 'https://my-link',
attendees: [
{
Expand Down Expand Up @@ -754,7 +754,7 @@ describe('RoomResolver', () => {
meetingName: 'Dreammall Entwicklung',
meetingID: 'Dreammall-Entwicklung',
participantCount: 0,
startTime: 1718189,
startTime: '1718189',
joinLink: 'https://my-link',
attendees: [
{
Expand Down
2 changes: 1 addition & 1 deletion frontend/.storybook/ApolloWrapper.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
{
meetingID: 'my-meeting',
meetingName: 'my meeting',
startTime: 1234,
startTime: '1234',
participantCount: 1,
attendees: [
{
Expand Down
8 changes: 4 additions & 4 deletions frontend/src/components/vuetify/Atoms/ListElement.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const meta: Meta<typeof ListElement> = {
{
meetingName: 'Beispiel Titel 1',
meetingID: 'xxx',
startTime: 1234,
startTime: '1234',
participantCount: 4,
attendees: [],
joinLink: 'https://my.link',
Expand All @@ -29,7 +29,7 @@ const meta: Meta<typeof ListElement> = {
{
meetingName: 'Beispiel Titel 2',
meetingID: 'xxx',
startTime: 1234,
startTime: '1234',
participantCount: 4,
attendees: [],
joinLink: 'https://my.link',
Expand All @@ -55,7 +55,7 @@ export const Basic: Story = {
{
meetingName: 'Beispiel Titel 1',
meetingID: 'xxx',
startTime: 1234,
startTime: '1234',
participantCount: 4,
attendees: [],
joinLink: 'https://my.link',
Expand All @@ -65,7 +65,7 @@ export const Basic: Story = {
{
meetingName: 'Beispiel Titel 2',
meetingID: 'xxx',
startTime: 1234,
startTime: '1234',
participantCount: 4,
attendees: [],
joinLink: 'https://my.link',
Expand Down
22 changes: 12 additions & 10 deletions frontend/src/components/vuetify/Atoms/ListElement.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,24 +33,26 @@ import { PropType } from 'vue'
import { Room } from '#stores/roomsStore'
/*
export interface Item {
title: string
subtitle?: string
rounded?: boolean
prepend?: string | object
prependProps?: object
append?: string | object
appendProps?: object
}
*/
export interface Item {
title: string
subtitle?: string
rounded?: boolean
prepend?: string | object
prependProps?: object
append?: string | object
appendProps?: object
}
*/
defineProps({
items: {
type: Array as PropType<Room[]>,
required: true,
},
})
const emit = defineEmits(['item-click'])
const handleItemClick = () => {
closeMenu()
emit('item-click')
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/stores/roomsStore.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ describe('Rooms Store', () => {
{
meetingID: 'my-meeting',
meetingName: 'my meeting',
startTime: 1234,
startTime: '1234',
participantCount: 1,
attendees: [
{
Expand All @@ -61,7 +61,7 @@ describe('Rooms Store', () => {
{
meetingID: 'my-meeting',
meetingName: 'my meeting',
startTime: 1234,
startTime: '1234',
participantCount: 1,
attendees: [
{
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/stores/roomsStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ type Attendee = {
export type Room = {
meetingID: string
meetingName: string
startTime: number
startTime: string
participantCount: number
attendees: Attendee[]
joinLink: string
Expand Down

0 comments on commit 7d72b50

Please sign in to comment.