update

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

internal/handler/comment_create.go

@@ -6,18 +6,17 @@ import (
 	"errors"
 	"net/http"
 
-	"git.unistack.org/unistack-org/pkgdash/internal/models"
-	pb "git.unistack.org/unistack-org/pkgdash/proto"
-	httpsrv "go.unistack.org/micro-server-http/v4"
-	"go.unistack.org/micro/v4/logger"
+	httpsrv "go.unistack.org/micro-server-http/v3"
+	"go.unistack.org/pkgdash/internal/models"
+	pb "go.unistack.org/pkgdash/proto"
 )
 
 func (h *Handler) CommentCreate(ctx context.Context, req *pb.CommentCreateReq, rsp *pb.CommentCreateRsp) error {
-	logger.Debug(ctx, "Start AddComment")
+	h.logger.Debug(ctx, "Start AddComment")
 
 	err := req.Validate()
 	if err != nil {
-		logger.Error(ctx, "validation error", err)
+		h.logger.Error(ctx, "validation error", err)
 		httpsrv.SetRspCode(ctx, http.StatusBadRequest)
 		return httpsrv.SetError(NewValidationError(err))
 	}
@@ -28,13 +27,13 @@ func (h *Handler) CommentCreate(ctx context.Context, req *pb.CommentCreateReq, r
 			httpsrv.SetRspCode(ctx, http.StatusNotFound)
 			return httpsrv.SetError(NewNotFoundError(err))
 		}
-		logger.Error(ctx, "comment create error", err)
+		h.logger.Error(ctx, "comment create error", err)
 		httpsrv.SetRspCode(ctx, http.StatusInternalServerError)
 		return httpsrv.SetError(NewInternalError(err))
 	}
 
 	rsp.Comment = models.NewComment(com)
 
-	logger.Debug(ctx, "Success finish addComment")
+	h.logger.Debug(ctx, "Success finish addComment")
 	return nil
 }

internal/handler/comment_delete.go

@@ -6,17 +6,16 @@ import (
 	"errors"
 	"net/http"
 
-	pb "git.unistack.org/unistack-org/pkgdash/proto"
-	httpsrv "go.unistack.org/micro-server-http/v4"
-	"go.unistack.org/micro/v4/logger"
+	httpsrv "go.unistack.org/micro-server-http/v3"
+	pb "go.unistack.org/pkgdash/proto"
 )
 
 func (h *Handler) CommentDelete(ctx context.Context, req *pb.CommentDeleteReq, rsp *pb.CommentDeleteRsp) error {
-	logger.Debug(ctx, "Start AddComment")
+	h.logger.Debug(ctx, "Start AddComment")
 
 	err := req.Validate()
 	if err != nil {
-		logger.Error(ctx, "validate error", err)
+		h.logger.Error(ctx, "validate error", err)
 		httpsrv.SetRspCode(ctx, http.StatusBadRequest)
 		return httpsrv.SetError(NewValidationError(err))
 	}
@@ -27,11 +26,11 @@ func (h *Handler) CommentDelete(ctx context.Context, req *pb.CommentDeleteReq, r
 			httpsrv.SetRspCode(ctx, http.StatusNotFound)
 			return httpsrv.SetError(NewNotFoundError(err))
 		}
-		logger.Error(ctx, "comment delete error", err)
+		h.logger.Error(ctx, "comment delete error", err)
 		httpsrv.SetRspCode(ctx, http.StatusInternalServerError)
 		return httpsrv.SetError(NewInternalError(err))
 	}
 
-	logger.Debug(ctx, "Success finish addComment")
+	h.logger.Debug(ctx, "Success finish addComment")
 	return nil
 }

internal/handler/comment_list.go

