error fix

temur abdurahmanov · temur abdurahmanov · commit 56735ce86501 · 2024-12-30T11:05:05.000+03:00
diff --git a/internal/handler/tcp/server_settings.go b/internal/handler/tcp/server_settings.go
@@ -48,7 +48,7 @@ func (r *ServerSettings) CreateRoom(ctx context.Context, token string, createRoo
 	return
 }
 
-func (r *ServerSettings) GetDeletedRooms(token string, ids []types.GetDeletedRooms) (deletedIds []types.GetDeletedRooms, err error) {
+func (r *ServerSettings) GetDeletedRooms(ctx context.Context, token string, ids []types.GetDeletedRooms) (deletedIds []types.GetDeletedRooms, err error) {
 	return r.server.GetDeletedRooms(token, ids)
 }
 
diff --git a/pkg/api/server_settings.go b/pkg/api/server_settings.go
@@ -32,5 +32,5 @@ type ServerSettings interface {
 	CreateRoom(ctx context.Context, token string, createRoom types.CreateRoomRequest) (err error)
 	// @tg http-headers=token|Token
 	// @tg summary=`SetNotifyServer`
-	GetDeletedRooms(token string, ids []types.GetDeletedRooms) (deletedIds []types.GetDeletedRooms, err error)
+	GetDeletedRooms(ctx context.Context, token string, ids []types.GetDeletedRooms) (deletedIds []types.GetDeletedRooms, err error)
 }
diff --git a/pkg/clients/udpGameServer/serversettings-jsonrpc.go b/pkg/clients/udpGameServer/serversettings-jsonrpc.go
@@ -237,7 +237,7 @@ func (cli *ClientServerSettings) ReqCreateRoom(ctx context.Context, callback ret
 	return
 }
 
-func (cli *ClientServerSettings) GetDeletedRooms(token string, ids []types.GetDeletedRooms) (deletedIds []types.GetDeletedRooms, err error) {
+func (cli *ClientServerSettings) GetDeletedRooms(ctx context.Context, token string, ids []types.GetDeletedRooms) (deletedIds []types.GetDeletedRooms, err error) {
 
 	request := requestServerSettingsGetDeletedRooms{
 		Ids:   ids,
diff --git a/pkg/transport/serversettings-logger.go b/pkg/transport/serversettings-logger.go
@@ -103,7 +103,7 @@ func (m loggerServerSettings) CreateRoom(ctx context.Context, token string, crea
 	return m.next.CreateRoom(ctx, token, createRoom)
 }
 
-func (m loggerServerSettings) GetDeletedRooms(token string, ids []types.GetDeletedRooms) (deletedIds []types.GetDeletedRooms, err error) {
+func (m loggerServerSettings) GetDeletedRooms(ctx context.Context, token string, ids []types.GetDeletedRooms) (deletedIds []types.GetDeletedRooms, err error) {
 	logger := log.Ctx(ctx).With().Str("service", "ServerSettings").Str("method", "getDeletedRooms").Logger()
 	defer func(begin time.Time) {
 		logHandle := func(ev *zerolog.Event) {
@@ -122,5 +122,5 @@ func (m loggerServerSettings) GetDeletedRooms(token string, ids []types.GetDelet
 		}
 		logger.Info().Func(logHandle).Msg("call getDeletedRooms")
 	}(time.Now())
-	return m.next.GetDeletedRooms(token, ids)
+	return m.next.GetDeletedRooms(ctx, token, ids)
 }
diff --git a/pkg/transport/serversettings-middleware.go b/pkg/transport/serversettings-middleware.go
@@ -11,7 +11,7 @@ type ServerSettingsGetConnectionsNum func(ctx context.Context, token string) (co
 type ServerSettingsHealthCheck func(ctx context.Context, token string) (exists bool, err error)
 type ServerSettingsGetServerSettings func(ctx context.Context, token string) (settings types.Settings, err error)
 type ServerSettingsCreateRoom func(ctx context.Context, token string, createRoom types.CreateRoomRequest) (err error)
-type ServerSettingsGetDeletedRooms func(token string, ids []types.GetDeletedRooms) (deletedIds []types.GetDeletedRooms, err error)
+type ServerSettingsGetDeletedRooms func(ctx context.Context, token string, ids []types.GetDeletedRooms) (deletedIds []types.GetDeletedRooms, err error)
 
 type MiddlewareServerSettings func(next api.ServerSettings) api.ServerSettings
 
diff --git a/pkg/transport/serversettings-server.go b/pkg/transport/serversettings-server.go
@@ -64,8 +64,8 @@ func (srv *serverServerSettings) CreateRoom(ctx context.Context, token string, c
 	return srv.createRoom(ctx, token, createRoom)
 }
 
-func (srv *serverServerSettings) GetDeletedRooms(token string, ids []types.GetDeletedRooms) (deletedIds []types.GetDeletedRooms, err error) {
-	return srv.getDeletedRooms(token, ids)
+func (srv *serverServerSettings) GetDeletedRooms(ctx context.Context, token string, ids []types.GetDeletedRooms) (deletedIds []types.GetDeletedRooms, err error) {
+	return srv.getDeletedRooms(ctx, token, ids)
 }
 
 func (srv *serverServerSettings) WrapGetConnectionsNum(m MiddlewareServerSettingsGetConnectionsNum) {
diff --git a/pkg/transport/serversettings-trace.go b/pkg/transport/serversettings-trace.go
@@ -40,8 +40,8 @@ func (svc traceServerSettings) CreateRoom(ctx context.Context, token string, cre
 	return svc.next.CreateRoom(ctx, token, createRoom)
 }
 
-func (svc traceServerSettings) GetDeletedRooms(token string, ids []types.GetDeletedRooms) (deletedIds []types.GetDeletedRooms, err error) {
+func (svc traceServerSettings) GetDeletedRooms(ctx context.Context, token string, ids []types.GetDeletedRooms) (deletedIds []types.GetDeletedRooms, err error) {
 	span := opentracing.SpanFromContext(ctx)
 	span.SetTag("method", "GetDeletedRooms")
-	return svc.next.GetDeletedRooms(token, ids)
+	return svc.next.GetDeletedRooms(ctx, token, ids)
 }

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ func (r *ServerSettings) CreateRoom(ctx context.Context, token string, createRoo`
`48`	`48`	`return`
`49`	`49`	`}`
`50`	`50`
`51`		`-func (r *ServerSettings) GetDeletedRooms(token string, ids []types.GetDeletedRooms) (deletedIds []types.GetDeletedRooms, err error) {`
	`51`	`+func (r *ServerSettings) GetDeletedRooms(ctx context.Context, token string, ids []types.GetDeletedRooms) (deletedIds []types.GetDeletedRooms, err error) {`
`52`	`52`	`return r.server.GetDeletedRooms(token, ids)`
`53`	`53`	`}`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -32,5 +32,5 @@ type ServerSettings interface {`
`32`	`32`	`CreateRoom(ctx context.Context, token string, createRoom types.CreateRoomRequest) (err error)`
`33`	`33`	`// @tg http-headers=token\|Token`
`34`	`34`	// @tg summary=`SetNotifyServer`
`35`		`- GetDeletedRooms(token string, ids []types.GetDeletedRooms) (deletedIds []types.GetDeletedRooms, err error)`
	`35`	`+ GetDeletedRooms(ctx context.Context, token string, ids []types.GetDeletedRooms) (deletedIds []types.GetDeletedRooms, err error)`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ func (cli *ClientServerSettings) ReqCreateRoom(ctx context.Context, callback ret`
`237`	`237`	`return`
`238`	`238`	`}`
`239`	`239`
`240`		`-func (cli *ClientServerSettings) GetDeletedRooms(token string, ids []types.GetDeletedRooms) (deletedIds []types.GetDeletedRooms, err error) {`
	`240`	`+func (cli *ClientServerSettings) GetDeletedRooms(ctx context.Context, token string, ids []types.GetDeletedRooms) (deletedIds []types.GetDeletedRooms, err error) {`
`241`	`241`
`242`	`242`	`request := requestServerSettingsGetDeletedRooms{`
`243`	`243`	`Ids: ids,`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ func (m loggerServerSettings) CreateRoom(ctx context.Context, token string, crea`
`103`	`103`	`return m.next.CreateRoom(ctx, token, createRoom)`
`104`	`104`	`}`
`105`	`105`
`106`		`-func (m loggerServerSettings) GetDeletedRooms(token string, ids []types.GetDeletedRooms) (deletedIds []types.GetDeletedRooms, err error) {`
	`106`	`+func (m loggerServerSettings) GetDeletedRooms(ctx context.Context, token string, ids []types.GetDeletedRooms) (deletedIds []types.GetDeletedRooms, err error) {`
`107`	`107`	`logger := log.Ctx(ctx).With().Str("service", "ServerSettings").Str("method", "getDeletedRooms").Logger()`
`108`	`108`	`defer func(begin time.Time) {`
`109`	`109`	`logHandle := func(ev *zerolog.Event) {`
`@@ -122,5 +122,5 @@ func (m loggerServerSettings) GetDeletedRooms(token string, ids []types.GetDelet`
`122`	`122`	`}`
`123`	`123`	`logger.Info().Func(logHandle).Msg("call getDeletedRooms")`
`124`	`124`	`}(time.Now())`
`125`		`- return m.next.GetDeletedRooms(token, ids)`
	`125`	`+ return m.next.GetDeletedRooms(ctx, token, ids)`
`126`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,8 @@ func (srv *serverServerSettings) CreateRoom(ctx context.Context, token string, c`
`64`	`64`	`return srv.createRoom(ctx, token, createRoom)`
`65`	`65`	`}`
`66`	`66`
`67`		`-func (srv *serverServerSettings) GetDeletedRooms(token string, ids []types.GetDeletedRooms) (deletedIds []types.GetDeletedRooms, err error) {`
`68`		`- return srv.getDeletedRooms(token, ids)`
	`67`	`+func (srv *serverServerSettings) GetDeletedRooms(ctx context.Context, token string, ids []types.GetDeletedRooms) (deletedIds []types.GetDeletedRooms, err error) {`
	`68`	`+ return srv.getDeletedRooms(ctx, token, ids)`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`func (srv *serverServerSettings) WrapGetConnectionsNum(m MiddlewareServerSettingsGetConnectionsNum) {`
Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,8 @@ func (svc traceServerSettings) CreateRoom(ctx context.Context, token string, cre`
`40`	`40`	`return svc.next.CreateRoom(ctx, token, createRoom)`
`41`	`41`	`}`
`42`	`42`
`43`		`-func (svc traceServerSettings) GetDeletedRooms(token string, ids []types.GetDeletedRooms) (deletedIds []types.GetDeletedRooms, err error) {`
	`43`	`+func (svc traceServerSettings) GetDeletedRooms(ctx context.Context, token string, ids []types.GetDeletedRooms) (deletedIds []types.GetDeletedRooms, err error) {`
`44`	`44`	`span := opentracing.SpanFromContext(ctx)`
`45`	`45`	`span.SetTag("method", "GetDeletedRooms")`
`46`		`- return svc.next.GetDeletedRooms(token, ids)`
	`46`	`+ return svc.next.GetDeletedRooms(ctx, token, ids)`
`47`	`47`	`}`