Update

internal/service/auth_service.go

@@ -58,7 +58,7 @@ func (s *AuthServiceImpl) Login(ctx context.Context, req *contract.LoginRequest)
 
 	roles, _ := s.userProcessor.GetUserRoles(ctx, userResponse.ID)
 	permCodes, _ := s.userProcessor.GetUserPermissionCodes(ctx, userResponse.ID)
-	departments, _ := s.userProcessor.GetUserDepartments(ctx, userResponse.ID)
+	// Departments are now preloaded, so they're already in userResponse
 
 	token, expiresAt, err := s.generateToken(userResponse, roles, permCodes)
 	if err != nil {
@@ -71,7 +71,7 @@ func (s *AuthServiceImpl) Login(ctx context.Context, req *contract.LoginRequest)
 		User:        *userResponse,
 		Roles:       roles,
 		Permissions: permCodes,
-		Departments: departments,
+		Departments: userResponse.DepartmentResponse,
 	}, nil
 }
 
@@ -90,6 +90,7 @@ func (s *AuthServiceImpl) ValidateToken(tokenString string) (*contract.UserRespo
 		return nil, fmt.Errorf("user account is deactivated")
 	}
 
+	// Departments are now preloaded, so they're already in the response
 	return userResponse, nil
 }
 
@@ -115,14 +116,14 @@ func (s *AuthServiceImpl) RefreshToken(ctx context.Context, tokenString string)
 		return nil, fmt.Errorf("failed to generate token: %w", err)
 	}
 
-	departments, _ := s.userProcessor.GetUserDepartments(ctx, userResponse.ID)
+	// Departments are now preloaded, so they're already in userResponse
 	return &contract.LoginResponse{
 		Token:       newToken,
 		ExpiresAt:   expiresAt,
 		User:        *userResponse,
 		Roles:       roles,
 		Permissions: permCodes,
-		Departments: departments,
+		Departments: userResponse.DepartmentResponse,
 	}, nil
 }
 

internal/service/letter_service.go

@@ -16,7 +16,7 @@ type LetterProcessor interface {
 	SoftDeleteIncomingLetter(ctx context.Context, id uuid.UUID) error
 
 	CreateDispositions(ctx context.Context, req *contract.CreateLetterDispositionRequest) (*contract.ListDispositionsResponse, error)
-	ListDispositionsByLetter(ctx context.Context, letterID uuid.UUID) (*contract.ListDispositionsResponse, error)
+	GetEnhancedDispositionsByLetter(ctx context.Context, letterID uuid.UUID) (*contract.ListEnhancedDispositionsResponse, error)
 
 	CreateDiscussion(ctx context.Context, letterID uuid.UUID, req *contract.CreateLetterDiscussionRequest) (*contract.LetterDiscussionResponse, error)
 	UpdateDiscussion(ctx context.Context, letterID uuid.UUID, discussionID uuid.UUID, req *contract.UpdateLetterDiscussionRequest) (*contract.LetterDiscussionResponse, error)
@@ -50,8 +50,8 @@ func (s *LetterServiceImpl) CreateDispositions(ctx context.Context, req *contrac
 	return s.processor.CreateDispositions(ctx, req)
 }
 
-func (s *LetterServiceImpl) ListDispositionsByLetter(ctx context.Context, letterID uuid.UUID) (*contract.ListDispositionsResponse, error) {
-	return s.processor.ListDispositionsByLetter(ctx, letterID)
+func (s *LetterServiceImpl) GetEnhancedDispositionsByLetter(ctx context.Context, letterID uuid.UUID) (*contract.ListEnhancedDispositionsResponse, error) {
+	return s.processor.GetEnhancedDispositionsByLetter(ctx, letterID)
 }
 
 func (s *LetterServiceImpl) CreateDiscussion(ctx context.Context, letterID uuid.UUID, req *contract.CreateLetterDiscussionRequest) (*contract.LetterDiscussionResponse, error) {

internal/service/master_service.go

@@ -140,8 +140,8 @@ func (s *MasterServiceImpl) UpdateInstitution(ctx context.Context, id uuid.UUID,
 func (s *MasterServiceImpl) DeleteInstitution(ctx context.Context, id uuid.UUID) error {
 	return s.institutionRepo.Delete(ctx, id)
 }
-func (s *MasterServiceImpl) ListInstitutions(ctx context.Context) (*contract.ListInstitutionsResponse, error) {
-	list, err := s.institutionRepo.List(ctx)
+func (s *MasterServiceImpl) ListInstitutions(ctx context.Context, req *contract.ListInstitutionsRequest) (*contract.ListInstitutionsResponse, error) {
+	list, err := s.institutionRepo.ListWithSearch(ctx, req.Search)
 	if err != nil {
 		return nil, err
 	}

internal/service/user_processor.go

@@ -26,4 +26,7 @@ type UserProcessor interface {
 
 	// New optimized listing
 	ListUsersWithFilters(ctx context.Context, req *contract.ListUsersRequest) ([]contract.UserResponse, int, error)
+
+	// Get active users for mention purposes
+	GetActiveUsersForMention(ctx context.Context, search *string, limit int) ([]contract.UserResponse, error)
 }

internal/service/user_service.go

@@ -96,3 +96,8 @@ func (s *UserServiceImpl) ListTitles(ctx context.Context) (*contract.ListTitlesR
 	}
 	return &contract.ListTitlesResponse{Titles: transformer.TitlesToContract(titles)}, nil
 }
+
+// GetActiveUsersForMention retrieves active users for mention purposes
+func (s *UserServiceImpl) GetActiveUsersForMention(ctx context.Context, search *string, limit int) ([]contract.UserResponse, error) {
+	return s.userProcessor.GetActiveUsersForMention(ctx, search, limit)
+}