@@ -4,25 +4,24 @@ import (
 	"context"
 	"net/http"
 
-	"git.unistack.org/unistack-org/pkgdash/internal/models"
-	pb "git.unistack.org/unistack-org/pkgdash/proto"
-	httpsrv "go.unistack.org/micro-server-http/v4"
-	"go.unistack.org/micro/v4/logger"
+	httpsrv "go.unistack.org/micro-server-http/v3"
+	"go.unistack.org/pkgdash/internal/models"
+	pb "go.unistack.org/pkgdash/proto"
 )
 
 func (h *Handler) CommentList(ctx context.Context, req *pb.CommentListReq, rsp *pb.CommentListRsp) error {
-	logger.Debug(ctx, "Start GetModule")
+	h.logger.Debug(ctx, "Start GetModule")
 
 	err := req.Validate()
 	if err != nil {
-		logger.Error(ctx, "validate error", err)
+		h.logger.Error(ctx, "validate error", err)
 		httpsrv.SetRspCode(ctx, http.StatusBadRequest)
 		return httpsrv.SetError(NewValidationError(err))
 	}
 
 	comments, err := h.store.CommentList(ctx, req)
 	if err != nil {
-		logger.Error(ctx, "comment list error", err)
+		h.logger.Error(ctx, "comment list error", err)
 		httpsrv.SetRspCode(ctx, http.StatusInternalServerError)
 		return httpsrv.SetError(NewInternalError(err))
 	}
@@ -31,6 +30,6 @@ func (h *Handler) CommentList(ctx context.Context, req *pb.CommentListReq, rsp *
 		rsp.Comments = append(rsp.Comments, models.NewComment(com))
 	}
 
-	logger.Debug(ctx, "Success finish getModule")
+	h.logger.Debug(ctx, "Success finish getModule")
 	return nil
 }

internal/handler/comment_lookup.go

