Skip to content

Commit 8fa4031

Browse files
ravisuhagravisuhag
committed
refactor: rename handler server.go to handler.go, update references
1 parent 013b9d8 commit 8fa4031

23 files changed

Lines changed: 107 additions & 107 deletions

‎handler/asset.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ type AssetService interface {
3939
GroupAssets(ctx context.Context, cfg asset.GroupConfig) ([]asset.GroupResult, error)
4040
}
4141

42-
func (server *APIServer) GetAllAssets(ctx context.Context, req *connect.Request[compassv1beta1.GetAllAssetsRequest]) (*connect.Response[compassv1beta1.GetAllAssetsResponse], error) {
42+
func (server *Handler) GetAllAssets(ctx context.Context, req *connect.Request[compassv1beta1.GetAllAssetsRequest]) (*connect.Response[compassv1beta1.GetAllAssetsResponse], error) {
4343

4444
ns := middleware.FetchNamespaceFromContext(ctx)
4545
if _, err := server.validateUserInCtx(ctx, ns); err != nil {
@@ -89,7 +89,7 @@ func (server *APIServer) GetAllAssets(ctx context.Context, req *connect.Request[
8989
return connect.NewResponse(response), nil
9090
}
9191

92-
func (server *APIServer) GetAssetByID(ctx context.Context, req *connect.Request[compassv1beta1.GetAssetByIDRequest]) (*connect.Response[compassv1beta1.GetAssetByIDResponse], error) {
92+
func (server *Handler) GetAssetByID(ctx context.Context, req *connect.Request[compassv1beta1.GetAssetByIDRequest]) (*connect.Response[compassv1beta1.GetAssetByIDResponse], error) {
9393

9494
ns := middleware.FetchNamespaceFromContext(ctx)
9595
if _, err := server.validateUserInCtx(ctx, ns); err != nil {
@@ -117,7 +117,7 @@ func (server *APIServer) GetAssetByID(ctx context.Context, req *connect.Request[
117117
}), nil
118118
}
119119

120-
func (server *APIServer) GetAssetStargazers(ctx context.Context, req *connect.Request[compassv1beta1.GetAssetStargazersRequest]) (*connect.Response[compassv1beta1.GetAssetStargazersResponse], error) {
120+
func (server *Handler) GetAssetStargazers(ctx context.Context, req *connect.Request[compassv1beta1.GetAssetStargazersRequest]) (*connect.Response[compassv1beta1.GetAssetStargazersResponse], error) {
121121

122122
ns := middleware.FetchNamespaceFromContext(ctx)
123123
if _, err := server.validateUserInCtx(ctx, ns); err != nil {
@@ -148,7 +148,7 @@ func (server *APIServer) GetAssetStargazers(ctx context.Context, req *connect.Re
148148
}), nil
149149
}
150150

151-
func (server *APIServer) GetAssetVersionHistory(ctx context.Context, req *connect.Request[compassv1beta1.GetAssetVersionHistoryRequest]) (*connect.Response[compassv1beta1.GetAssetVersionHistoryResponse], error) {
151+
func (server *Handler) GetAssetVersionHistory(ctx context.Context, req *connect.Request[compassv1beta1.GetAssetVersionHistoryRequest]) (*connect.Response[compassv1beta1.GetAssetVersionHistoryResponse], error) {
152152

153153
ns := middleware.FetchNamespaceFromContext(ctx)
154154
if _, err := server.validateUserInCtx(ctx, ns); err != nil {
@@ -183,7 +183,7 @@ func (server *APIServer) GetAssetVersionHistory(ctx context.Context, req *connec
183183
}), nil
184184
}
185185

186-
func (server *APIServer) GetAssetByVersion(ctx context.Context, req *connect.Request[compassv1beta1.GetAssetByVersionRequest]) (*connect.Response[compassv1beta1.GetAssetByVersionResponse], error) {
186+
func (server *Handler) GetAssetByVersion(ctx context.Context, req *connect.Request[compassv1beta1.GetAssetByVersionRequest]) (*connect.Response[compassv1beta1.GetAssetByVersionResponse], error) {
187187

188188
ns := middleware.FetchNamespaceFromContext(ctx)
189189
if _, err := server.validateUserInCtx(ctx, ns); err != nil {
@@ -215,7 +215,7 @@ func (server *APIServer) GetAssetByVersion(ctx context.Context, req *connect.Req
215215
}), nil
216216
}
217217

218-
func (server *APIServer) UpsertAsset(ctx context.Context, req *connect.Request[compassv1beta1.UpsertAssetRequest]) (*connect.Response[compassv1beta1.UpsertAssetResponse], error) {
218+
func (server *Handler) UpsertAsset(ctx context.Context, req *connect.Request[compassv1beta1.UpsertAssetRequest]) (*connect.Response[compassv1beta1.UpsertAssetResponse], error) {
219219

220220
ns := middleware.FetchNamespaceFromContext(ctx)
221221
userID, err := server.validateUserInCtx(ctx, ns)
@@ -251,7 +251,7 @@ func (server *APIServer) UpsertAsset(ctx context.Context, req *connect.Request[c
251251
}), nil
252252
}
253253

254-
func (server *APIServer) UpsertPatchAsset(ctx context.Context, req *connect.Request[compassv1beta1.UpsertPatchAssetRequest]) (*connect.Response[compassv1beta1.UpsertPatchAssetResponse], error) {
254+
func (server *Handler) UpsertPatchAsset(ctx context.Context, req *connect.Request[compassv1beta1.UpsertPatchAssetRequest]) (*connect.Response[compassv1beta1.UpsertPatchAssetResponse], error) {
255255

256256
ns := middleware.FetchNamespaceFromContext(ctx)
257257
userID, err := server.validateUserInCtx(ctx, ns)
@@ -301,7 +301,7 @@ func (server *APIServer) UpsertPatchAsset(ctx context.Context, req *connect.Requ
301301
}), nil
302302
}
303303

304-
func (server *APIServer) DeleteAsset(ctx context.Context, req *connect.Request[compassv1beta1.DeleteAssetRequest]) (*connect.Response[compassv1beta1.DeleteAssetResponse], error) {
304+
func (server *Handler) DeleteAsset(ctx context.Context, req *connect.Request[compassv1beta1.DeleteAssetRequest]) (*connect.Response[compassv1beta1.DeleteAssetResponse], error) {
305305

306306
ns := middleware.FetchNamespaceFromContext(ctx)
307307
if _, err := server.validateUserInCtx(ctx, ns); err != nil {
@@ -321,7 +321,7 @@ func (server *APIServer) DeleteAsset(ctx context.Context, req *connect.Request[c
321321
return connect.NewResponse(&compassv1beta1.DeleteAssetResponse{}), nil
322322
}
323323

324-
func (server *APIServer) CreateAssetProbe(ctx context.Context, req *connect.Request[compassv1beta1.CreateAssetProbeRequest]) (*connect.Response[compassv1beta1.CreateAssetProbeResponse], error) {
324+
func (server *Handler) CreateAssetProbe(ctx context.Context, req *connect.Request[compassv1beta1.CreateAssetProbeRequest]) (*connect.Response[compassv1beta1.CreateAssetProbeResponse], error) {
325325
ns := middleware.FetchNamespaceFromContext(ctx)
326326
if _, err := server.validateUserInCtx(ctx, ns); err != nil {
327327
return nil, err
@@ -353,7 +353,7 @@ func (server *APIServer) CreateAssetProbe(ctx context.Context, req *connect.Requ
353353
}), nil
354354
}
355355

356-
func (server *APIServer) upsertAsset(
356+
func (server *Handler) upsertAsset(
357357
ctx context.Context,
358358
ns *namespace.Namespace,
359359
ast asset.Asset,
@@ -384,7 +384,7 @@ func (server *APIServer) upsertAsset(
384384
return
385385
}
386386

387-
func (server *APIServer) upsertAssetWithoutLineage(ctx context.Context, ns *namespace.Namespace, ast asset.Asset) (string, error) {
387+
func (server *Handler) upsertAssetWithoutLineage(ctx context.Context, ns *namespace.Namespace, ast asset.Asset) (string, error) {
388388
if err := server.validateAsset(ast); err != nil {
389389
return "", connect.NewError(connect.CodeInvalidArgument, err)
390390
}
@@ -400,7 +400,7 @@ func (server *APIServer) upsertAssetWithoutLineage(ctx context.Context, ns *name
400400
return assetID, nil
401401
}
402402

403-
func (server *APIServer) buildAsset(baseAsset *compassv1beta1.UpsertAssetRequest_Asset) asset.Asset {
403+
func (server *Handler) buildAsset(baseAsset *compassv1beta1.UpsertAssetRequest_Asset) asset.Asset {
404404
ast := asset.Asset{
405405
URN: baseAsset.GetUrn(),
406406
Service: baseAsset.GetService(),
@@ -426,7 +426,7 @@ func (server *APIServer) buildAsset(baseAsset *compassv1beta1.UpsertAssetRequest
426426
return ast
427427
}
428428

429-
func (server *APIServer) validateAsset(ast asset.Asset) error {
429+
func (server *Handler) validateAsset(ast asset.Asset) error {
430430
if ast.URN == "" {
431431
return fmt.Errorf("urn is required")
432432
}
@@ -449,7 +449,7 @@ func (server *APIServer) validateAsset(ast asset.Asset) error {
449449
return nil
450450
}
451451

452-
func (server *APIServer) validatePatchAsset(ast *compassv1beta1.UpsertPatchAssetRequest_Asset) (urn string, err error) {
452+
func (server *Handler) validatePatchAsset(ast *compassv1beta1.UpsertPatchAssetRequest_Asset) (urn string, err error) {
453453
if urn = ast.GetUrn(); urn == "" {
454454
return "", fmt.Errorf("urn is required and can't be empty")
455455
}

‎handler/asset_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ func TestGetAllAssets(t *testing.T) {
186186

187187
mockUserSvc.EXPECT().ValidateUser(ctx, ns, userUUID, "").Return(userID, nil)
188188

189-
handler := NewAPIServer(logger, mockNamespaceSvc, mockAssetSvc, nil, nil, nil, nil, mockUserSvc)
189+
handler := New(logger, mockNamespaceSvc, mockAssetSvc, nil, nil, nil, nil, mockUserSvc)
190190

191191
got, err := handler.GetAllAssets(ctx, connect.NewRequest(tc.Request))
192192
if tc.ExpectStatus == 0 {
@@ -333,7 +333,7 @@ func TestGetAssetByID(t *testing.T) {
333333

334334
mockUserSvc.EXPECT().ValidateUser(ctx, ns, userUUID, "").Return(userID, nil)
335335

336-
handler := NewAPIServer(logger, mockNamespaceSvc, mockAssetSvc, nil, nil, nil, nil, mockUserSvc)
336+
handler := New(logger, mockNamespaceSvc, mockAssetSvc, nil, nil, nil, nil, mockUserSvc)
337337

338338
got, err := handler.GetAssetByID(ctx, connect.NewRequest(&compassv1beta1.GetAssetByIDRequest{
339339
Id: assetID,
@@ -554,7 +554,7 @@ func TestUpsertAsset(t *testing.T) {
554554

555555
mockUserSvc.EXPECT().ValidateUser(ctx, ns, userUUID, "").Return(userID, nil)
556556

557-
handler := NewAPIServer(logger, mockNamespaceSvc, mockAssetSvc, nil, nil, nil, nil, mockUserSvc)
557+
handler := New(logger, mockNamespaceSvc, mockAssetSvc, nil, nil, nil, nil, mockUserSvc)
558558

559559
got, err := handler.UpsertAsset(ctx, connect.NewRequest(tc.Request))
560560
if tc.ExpectStatus == 0 {
@@ -882,7 +882,7 @@ func TestUpsertPatchAsset(t *testing.T) {
882882

883883
mockUserSvc.EXPECT().ValidateUser(ctx, ns, userUUID, "").Return(userID, nil)
884884

885-
handler := NewAPIServer(logger, mockNamespaceSvc, mockAssetSvc, nil, nil, nil, nil, mockUserSvc)
885+
handler := New(logger, mockNamespaceSvc, mockAssetSvc, nil, nil, nil, nil, mockUserSvc)
886886

887887
got, err := handler.UpsertPatchAsset(ctx, connect.NewRequest(tc.Request))
888888
if tc.ExpectStatus == 0 {
@@ -977,7 +977,7 @@ func TestDeleteAsset(t *testing.T) {
977977

978978
mockUserSvc.EXPECT().ValidateUser(ctx, ns, userUUID, "").Return(userID, nil)
979979

980-
handler := NewAPIServer(logger, mockNamespaceSvc, mockAssetSvc, nil, nil, nil, nil, mockUserSvc)
980+
handler := New(logger, mockNamespaceSvc, mockAssetSvc, nil, nil, nil, nil, mockUserSvc)
981981

982982
_, err := handler.DeleteAsset(ctx, connect.NewRequest(&compassv1beta1.DeleteAssetRequest{
983983
Id: tc.AssetID,
@@ -1076,7 +1076,7 @@ func TestGetAssetStargazers(t *testing.T) {
10761076

10771077
mockUserSvc.EXPECT().ValidateUser(ctx, ns, userUUID, "").Return(userID, nil)
10781078

1079-
handler := NewAPIServer(logger, mockNamespaceSvc, nil, mockStarSvc, nil, nil, nil, mockUserSvc)
1079+
handler := New(logger, mockNamespaceSvc, nil, mockStarSvc, nil, nil, nil, mockUserSvc)
10801080

10811081
got, err := handler.GetAssetStargazers(ctx, connect.NewRequest(tc.Request))
10821082
if tc.ExpectStatus == 0 {
@@ -1205,7 +1205,7 @@ func TestGetAssetVersionHistory(t *testing.T) {
12051205

12061206
mockUserSvc.EXPECT().ValidateUser(ctx, ns, userUUID, "").Return(userID, nil)
12071207

1208-
handler := NewAPIServer(logger, mockNamespaceSvc, mockAssetSvc, nil, nil, nil, nil, mockUserSvc)
1208+
handler := New(logger, mockNamespaceSvc, mockAssetSvc, nil, nil, nil, nil, mockUserSvc)
12091209

12101210
got, err := handler.GetAssetVersionHistory(ctx, connect.NewRequest(tc.Request))
12111211
if tc.ExpectStatus == 0 {
@@ -1334,7 +1334,7 @@ func TestGetAssetByVersion(t *testing.T) {
13341334

13351335
mockUserSvc.EXPECT().ValidateUser(ctx, ns, userUUID, "").Return(userID, nil)
13361336

1337-
handler := NewAPIServer(logger, mockNamespaceSvc, mockAssetSvc, nil, nil, nil, nil, mockUserSvc)
1337+
handler := New(logger, mockNamespaceSvc, mockAssetSvc, nil, nil, nil, nil, mockUserSvc)
13381338

13391339
got, err := handler.GetAssetByVersion(ctx, connect.NewRequest(tc.Request))
13401340
if tc.ExpectStatus == 0 {
@@ -1494,7 +1494,7 @@ func TestCreateAssetProbe(t *testing.T) {
14941494

14951495
mockUserSvc.EXPECT().ValidateUser(ctx, ns, userUUID, "").Return(userID, nil)
14961496

1497-
handler := NewAPIServer(logger, mockNamespaceSvc, mockAssetSvc, nil, nil, nil, nil, mockUserSvc)
1497+
handler := New(logger, mockNamespaceSvc, mockAssetSvc, nil, nil, nil, nil, mockUserSvc)
14981498

14991499
got, err := handler.CreateAssetProbe(ctx, connect.NewRequest(tc.Request))
15001500
if tc.ExpectStatus == 0 {

‎handler/comment.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616

1717
// CreateComment will create a new comment of a discussion
1818
// field body is mandatory
19-
func (server *APIServer) CreateComment(ctx context.Context, req *connect.Request[compassv1beta1.CreateCommentRequest]) (*connect.Response[compassv1beta1.CreateCommentResponse], error) {
19+
func (server *Handler) CreateComment(ctx context.Context, req *connect.Request[compassv1beta1.CreateCommentRequest]) (*connect.Response[compassv1beta1.CreateCommentResponse], error) {
2020
ns := middleware.FetchNamespaceFromContext(ctx)
2121
userID, err := server.validateUserInCtx(ctx, ns)
2222
if err != nil {
@@ -50,7 +50,7 @@ func (server *APIServer) CreateComment(ctx context.Context, req *connect.Request
5050
}
5151

5252
// GetAllComments returns all comments of a discussion
53-
func (server *APIServer) GetAllComments(ctx context.Context, req *connect.Request[compassv1beta1.GetAllCommentsRequest]) (*connect.Response[compassv1beta1.GetAllCommentsResponse], error) {
53+
func (server *Handler) GetAllComments(ctx context.Context, req *connect.Request[compassv1beta1.GetAllCommentsRequest]) (*connect.Response[compassv1beta1.GetAllCommentsResponse], error) {
5454
ns := middleware.FetchNamespaceFromContext(ctx)
5555
if _, err := server.validateUserInCtx(ctx, ns); err != nil {
5656
return nil, err
@@ -78,7 +78,7 @@ func (server *APIServer) GetAllComments(ctx context.Context, req *connect.Reques
7878
}
7979

8080
// GetComment returns a comment discussion by id from path
81-
func (server *APIServer) GetComment(ctx context.Context, req *connect.Request[compassv1beta1.GetCommentRequest]) (*connect.Response[compassv1beta1.GetCommentResponse], error) {
81+
func (server *Handler) GetComment(ctx context.Context, req *connect.Request[compassv1beta1.GetCommentRequest]) (*connect.Response[compassv1beta1.GetCommentResponse], error) {
8282
ns := middleware.FetchNamespaceFromContext(ctx)
8383
if _, err := server.validateUserInCtx(ctx, ns); err != nil {
8484
return nil, err
@@ -103,7 +103,7 @@ func (server *APIServer) GetComment(ctx context.Context, req *connect.Request[co
103103
}
104104

105105
// UpdateComment is an api to update a comment by discussion id
106-
func (server *APIServer) UpdateComment(ctx context.Context, req *connect.Request[compassv1beta1.UpdateCommentRequest]) (*connect.Response[compassv1beta1.UpdateCommentResponse], error) {
106+
func (server *Handler) UpdateComment(ctx context.Context, req *connect.Request[compassv1beta1.UpdateCommentRequest]) (*connect.Response[compassv1beta1.UpdateCommentResponse], error) {
107107
ns := middleware.FetchNamespaceFromContext(ctx)
108108
userID, err := server.validateUserInCtx(ctx, ns)
109109
if err != nil {
@@ -141,7 +141,7 @@ func (server *APIServer) UpdateComment(ctx context.Context, req *connect.Request
141141
}
142142

143143
// DeleteComment is an api to delete a comment by discussion id
144-
func (server *APIServer) DeleteComment(ctx context.Context, req *connect.Request[compassv1beta1.DeleteCommentRequest]) (*connect.Response[compassv1beta1.DeleteCommentResponse], error) {
144+
func (server *Handler) DeleteComment(ctx context.Context, req *connect.Request[compassv1beta1.DeleteCommentRequest]) (*connect.Response[compassv1beta1.DeleteCommentResponse], error) {
145145
ns := middleware.FetchNamespaceFromContext(ctx)
146146
if _, err := server.validateUserInCtx(ctx, ns); err != nil {
147147
return nil, err
@@ -165,7 +165,7 @@ func (server *APIServer) DeleteComment(ctx context.Context, req *connect.Request
165165
return connect.NewResponse(&compassv1beta1.DeleteCommentResponse{}), nil
166166
}
167167

168-
func (server *APIServer) buildGetAllDiscussionsFilter(req *compassv1beta1.GetAllDiscussionsRequest) (discussion.Filter, error) {
168+
func (server *Handler) buildGetAllDiscussionsFilter(req *compassv1beta1.GetAllDiscussionsRequest) (discussion.Filter, error) {
169169

170170
fl := discussion.Filter{
171171
Type: req.GetType(),
@@ -202,7 +202,7 @@ func (server *APIServer) buildGetAllDiscussionsFilter(req *compassv1beta1.GetAll
202202
return fl, nil
203203
}
204204

205-
func (server *APIServer) buildGetAllCommentsFilter(req *compassv1beta1.GetAllCommentsRequest) (discussion.Filter, error) {
205+
func (server *Handler) buildGetAllCommentsFilter(req *compassv1beta1.GetAllCommentsRequest) (discussion.Filter, error) {
206206

207207
fl := discussion.Filter{
208208
SortBy: req.GetSort(),

‎handler/comment_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ func TestCreateComment(t *testing.T) {
121121

122122
mockUserSvc.EXPECT().ValidateUser(ctx, ns, userUUID, "").Return(userID, nil)
123123

124-
handler := NewAPIServer(logger, mockNamespaceSvc, nil, nil, mockSvc, nil, nil, mockUserSvc)
124+
handler := New(logger, mockNamespaceSvc, nil, nil, mockSvc, nil, nil, mockUserSvc)
125125

126126
got, err := handler.CreateComment(ctx, connect.NewRequest(tc.Request))
127127
if tc.ExpectStatus == 0 {
@@ -267,7 +267,7 @@ func TestGetAllComments(t *testing.T) {
267267

268268
mockUserSvc.EXPECT().ValidateUser(ctx, ns, userUUID, "").Return(userID, nil)
269269

270-
handler := NewAPIServer(logger, mockNamespaceSvc, nil, nil, mockSvc, nil, nil, mockUserSvc)
270+
handler := New(logger, mockNamespaceSvc, nil, nil, mockSvc, nil, nil, mockUserSvc)
271271

272272
got, err := handler.GetAllComments(ctx, connect.NewRequest(tc.Request))
273273
if tc.ExpectStatus == 0 {
@@ -417,7 +417,7 @@ func TestGetComment(t *testing.T) {
417417

418418
mockUserSvc.EXPECT().ValidateUser(ctx, ns, userUUID, "").Return(userID, nil)
419419

420-
handler := NewAPIServer(logger, mockNamespaceSvc, nil, nil, mockSvc, nil, nil, mockUserSvc)
420+
handler := New(logger, mockNamespaceSvc, nil, nil, mockSvc, nil, nil, mockUserSvc)
421421

422422
got, err := handler.GetComment(ctx, connect.NewRequest(tc.Request))
423423
if tc.ExpectStatus == 0 {
@@ -579,7 +579,7 @@ func TestUpdateComment(t *testing.T) {
579579
defer mockSvc.AssertExpectations(t)
580580

581581
mockUserSvc.EXPECT().ValidateUser(ctx, ns, userUUID, "").Return(userID, nil)
582-
handler := NewAPIServer(logger, mockNamespaceSvc, nil, nil, mockSvc, nil, nil, mockUserSvc)
582+
handler := New(logger, mockNamespaceSvc, nil, nil, mockSvc, nil, nil, mockUserSvc)
583583

584584
_, err := handler.UpdateComment(ctx, connect.NewRequest(tc.Request))
585585
if tc.ExpectStatus == 0 {
@@ -703,7 +703,7 @@ func TestDeleteComment(t *testing.T) {
703703

704704
mockUserSvc.EXPECT().ValidateUser(ctx, ns, userUUID, "").Return(userID, nil)
705705

706-
handler := NewAPIServer(logger, mockNamespaceSvc, nil, nil, mockSvc, nil, nil, mockUserSvc)
706+
handler := New(logger, mockNamespaceSvc, nil, nil, mockSvc, nil, nil, mockUserSvc)
707707

708708
_, err := handler.DeleteComment(ctx, connect.NewRequest(tc.Request))
709709
if tc.ExpectStatus == 0 {

0 commit comments

Comments
 (0)