Skip to content

Commit 6178fd0

Browse files
caiordjesus“Caio
andauthored
fix(adapters services): duplicate constructors for room and operation manager (#319)
Co-authored-by: “Caio <“[email protected]”>
1 parent f50ef87 commit 6178fd0

File tree

1 file changed

+3
-22
lines changed

1 file changed

+3
-22
lines changed

internal/service/adapters.go

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,9 @@ import (
3131

3232
scheduleradapters "github.com/topfreegames/maestro/internal/adapters/scheduler"
3333

34-
"github.com/topfreegames/maestro/internal/core/services/room_manager"
35-
"go.uber.org/zap"
36-
3734
"github.com/topfreegames/maestro/internal/core/operations"
3835
"github.com/topfreegames/maestro/internal/core/services/operation_manager"
36+
"github.com/topfreegames/maestro/internal/core/services/room_manager"
3937

4038
"github.com/go-pg/pg"
4139
"github.com/go-redis/redis/v8"
@@ -76,28 +74,11 @@ const (
7674
)
7775

7876
func NewOperationManager(flow ports.OperationFlow, storage ports.OperationStorage, operationDefinitionConstructors map[string]operations.DefinitionConstructor, leaseStorage ports.OperationLeaseStorage, config operation_manager.OperationManagerConfig, schedulerStorage ports.SchedulerStorage) ports.OperationManager {
79-
return &operation_manager.OperationManager{
80-
Flow: flow,
81-
Storage: storage,
82-
OperationDefinitionConstructors: operationDefinitionConstructors,
83-
OperationCancelFunctions: operation_manager.NewOperationCancelFunctions(),
84-
LeaseStorage: leaseStorage,
85-
Config: config,
86-
SchedulerStorage: schedulerStorage,
87-
}
77+
return operation_manager.New(flow, storage, operationDefinitionConstructors, leaseStorage, config, schedulerStorage)
8878
}
8979

9080
func NewRoomManager(clock ports.Clock, portAllocator ports.PortAllocator, roomStorage ports.RoomStorage, instanceStorage ports.GameRoomInstanceStorage, runtime ports.Runtime, eventsService ports.EventsService, config room_manager.RoomManagerConfig) ports.RoomManager {
91-
return &room_manager.RoomManager{
92-
Clock: clock,
93-
PortAllocator: portAllocator,
94-
RoomStorage: roomStorage,
95-
InstanceStorage: instanceStorage,
96-
Runtime: runtime,
97-
EventsService: eventsService,
98-
Config: config,
99-
Logger: zap.L().With(zap.String("service", "rooms_api")),
100-
}
81+
return room_manager.New(clock, portAllocator, roomStorage, instanceStorage, runtime, eventsService, config)
10182
}
10283

10384
func NewEventsForwarder(c config.Config) (ports.EventsForwarder, error) {

0 commit comments

Comments
 (0)