@@ -3,7 +3,7 @@ package handler
 import (
 	"context"
 
-	pb "git.unistack.org/unistack-org/pkgdash/proto"
+	pb "go.unistack.org/pkgdash/proto"
 )
 
 func (h *Handler) CommentLookup(ctx context.Context, req *pb.CommentLookupReq, rsp *pb.CommentLookupRsp) error {

internal/handler/handler.go

@@ -4,16 +4,18 @@ import (
 	"net/http"
 	"strconv"
 
-	"git.unistack.org/unistack-org/pkgdash/internal/storage"
-	pb "git.unistack.org/unistack-org/pkgdash/proto"
 	"github.com/google/uuid"
-	jsonpbcodec "go.unistack.org/micro-codec-jsonpb/v4"
-	"go.unistack.org/micro/v4/codec"
+	jsonpbcodec "go.unistack.org/micro-codec-jsonpb/v3"
+	"go.unistack.org/micro/v3/codec"
+	"go.unistack.org/micro/v3/logger"
+	"go.unistack.org/pkgdash/internal/storage"
+	pb "go.unistack.org/pkgdash/proto"
 )
 
 type Handler struct {
-	store storage.Storage
-	codec codec.Codec
+	logger logger.Logger
+	store  storage.Storage
+	codec  codec.Codec
 }
 
 func NewNotFoundError(err error) *pb.ErrorRsp {
@@ -43,10 +45,11 @@ func NewValidationError(err error) *pb.ErrorRsp {
 	}
 }
 
-func NewHandler(store storage.Storage) (*Handler, error) {
+func NewHandler(log logger.Logger, store storage.Storage) (*Handler, error) {
 	h := &Handler{
-		codec: jsonpbcodec.NewCodec(),
-		store: store,
+		logger: log,
+		codec:  jsonpbcodec.NewCodec(),
+		store:  store,
 	}
 
 	return h, nil

internal/handler/handler_list.go

@@ -4,18 +4,17 @@ import (
 	"context"
 	"net/http"
 
-	"git.unistack.org/unistack-org/pkgdash/internal/models"
-	pb "git.unistack.org/unistack-org/pkgdash/proto"
-	httpsrv "go.unistack.org/micro-server-http/v4"
-	"go.unistack.org/micro/v4/logger"
+	httpsrv "go.unistack.org/micro-server-http/v3"
+	"go.unistack.org/pkgdash/internal/models"
+	pb "go.unistack.org/pkgdash/proto"
 )
 
 func (h *Handler) HandlerList(ctx context.Context, req *pb.HandlerListReq, rsp *pb.HandlerListRsp) error {
-	logger.Debug(ctx, "HandlerList handler start")
+	h.logger.Debug(ctx, "HandlerList handler start")
 
 	packages, err := h.store.HandlerList(ctx, req)
 	if err != nil {
-		logger.Error(ctx, "error db response: %v", err)
+		h.logger.Error(ctx, "error db response: %v", err)
 		httpsrv.SetRspCode(ctx, http.StatusInternalServerError)
 		return httpsrv.SetError(NewInternalError(err))
 	}
@@ -23,6 +22,6 @@ func (h *Handler) HandlerList(ctx context.Context, req *pb.HandlerListReq, rsp *
 	for _, hdlr := range packages {
 		rsp.Handlers = append(rsp.Handlers, models.NewHandler(hdlr))
 	}
-	logger.Debug(ctx, "HandlerList handler stop")
+	h.logger.Debug(ctx, "HandlerList handler stop")
 	return nil
 }

internal/handler/modules_list.go

@@ -4,25 +4,24 @@ import (
 	"context"
 	"net/http"
 
-	"git.unistack.org/unistack-org/pkgdash/internal/models"
-	pb "git.unistack.org/unistack-org/pkgdash/proto"
-	httpsrv "go.unistack.org/micro-server-http/v4"
-	"go.unistack.org/micro/v4/logger"
+	httpsrv "go.unistack.org/micro-server-http/v3"
+	"go.unistack.org/pkgdash/internal/models"
+	pb "go.unistack.org/pkgdash/proto"
 )
 
 func (h *Handler) ModuleList(ctx context.Context, req *pb.ModuleListReq, rsp *pb.ModuleListRsp) error {
-	logger.Debug(ctx, "Start GetModule")
+	h.logger.Debug(ctx, "Start GetModule")
 
 	err := req.Validate()
 	if err != nil {
-		logger.Error(ctx, "validate error", err)
+		h.logger.Error(ctx, "validate error", err)
 		httpsrv.SetRspCode(ctx, http.StatusBadRequest)
 		return httpsrv.SetError(NewValidationError(err))
 	}
 
 	modules, err := h.store.ModuleList(ctx, req)
 	if err != nil {
-		logger.Error(ctx, "module list error", err)
+		h.logger.Error(ctx, "module list error", err)
 		httpsrv.SetRspCode(ctx, http.StatusInternalServerError)
 		return httpsrv.SetError(NewInternalError(err))
 	}
@@ -30,6 +29,6 @@ func (h *Handler) ModuleList(ctx context.Context, req *pb.ModuleListReq, rsp *pb
 	for _, mod := range modules {
 		rsp.Modules = append(rsp.Modules, models.NewModule(mod))
 	}
-	logger.Debug(ctx, "Success finish getModule")
+	h.logger.Debug(ctx, "Success finish getModule")
 	return nil
 }

internal/handler/package_create.go

@@ -4,30 +4,29 @@ import (
 	"context"
 	"net/http"
 
-	"git.unistack.org/unistack-org/pkgdash/internal/models"
-	pb "git.unistack.org/unistack-org/pkgdash/proto"
-	httpsrv "go.unistack.org/micro-server-http/v4"
-	"go.unistack.org/micro/v4/logger"
+	httpsrv "go.unistack.org/micro-server-http/v3"
+	"go.unistack.org/pkgdash/internal/models"
+	pb "go.unistack.org/pkgdash/proto"
 )
 
 func (h *Handler) PackageCreate(ctx context.Context, req *pb.PackageCreateReq, rsp *pb.PackageCreateRsp) error {
-	logger.Debug(ctx, "PackagesCreate handler start")
+	h.logger.Debug(ctx, "PackagesCreate handler start")
 
 	if err := req.Validate(); err != nil {
-		logger.Error(ctx, "validate error", err)
+		h.logger.Error(ctx, "validate error", err)
 		httpsrv.SetRspCode(ctx, http.StatusBadRequest)
 		return httpsrv.SetError(NewValidationError(err))
 	}
 
 	pkg, err := h.store.PackageCreate(ctx, req)
 	if err != nil {
-		logger.Error(ctx, "package create error", err)
+		h.logger.Error(ctx, "package create error", err)
 		httpsrv.SetRspCode(ctx, http.StatusBadRequest)
 		return httpsrv.SetError(NewValidationError(err))
 	}
 
 	rsp.Package = models.NewPackage(pkg)
 
-	logger.Debug(ctx, "PackagesCreate handler stop")
+	h.logger.Debug(ctx, "PackagesCreate handler stop")
 	return nil
 }

internal/handler/package_delete.go

@@ -4,26 +4,25 @@ import (
 	"context"
 	"net/http"
 
-	pb "git.unistack.org/unistack-org/pkgdash/proto"
-	httpsrv "go.unistack.org/micro-server-http/v4"
-	"go.unistack.org/micro/v4/logger"
+	httpsrv "go.unistack.org/micro-server-http/v3"
+	pb "go.unistack.org/pkgdash/proto"
 )
 
 func (h *Handler) PackageDelete(ctx context.Context, req *pb.PackageDeleteReq, rsp *pb.PackageDeleteRsp) error {
-	logger.Debug(ctx, "Start UpdatePackage")
+	h.logger.Debug(ctx, "Start UpdatePackage")
 
 	if err := req.Validate(); err != nil {
-		logger.Error(ctx, "validate error", err)
+		h.logger.Error(ctx, "validate error", err)
 		httpsrv.SetRspCode(ctx, http.StatusBadRequest)
 		return httpsrv.SetError(NewValidationError(err))
 	}
 
 	if err := h.store.PackageDelete(ctx, req); err != nil {
-		logger.Error(ctx, "package delete error", err)
+		h.logger.Error(ctx, "package delete error", err)
 		httpsrv.SetRspCode(ctx, http.StatusInternalServerError)
 		return httpsrv.SetError(NewInternalError(err))
 	}
 
-	logger.Debug(ctx, "Success finish UpdatePackage")
+	h.logger.Debug(ctx, "Success finish UpdatePackage")
 	return nil
 }

internal/handler/package_list.go

@@ -4,18 +4,17 @@ import (
 	"context"
 	"net/http"
 
-	"git.unistack.org/unistack-org/pkgdash/internal/models"
-	pb "git.unistack.org/unistack-org/pkgdash/proto"
-	httpsrv "go.unistack.org/micro-server-http/v4"
-	"go.unistack.org/micro/v4/logger"
+	httpsrv "go.unistack.org/micro-server-http/v3"
+	"go.unistack.org/pkgdash/internal/models"
+	pb "go.unistack.org/pkgdash/proto"
 )
 
 func (h *Handler) PackageList(ctx context.Context, req *pb.PackageListReq, rsp *pb.PackageListRsp) error {
-	logger.Debug(ctx, "PackagesList handler start")
+	h.logger.Debug(ctx, "PackagesList handler start")
 
 	packages, err := h.store.PackageList(ctx, req)
 	if err != nil {
-		logger.Error(ctx, "error db response: %v", err)
+		h.logger.Error(ctx, "error db response: %v", err)
 		httpsrv.SetRspCode(ctx, http.StatusInternalServerError)
 		return httpsrv.SetError(NewInternalError(err))
 	}
@@ -23,6 +22,6 @@ func (h *Handler) PackageList(ctx context.Context, req *pb.PackageListReq, rsp *
 	for _, pkg := range packages {
 		rsp.Packages = append(rsp.Packages, models.NewPackage(pkg))
 	}
-	logger.Debug(ctx, "PackagesList handler stop")
+	h.logger.Debug(ctx, "PackagesList handler stop")
 	return nil
 }

internal/handler/package_lookup.go

@@ -4,30 +4,29 @@ import (
 	"context"
 	"net/http"
 
-	"git.unistack.org/unistack-org/pkgdash/internal/models"
-	pb "git.unistack.org/unistack-org/pkgdash/proto"
-	httpsrv "go.unistack.org/micro-server-http/v4"
-	"go.unistack.org/micro/v4/logger"
+	httpsrv "go.unistack.org/micro-server-http/v3"
+	"go.unistack.org/pkgdash/internal/models"
+	pb "go.unistack.org/pkgdash/proto"
 )
 
 func (h *Handler) PackageLookup(ctx context.Context, req *pb.PackageLookupReq, rsp *pb.PackageLookupRsp) error {
-	logger.Debug(ctx, "Start PackagesLookup")
+	h.logger.Debug(ctx, "Start PackagesLookup")
 
 	if err := req.Validate(); err != nil {
-		logger.Error(ctx, "validate error", err)
+		h.logger.Error(ctx, "validate error", err)
 		httpsrv.SetRspCode(ctx, http.StatusBadRequest)
 		return httpsrv.SetError(NewValidationError(err))
 	}
 
 	pkg, err := h.store.PackageLookup(ctx, req)
 	if err != nil {
-		logger.Error(ctx, "package lookup", err)
+		h.logger.Error(ctx, "package lookup", err)
 		httpsrv.SetRspCode(ctx, http.StatusInternalServerError)
 		return httpsrv.SetError(NewInternalError(err))
 	}
 
 	rsp.Package = models.NewPackage(pkg)
 
-	logger.Debug(ctx, "Success finish PackagesLookup")
+	h.logger.Debug(ctx, "Success finish PackagesLookup")
 	return nil
 }

internal/handler/package_modules.go

@@ -4,18 +4,17 @@ import (
 	"context"
 	"net/http"
 
-	"git.unistack.org/unistack-org/pkgdash/internal/models"
-	pb "git.unistack.org/unistack-org/pkgdash/proto"
-	httpsrv "go.unistack.org/micro-server-http/v4"
-	"go.unistack.org/micro/v4/logger"
+	httpsrv "go.unistack.org/micro-server-http/v3"
+	"go.unistack.org/pkgdash/internal/models"
+	pb "go.unistack.org/pkgdash/proto"
 )
 
 func (h *Handler) PackageModules(ctx context.Context, req *pb.PackageModulesReq, rsp *pb.PackageModulesRsp) error {
-	logger.Debug(ctx, "PackageModules handler start")
+	h.logger.Debug(ctx, "PackageModules handler start")
 
 	modules, err := h.store.PackageModules(ctx, req)
 	if err != nil {
-		logger.Error(ctx, "error db response: %v", err)
+		h.logger.Error(ctx, "error db response: %v", err)
 		httpsrv.SetRspCode(ctx, http.StatusInternalServerError)
 		return httpsrv.SetError(NewInternalError(err))
 	}
@@ -23,6 +22,6 @@ func (h *Handler) PackageModules(ctx context.Context, req *pb.PackageModulesReq,
 	for _, mod := range modules {
 		rsp.Modules = append(rsp.Modules, models.NewModule(mod))
 	}
-	logger.Debug(ctx, "PackagesModules handler stop")
+	h.logger.Debug(ctx, "PackagesModules handler stop")
 	return nil
 }

internal/handler/package_update.go

@@ -4,30 +4,29 @@ import (
 	"context"
 	"net/http"
 
-	"git.unistack.org/unistack-org/pkgdash/internal/models"
-	pb "git.unistack.org/unistack-org/pkgdash/proto"
-	httpsrv "go.unistack.org/micro-server-http/v4"
-	"go.unistack.org/micro/v4/logger"
+	httpsrv "go.unistack.org/micro-server-http/v3"
+	"go.unistack.org/pkgdash/internal/models"
+	pb "go.unistack.org/pkgdash/proto"
 )
 
 func (h *Handler) PackageUpdate(ctx context.Context, req *pb.PackageUpdateReq, rsp *pb.PackageUpdateRsp) error {
-	logger.Debug(ctx, "Start UpdatePackage")
+	h.logger.Debug(ctx, "Start UpdatePackage")
 
 	if err := req.Validate(); err != nil {
-		logger.Error(ctx, "validate error", err)
+		h.logger.Error(ctx, "validate error", err)
 		httpsrv.SetRspCode(ctx, http.StatusBadRequest)
 		return httpsrv.SetError(NewValidationError(err))
 	}
 
 	pkg, err := h.store.PackageUpdate(ctx, req)
 	if err != nil {
-		logger.Error(ctx, "package update error", err)
+		h.logger.Error(ctx, "package update error", err)
 		httpsrv.SetRspCode(ctx, http.StatusInternalServerError)
 		return httpsrv.SetError(NewInternalError(err))
 	}
 
 	rsp.Package = models.NewPackage(pkg)
 
-	logger.Debug(ctx, "Success finish UpdatePackage")
+	h.logger.Debug(ctx, "Success finish UpdatePackage")
 	return nil
 }