refactor: Change session create

server/src/api/boards.go

@@ -215,7 +215,7 @@ func (s *Server) joinBoard(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if b.AccessPolicy == boards.Public {
-		_, err := s.sessions.Create(ctx, board, user)
+		_, err := s.sessions.Create(ctx, sessions.BoardSessionCreateRequest{Board: board, User: user, Role: common.ParticipantRole})
 		if err != nil {
 			span.SetStatus(codes.Error, "failed to create session")
 			span.RecordError(err)
@@ -251,7 +251,7 @@ func (s *Server) joinBoard(w http.ResponseWriter, r *http.Request) {
 		}
 		encodedPassphrase := common.Sha512BySalt(body.Passphrase, *b.Salt)
 		if encodedPassphrase == *b.Passphrase {
-			_, err := s.sessions.Create(ctx, board, user)
+			_, err := s.sessions.Create(ctx, sessions.BoardSessionCreateRequest{Board: board, User: user, Role: common.ParticipantRole})
 			if err != nil {
 				span.SetStatus(codes.Error, "failed to create session")
 				span.RecordError(err)

server/src/api/boards_test.go

@@ -293,7 +293,8 @@ func (suite *BoardTestSuite) TestJoinBoard() {
 				}
 			} else {
 				if !te.sessionExists {
-					sessionMock.EXPECT().Create(mock.Anything, boardID, userID).Return(new(sessions.BoardSession), te.err)
+					sessionMock.EXPECT().Create(mock.Anything, sessions.BoardSessionCreateRequest{Board: boardID, User: userID, Role: common.ParticipantRole}).
+						Return(new(sessions.BoardSession), te.err)
 				}
 
 			}

server/src/sessionrequests/service.go

@@ -107,7 +107,7 @@ func (service *BoardSessionRequestService) Update(ctx context.Context, body Boar
 	}
 
 	if request.Status == RequestAccepted {
-		_, err := service.sessionService.Create(ctx, request.Board, request.User)
+		_, err := service.sessionService.Create(ctx, sessions.BoardSessionCreateRequest{Board: request.Board, User: request.User, Role: common.ParticipantRole})
 		if err != nil {
 			span.SetStatus(codes.Error, "failed to create board session")
 			span.RecordError(err)

server/src/sessionrequests/service_test.go

@@ -9,6 +9,7 @@ import (
 	"testing"
 	"time"
 
+	"scrumlr.io/server/common"
 	"scrumlr.io/server/sessions"
 
 	"github.com/google/uuid"
@@ -264,6 +265,7 @@ func TestCreateSessionRequest_DBError(t *testing.T) {
 func TestUpdatesessionRequest(t *testing.T) {
 	boardId := uuid.New()
 	userId := uuid.New()
+	role := common.ParticipantRole
 
 	user := sessions.User{
 		ID: userId,
@@ -273,8 +275,8 @@ func TestUpdatesessionRequest(t *testing.T) {
 		Return(DatabaseBoardSessionRequest{Board: boardId, User: userId, Status: RequestAccepted}, nil)
 
 	mockSessionService := sessions.NewMockSessionService(t)
-	mockSessionService.EXPECT().Create(mock.Anything, boardId, userId).
-		Return(&sessions.BoardSession{Board: boardId, User: user}, nil)
+	mockSessionService.EXPECT().Create(mock.Anything, sessions.BoardSessionCreateRequest{Board: boardId, User: userId, Role: role}).
+		Return(&sessions.BoardSession{Board: boardId, User: user, Role: role}, nil)
 
 	mockBroker := realtime.NewMockClient(t)
 	mockBroker.EXPECT().Publish(mock.Anything, mock.AnythingOfType("string"), mock.Anything).Return(nil)

server/src/sessions/api_sessions.go

@@ -8,7 +8,7 @@ import (
 )
 
 type SessionService interface {
-	Create(ctx context.Context, boardID, userID uuid.UUID) (*BoardSession, error)
+	Create(ctx context.Context, body BoardSessionCreateRequest) (*BoardSession, error)
 	Update(ctx context.Context, body BoardSessionUpdateRequest) (*BoardSession, error)
 	UpdateAll(ctx context.Context, body BoardSessionsUpdateRequest) ([]*BoardSession, error)
 	UpdateUserBoards(ctx context.Context, body BoardSessionUpdateRequest) ([]*BoardSession, error)

server/src/sessions/database_session_test.go

@@ -3,7 +3,6 @@ package sessions
 import (
 	"context"
 	"database/sql"
-	"errors"
 	"log"
 	"testing"
 
@@ -82,20 +81,6 @@ func (suite *DatabaseSessionTestSuite) Test_Database_CreateSession_Moderator() {
 	assert.NotNil(t, dbSession.CreatedAt)
 }
 
-func (suite *DatabaseSessionTestSuite) Test_Database_CreateSession_Owner() {
-	t := suite.T()
-	database := NewSessionDatabase(suite.db)
-
-	userId := suite.users["Luke"].id
-	boardId := suite.boards["Write"].id
-
-	dbSession, err := database.Create(context.Background(), DatabaseBoardSessionInsert{User: userId, Board: boardId, Role: common.OwnerRole})
-
-	assert.NotNil(t, err)
-	assert.Equal(t, err, errors.New("not allowed to create board session with owner role"))
-	assert.Equal(t, DatabaseBoardSession{}, dbSession)
-}
-
 func (suite *DatabaseSessionTestSuite) Test_Database_CreateSession_Duplicate() {
 	t := suite.T()
 	database := NewSessionDatabase(suite.db)

server/src/sessions/database_sessions.go

@@ -2,7 +2,6 @@ package sessions
 
 import (
 	"context"
-	"errors"
 
 	"github.com/google/uuid"
 	"github.com/uptrace/bun"
@@ -22,10 +21,6 @@ func NewSessionDatabase(database *bun.DB) SessionDatabase {
 }
 
 func (database *SessionDB) Create(ctx context.Context, boardSession DatabaseBoardSessionInsert) (DatabaseBoardSession, error) {
-	if boardSession.Role == common.OwnerRole {
-		return DatabaseBoardSession{}, errors.New("not allowed to create board session with owner role")
-	}
-
 	var session DatabaseBoardSession
 	insertQuery := database.db.NewInsert().
 		Model(&boardSession).

server/src/sessions/dto_sessions.go

@@ -40,6 +40,12 @@ type BoardSession struct {
 	Board uuid.UUID `json:"-"`
 }
 
+type BoardSessionCreateRequest struct {
+	Board uuid.UUID
+	User  uuid.UUID
+	Role  common.SessionRole
+}
+
 // BoardSessionUpdateRequest represents the request to update a single participant.
 type BoardSessionUpdateRequest struct {
 

server/src/sessions/service_sessions.go

@@ -55,30 +55,31 @@ func NewSessionService(db SessionDatabase, rt *realtime.Broker, columnService co
 	return service
 }
 
-func (service *BoardSessionService) Create(ctx context.Context, boardID, userID uuid.UUID) (*BoardSession, error) {
+func (service *BoardSessionService) Create(ctx context.Context, body BoardSessionCreateRequest) (*BoardSession, error) {
 	log := logger.FromContext(ctx)
 	ctx, span := tracer.Start(ctx, "scrumlr.sessions.service.create")
 	defer span.End()
 
 	span.SetAttributes(
-		attribute.String("scrumlr.sessions.service.create.board", boardID.String()),
-		attribute.String("scrumlr.sessions.service.create.user", userID.String()),
+		attribute.String("scrumlr.sessions.service.create.board", body.Board.String()),
+		attribute.String("scrumlr.sessions.service.create.user", body.User.String()),
+		attribute.String("scrumlr.sessions.service.create.role", string(body.Role)),
 	)
 
 	session, err := service.database.Create(ctx, DatabaseBoardSessionInsert{
-		Board: boardID,
-		User:  userID,
-		Role:  common.ParticipantRole,
+		Board: body.Board,
+		User:  body.User,
+		Role:  body.Role,
 	})
 
 	if err != nil {
 		span.SetStatus(codes.Error, "failed to create board session")
 		span.RecordError(err)
-		log.Errorw("unable to create board session", "board", boardID, "user", userID, "error", err)
+		log.Errorw("unable to create board session", "board", body.Board, "user", body.User, "error", err)
 		return nil, err
 	}
 
-	service.createdSession(ctx, boardID, session)
+	service.createdSession(ctx, body.Board, session)
 
 	sessionCreatedCounter.Add(ctx, 1)
 	return new(BoardSession).From(session), err
@@ -201,7 +202,7 @@ func (service *BoardSessionService) UpdateUserBoards(ctx context.Context, body B
 
 	connectedBoards, err := service.database.GetUserConnectedBoards(ctx, body.User)
 	if err != nil {
-		span.SetStatus(codes.Error, "failed to update all sessions")
+		span.SetStatus(codes.Error, "failed to get connected boards")
 		span.RecordError(err)
 		return nil, err
 	}

server/src/sessions/service_sessions_integration_test.go

@@ -57,6 +57,7 @@ func (suite *SessionServiceIntegrationTestSuite) Test_Create() {
 
 	boardId := suite.boards["Write"].id
 	userId := suite.users["Luke"].ID
+	role := common.ParticipantRole
 
 	broker, err := realtime.NewNats(suite.natsConnectionString)
 	if err != nil {
@@ -74,19 +75,19 @@ func (suite *SessionServiceIntegrationTestSuite) Test_Create() {
 	sessionDatabase := NewSessionDatabase(suite.db)
 	sessionService := NewSessionService(sessionDatabase, broker, columnService, noteService)
 
-	session, err := sessionService.Create(ctx, boardId, userId)
+	session, err := sessionService.Create(ctx, BoardSessionCreateRequest{Board: boardId, User: userId, Role: role})
 
 	assert.Nil(t, err)
 	assert.Equal(t, boardId, session.Board)
 	assert.Equal(t, userId, session.User.ID)
-	assert.Equal(t, common.ParticipantRole, session.Role)
+	assert.Equal(t, role, session.Role)
 
 	msg := <-events
 	assert.Equal(t, realtime.BoardEventParticipantCreated, msg.Type)
 	sessionData, err := technical_helper.Unmarshal[BoardSession](msg.Data)
 	assert.Nil(t, err)
 	assert.Equal(t, userId, sessionData.User.ID)
-	assert.Equal(t, common.ParticipantRole, sessionData.Role)
+	assert.Equal(t, role, sessionData.Role)
 }
 
 func (suite *SessionServiceIntegrationTestSuite) Test_Update() {