fix: update participant and room metadata structures to use non-pointer types

Author: kaitoyama

router/v3/qall.go

@@ -93,7 +93,7 @@ func (h *Handlers) PlaySoundboardItem(c echo.Context) error {
 	// 2-2) ルームに参加しているか確認
 	isParticipant := false
 	for _, participant := range roomState.Participants {
-		if *participant.Name == userID.String() {
+		if participant.Name == userID.String() {
 			isParticipant = true
 			break
 		}
@@ -189,7 +189,7 @@ func (h *Handlers) PatchRoomMetadata(c echo.Context) error {
 	// Verify user is a participant
 	isParticipant := false
 	for _, participant := range targetRoom.Participants {
-		if *participant.Name == userID.String() {
+		if participant.Name == userID.String() {
 			isParticipant = true
 			break
 		}
@@ -202,7 +202,7 @@ func (h *Handlers) PatchRoomMetadata(c echo.Context) error {
 	// Update metadata
 	metadata := qall.Metadata{
 		Status:    req.Metadata,
-		IsWebinar: *targetRoom.IsWebinar,
+		IsWebinar: targetRoom.IsWebinar,
 	}
 
 	_, err = livekitClient.UpdateRoomMetadata(c.Request().Context(), &livekit.UpdateRoomMetadataRequest{
@@ -250,8 +250,8 @@ func (h *Handlers) PatchRoomParticipants(c echo.Context) error {
 	// userがcanPublishかどうかを確認
 	canPublish := false
 	for _, participant := range roomState.Participants {
-		if *participant.Name == userID.String() {
-			canPublish = *participant.CanPublish
+		if participant.Name == userID.String() {
+			canPublish = participant.CanPublish
 			break
 		}
 	}
@@ -263,10 +263,10 @@ func (h *Handlers) PatchRoomParticipants(c echo.Context) error {
 	livekitClient := lksdk.NewRoomServiceClient(h.Config.LiveKitHost, h.Config.LiveKitAPIKey, h.Config.LiveKitAPISecret)
 	for _, participant := range req.Users {
 		for _, roomParticipant := range roomState.Participants {
-			if *roomParticipant.Name == participant.UserID {
+			if roomParticipant.Name == participant.UserID {
 				_, err := livekitClient.UpdateParticipant(c.Request().Context(), &livekit.UpdateParticipantRequest{
 					Room:     roomID.String(),
-					Identity: *roomParticipant.Identity,
+					Identity: roomParticipant.Identity,
 					Permission: &livekit.ParticipantPermission{
 						CanPublish: participant.CanPublish,
 					},
@@ -275,7 +275,7 @@ func (h *Handlers) PatchRoomParticipants(c echo.Context) error {
 					failedUsers[participant.UserID] = err.Error()
 				} else {
 					succeedUsers = append(succeedUsers, participant.UserID)
-					h.QallRepo.UpdateParticipantCanPublish(roomID.String(), *roomParticipant.Identity, participant.CanPublish)
+					h.QallRepo.UpdateParticipantCanPublish(roomID.String(), roomParticipant.Identity, participant.CanPublish)
 				}
 			}
 		}
@@ -330,7 +330,7 @@ func (h *Handlers) GetLiveKitToken(c echo.Context) error {
 
 	// ルームが存在して、webinar=true の場合はCanPublish=false
 	isExistingRoom := roomState != nil
-	if isExistingRoom && *roomState.IsWebinar {
+	if isExistingRoom && roomState.IsWebinar {
 		isWebinar = true
 	}
 
@@ -341,8 +341,8 @@ func (h *Handlers) GetLiveKitToken(c echo.Context) error {
 	isAlreadyCanPublish := false
 	if roomState != nil {
 		for _, participant := range roomState.Participants {
-			if *participant.Name == userID.String() {
-				isAlreadyCanPublish = *participant.CanPublish
+			if participant.Name == userID.String() {
+				isAlreadyCanPublish = participant.CanPublish
 				break
 			}
 		}
@@ -391,7 +391,7 @@ func (h *Handlers) GetLiveKitToken(c echo.Context) error {
 		// ルームが存在しない場合は新規作成
 		emptyMetadata := ""
 		roomWithParticipants := qall.RoomWithParticipants{
-			IsWebinar:    &isWebinar,
+			IsWebinar:    isWebinar,
 			Metadata:     &emptyMetadata,
 			RoomID:       roomID,
 			Participants: []qall.Participant{},

service/qall/roomstate.go

@@ -23,22 +23,22 @@ type Participant struct {
 	Attributes *map[string]string `json:"attributes,omitempty"`
 
 	// CanPublish 発言権限
-	CanPublish *bool `json:"canPublish,omitempty"`
+	CanPublish bool `json:"canPublish"`
 
 	// Identity ユーザーID_RandomUUID
-	Identity *string `json:"identity,omitempty"`
+	Identity string `json:"identity"`
 
 	// JoinedAt 参加した時刻
-	JoinedAt *time.Time `json:"joinedAt,omitempty"`
+	JoinedAt time.Time `json:"joinedAt"`
 
 	// Name 表示名
-	Name *string `json:"name,omitempty"`
+	Name string `json:"name"`
 }
 
 // RoomWithParticipants defines model for RoomWithParticipants.
 type RoomWithParticipants struct {
 	// IsWebinar ウェビナールームかどうか
-	IsWebinar *bool `json:"isWebinar,omitempty"`
+	IsWebinar bool `json:"isWebinar"`
 
 	// Metadata ルームに関連付けられたカスタム属性
 	Metadata     *string       `json:"metadata,omitempty"`

service/qall/roomstate_impl.go

@@ -40,11 +40,11 @@ func (r *Repository) AddParticipantToRoomState(room *livekit.Room, participant *
 		if roomState.RoomID.String() == room.Name {
 			t := time.Unix(participant.JoinedAt, 0).In(time.FixedZone("Asia/Tokyo", 9*60*60))
 			r.RoomState[i].Participants = append(r.RoomState[i].Participants, Participant{
-				Identity:   &participant.Identity,
-				JoinedAt:   &t,
-				Name:       &participant.Name,
+				Identity:   participant.Identity,
+				JoinedAt:   t,
+				Name:       participant.Name,
 				Attributes: &participant.Attributes,
-				CanPublish: &participant.Permission.CanPublish,
+				CanPublish: participant.Permission.CanPublish,
 			})
 
 			if r.Hub != nil {
@@ -66,8 +66,8 @@ func (r *Repository) UpdateParticipantCanPublish(roomID string, participantID st
 	for i, roomState := range r.RoomState {
 		if roomState.RoomID.String() == roomID {
 			for j, participant := range roomState.Participants {
-				if *participant.Identity == participantID {
-					r.RoomState[i].Participants[j].CanPublish = &canPublish
+				if participant.Identity == participantID {
+					r.RoomState[i].Participants[j].CanPublish = canPublish
 
 					if r.Hub != nil {
 						r.Hub.Publish(hub.Message{
@@ -91,14 +91,14 @@ func (r *Repository) UpdateParticipant(roomID string, participant *livekit.Parti
 	for i, roomState := range r.RoomState {
 		if roomState.RoomID.String() == roomID {
 			for j, p := range roomState.Participants {
-				if *p.Identity == participant.Identity {
+				if p.Identity == participant.Identity {
 					t := time.Unix(participant.JoinedAt, 0).In(time.FixedZone("Asia/Tokyo", 9*60*60))
 					r.RoomState[i].Participants[j] = Participant{
-						Identity:   &participant.Identity,
-						JoinedAt:   &t,
-						Name:       &participant.Name,
+						Identity:   participant.Identity,
+						JoinedAt:   t,
+						Name:       participant.Name,
 						Attributes: &participant.Attributes,
-						CanPublish: &participant.Permission.CanPublish,
+						CanPublish: participant.Permission.CanPublish,
 					}
 
 					if r.Hub != nil {
@@ -123,7 +123,7 @@ func (r *Repository) RemoveParticipant(roomID string, participantID string) {
 	for i, roomState := range r.RoomState {
 		if roomState.RoomID.String() == roomID {
 			for j, participant := range roomState.Participants {
-				if *participant.Identity == participantID {
+				if participant.Identity == participantID {
 					r.RoomState[i].Participants = slices.Delete(r.RoomState[i].Participants, j, j+1)
 
 					if r.Hub != nil {
@@ -244,9 +244,9 @@ func (r *Repository) GetRoomsWithParticipantsByLiveKitServer(ctx context.Context
 		for _, p := range partResp.Participants {
 			t := time.Unix(p.JoinedAt, 0).In(time.FixedZone("Asia/Tokyo", 9*60*60))
 			Participants = append(Participants, Participant{
-				Identity:   &p.Identity,
-				JoinedAt:   &t,
-				Name:       &p.Name,
+				Identity:   p.Identity,
+				JoinedAt:   t,
+				Name:       p.Name,
 				Attributes: &p.Attributes,
 			})
 		}
@@ -265,7 +265,7 @@ func (r *Repository) GetRoomsWithParticipantsByLiveKitServer(ctx context.Context
 
 		roomWithParticipants = append(roomWithParticipants, RoomWithParticipants{
 			Metadata:     &metadata.Status,
-			IsWebinar:    &metadata.IsWebinar,
+			IsWebinar:    metadata.IsWebinar,
 			RoomID:       roomID,
 			Participants: Participants,
 		})