tests

Author: Mateo Ivankovic

server/src/.mockery.yaml

@@ -41,6 +41,7 @@ packages:
     interfaces:
       SessionService:
       SessionDatabase:
+      SessionApi:
 
   scrumlr.io/server/sessionrequests:
     interfaces:
@@ -52,6 +53,7 @@ packages:
     interfaces:
       UserService:
       UserDatabase:
+      UsersApi:
 
   scrumlr.io/server/notes:
     interfaces:

server/src/api/board_templates_test.go

@@ -19,6 +19,8 @@ import (
 	"scrumlr.io/server/columntemplates"
 	"scrumlr.io/server/common"
 	"scrumlr.io/server/identifiers"
+	"scrumlr.io/server/serviceinitialize"
+	"scrumlr.io/server/sessions"
 	"scrumlr.io/server/users"
 )
 
@@ -388,13 +390,30 @@ func TestTemplateRoutesMiddlewareIntegration(t *testing.T) {
 			mockBoardTemplates.EXPECT().Update(mock.Anything, mock.Anything).Return(mockTemplate, nil).Maybe()
 			mockBoardTemplates.EXPECT().Delete(mock.Anything, mock.Anything).Return(nil).Maybe()
 
+			sessionApiMock := sessions.NewMockSessionApi(t)
+			next := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				w.WriteHeader(http.StatusOK)
+			})
+
+			sessionApiMock.EXPECT().BoardParticipantContext(mock.Anything).Return(next)
+			sessionApiMock.EXPECT().BoardModeratorContext(mock.Anything).Return(next)
+			sessionServiceMock := sessions.NewMockSessionService(t)
+
+			initializer := serviceinitialize.NewServiceInitializer(nil, nil)
+			middleware := initializer.InitializeContextService(false)
+			apiInitializer := serviceinitialize.NewApiInitializer(middleware, "/")
+			userApi := apiInitializer.InitializeUserApi(mockUsers, sessionServiceMock, false, false)
+			routesInitializer := serviceinitialize.NewRoutesInitializer()
+			userRoutes := routesInitializer.InitializeUserRoutes(userApi, sessionApiMock)
+			sessionRoutes := routesInitializer.InitializeSessionRoutes(sessionApiMock)
+
 			// Use the actual router from router.go with minimal mocked dependencies
-			r := New(
-				"/", // basePath
-				nil, // realtime (not needed for templates)
-				mockAuth,
-				nil,
-				nil,                              // auth
+			s := New(
+				"/",      // basePath
+				nil,      // realtime (not needed for templates)
+				mockAuth, // auth
+				userRoutes,
+				sessionRoutes,
 				nil,                              // boards
 				nil,                              // columns
 				nil,                              // votings
@@ -441,7 +460,7 @@ func TestTemplateRoutesMiddlewareIntegration(t *testing.T) {
 			rr := httptest.NewRecorder()
 
 			// Execute request
-			r.ServeHTTP(rr, req)
+			s.ServeHTTP(rr, req)
 
 			// Verify status
 			assert.Equal(t, tt.expectedStatus, rr.Code, "Expected status %d for %s %s, got %d", tt.expectedStatus, tt.method, tt.path, rr.Code)

server/src/api/json_parse_test.go

@@ -64,10 +64,6 @@ func (suite *JSONErrTestSuite) TestJSONErrs() {
 			name:    "boards.updateBoard",
 			handler: func(s *Server) func(w http.ResponseWriter, r *http.Request) { return s.updateBoard },
 		},
-		{
-			name:    "board_sessions.updateBoardSessions",
-			handler: func(s *Server) func(w http.ResponseWriter, r *http.Request) { return s.updateBoardSessions },
-		},
 		{
 			name:    "board_session_request.updateBoardSessionRequest",
 			handler: func(s *Server) func(w http.ResponseWriter, r *http.Request) { return s.updateBoardSessionRequest },
@@ -83,7 +79,7 @@ func (suite *JSONErrTestSuite) TestJSONErrs() {
 				"id": %s
 				}`))
 
-			req.req = logger.InitTestLoggerRequest(req.Request())
+			req.Req = logger.InitTestLoggerRequest(req.Request())
 			req.AddToContext(identifiers.BoardIdentifier, mockUUID).
 				AddToContext(identifiers.UserIdentifier, mockUUID).
 				AddToContext(identifiers.NoteIdentifier, mockUUID).

server/src/api/router.go

@@ -319,7 +319,7 @@ func (s *Server) initBoardSessionResources(r chi.Router) {
 
 			r.Post("/", s.joinBoard) //board
 		})
-
+		r.Mount("/", s.sessionRoutes)
 	})
 }
 

server/src/main.go

@@ -8,7 +8,6 @@ import (
   "os"
   "strings"
 
-  "github.com/go-chi/chi/v5"
   "go.uber.org/zap"
   "scrumlr.io/server/common"
   "scrumlr.io/server/initialize"
@@ -398,8 +397,6 @@ func run(c *cli.Context) error {
     return errors.New("you may not start the application without a session secret if an authentication provider is configured")
   }
 
-  r := chi.NewRouter()
-
   bun := initialize.InitializeBun(db, logger.GetLogLevel())
   initializer := serviceinitialize.NewServiceInitializer(bun, rt)
 
@@ -433,11 +430,11 @@ func run(c *cli.Context) error {
 
   middleware := initializer.InitializeContextService(c.Bool("disable-anonymous-login"))
 
-  apiInitializer := serviceinitialize.NewApiInitializer(middleware, r, basePath)
+  apiInitializer := serviceinitialize.NewApiInitializer(middleware, basePath)
   sessionApi := apiInitializer.InitializeSessionApi(sessionService)
   userApi := apiInitializer.InitializeUserApi(userService, sessionService, c.Bool("allow-anonymous-board-creation"), c.Bool("allow-anonymous-custom-templates"))
 
-  routesInitializer := serviceinitialize.NewRoutesInitializer(middleware)
+  routesInitializer := serviceinitialize.NewRoutesInitializer()
   userRoutes := routesInitializer.InitializeUserRoutes(userApi, sessionApi)
   sessionRoutes := routesInitializer.InitializeSessionRoutes(sessionApi)
   s := api.New(
@@ -468,12 +465,6 @@ func run(c *cli.Context) error {
     c.Bool("allow-anonymous-board-creation"),
     c.Bool("auth-enable-experimental-file-system-store"),
   )
-  s.Mount("/v2/", r)
-
-  chi.Walk(s, func(method string, route string, handler http.Handler, middlewares ...func(http.Handler) http.Handler) error {
-    fmt.Printf("[%s]: '%s' has %d middlewares\n", method, route, len(middlewares))
-    return nil
-  })
 
   port := fmt.Sprintf(":%d", c.Int("port"))
   logger.Get().Infow("starting server", "base-path", basePath, "port", port)