add handle: addComment;addPackage storage:ListPackage;AddComment;AddPackage

handler/handlers.go

@@ -2,14 +2,16 @@ package handler
 
 import (
 	"context"
+	"io"
+	"net/http"
+
 	cmsstorage "go.unistack.org/cms-service/storage"
 	"go.unistack.org/micro/v3"
 	"go.unistack.org/micro/v3/errors"
 	"go.unistack.org/unistack-org/pkgdash/config"
-	"go.unistack.org/unistack-org/pkgdash/models"
 	pb "go.unistack.org/unistack-org/pkgdash/proto/go_generate"
 	"go.unistack.org/unistack-org/pkgdash/storage"
-	"net/http"
+	"google.golang.org/protobuf/encoding/protojson"
 )
 
 type Handler struct {
@@ -17,6 +19,8 @@ type Handler struct {
 	store storage.Storage
 
 	writer writer
+	protojson.MarshalOptions
+	protojson.UnmarshalOptions
 }
 
 func (h *Handler) ListPackage(w http.ResponseWriter, r *http.Request) {
@@ -24,7 +28,7 @@ func (h *Handler) ListPackage(w http.ResponseWriter, r *http.Request) {
 	logger := h.svc.Logger()
 	logger.Debug(ctx, "Start getListPackage")
 
-	dbRsp, err := h.store.List(ctx)
+	dbRsp, err := h.store.ListPackage(ctx)
 	if err != nil {
 		logger.Errorf(ctx, "error db response: %v", err)
 		h.writer.Response(ctx, w, err)
@@ -32,7 +36,7 @@ func (h *Handler) ListPackage(w http.ResponseWriter, r *http.Request) {
 	}
 
 	rsp := new(pb.ListPackageRsp)
-	rsp.Packages = models.ListPackage(dbRsp).Mapping()
+	rsp.Packages = dbRsp.Mapping()
 
 	logger.Debug(ctx, "Success finish getListPackage")
 	h.writer.Response(ctx, w, rsp)
@@ -51,7 +55,73 @@ func (h *Handler) AddComment(w http.ResponseWriter, r *http.Request) {
 	logger := h.svc.Logger()
 	logger.Debug(ctx, "Start AddComment")
 
-	// TODO
+	defer r.Body.Close()
+	all, err := io.ReadAll(r.Body)
+	if err != nil {
+		logger.Error(ctx, err)
+		h.writer.Response(ctx, w, NewInternalError(err))
+		return
+	}
+
+	rsp := new(pb.AddCommentRsp)
+	if err = h.Unmarshal(all, rsp); err != nil {
+		logger.Error(ctx, err)
+		h.writer.Response(ctx, w, NewUnmarshalError(err))
+		return
+	}
+
+	if err = rsp.Validate(); err != nil {
+		logger.Error(ctx, err)
+		h.writer.Response(ctx, w, NewValidationError(err))
+		return
+	}
+
+	if err = h.store.AddComment(ctx, rsp); err != nil {
+		logger.Error(ctx, err)
+		h.writer.Response(ctx, w, NewInternalError(err))
+		return
+	}
+
+	logger.Debug(ctx, "Success finish addComment")
+}
+
+func (h *Handler) AddPackage(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
+	logger := h.svc.Logger()
+	logger.Debug(ctx, "Start AddPackage")
+
+	defer r.Body.Close()
+	all, err := io.ReadAll(r.Body)
+	if err != nil {
+		logger.Error(ctx, err)
+		h.writer.Response(ctx, w, NewInternalError(err))
+		return
+	}
+
+	req := new(pb.AddPackageRsp)
+	if err = h.Unmarshal(all, req); err != nil {
+		logger.Error(ctx, err)
+		h.writer.Response(ctx, w, NewUnmarshalError(err))
+		return
+	}
+
+	if err = req.Validate(); err != nil {
+		logger.Error(ctx, err)
+		h.writer.Response(ctx, w, NewValidationError(err))
+		return
+	}
+
+	// TODO:
+	// need logic for add module from go.mod
+	// err := setModules(req)
+
+	if err = h.store.AddPackage(ctx, req); err != nil {
+		logger.Error(ctx, err)
+		h.writer.Response(ctx, w, NewInternalError(err))
+		return
+	}
+
+	logger.Debug(ctx, "Success finish addPackage")
 }
 
 func NewHandler(svc micro.Service, w writer) *Handler {

handler/middleware.go

@@ -0,0 +1,21 @@
+package handler
+
+import "net/http"
+
+func Methods(m string, next http.HandlerFunc) http.HandlerFunc {
+	return func(w http.ResponseWriter, req *http.Request) {
+		if req.Method != m {
+			http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
+			return
+		}
+
+		switch req.Method {
+		case http.MethodPost:
+			w.WriteHeader(http.StatusCreated)
+		case http.MethodPut:
+			w.WriteHeader(http.StatusNoContent)
+		}
+
+		next.ServeHTTP(w, req)
+	}
+}

handler/writer.go

@@ -2,7 +2,7 @@ package handler
 
 import (
 	"context"
-	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v3/logger"
 	pb "go.unistack.org/unistack-org/pkgdash/proto/go_generate"
 	"net/http"
 
@@ -18,6 +18,7 @@ type writer interface {
 	Response(ctx context.Context, rw http.ResponseWriter, value interface{})
 }
 
+// nolint
 type stackTracer interface {
 	StackTrace() errors.StackTrace
 }