rewrite

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2023-08-16 13:17:42 +03:00
parent 0678e72908
commit 78f0ae14d7
70 changed files with 4159 additions and 2355 deletions
--- a/proto/apidocs.swagger.yaml
+++ b/proto/apidocs.swagger.yaml
@@ -5,87 +5,11 @@ info:
    title: PkgdashService API
    version: 0.0.1
 paths:
-    /v1/comment:
+    /v1/comments/{id}/comments:
        get:
            tags:
                - PkgdashService
-            operationId: GetComments
-            parameters:
-                - name: id
-                  in: query
-                  schema:
-                    type: array
-                    items:
-                        type: integer
-                        format: uint64
-            responses:
-                default:
-                    description: Default
-                    content:
-                        application/json:
-                            schema:
-                                $ref: '#/components/schemas/ErrorRsp'
-                "200":
-                    description: OK
-                    content:
-                        application/json:
-                            schema:
-                                $ref: '#/components/schemas/GetCommentsRsp'
-    /v1/module:
-        get:
-            tags:
-                - PkgdashService
-            operationId: GetModule
-            parameters:
-                - name: id
-                  in: query
-                  schema:
-                    type: array
-                    items:
-                        type: integer
-                        format: uint64
-            responses:
-                default:
-                    description: Default
-                    content:
-                        application/json:
-                            schema:
-                                $ref: '#/components/schemas/ErrorRsp'
-                "200":
-                    description: OK
-                    content:
-                        application/json:
-                            schema:
-                                $ref: '#/components/schemas/GetModuleRsp'
-    /v1/package:
-        post:
-            tags:
-                - PkgdashService
-            operationId: AddPackage
-            requestBody:
-                content:
-                    application/json:
-                        schema:
-                            $ref: '#/components/schemas/AddPackageReq'
-                required: true
-            responses:
-                default:
-                    description: Default
-                    content:
-                        application/json:
-                            schema:
-                                $ref: '#/components/schemas/ErrorRsp'
-                "200":
-                    description: OK
-                    content:
-                        application/json:
-                            schema:
-                                $ref: '#/components/schemas/AddPackageRsp'
-    /v1/package/{id}:
-        post:
-            tags:
-                - PkgdashService
-            operationId: UpdateInfo
+            operationId: CommentsLookup
            parameters:
                - name: id
                  in: path
@@ -93,12 +17,11 @@ paths:
                  schema:
                    type: integer
                    format: uint64
-            requestBody:
-                content:
-                    application/json:
-                        schema:
-                            $ref: '#/components/schemas/UpdatePackageReq'
-                required: true
+                - name: package_id
+                  in: query
+                  schema:
+                    type: integer
+                    format: uint64
            responses:
                default:
                    description: Default
@@ -111,24 +34,12 @@ paths:
                    content:
                        application/json:
                            schema:
-                                $ref: '#/components/schemas/UpdatePackageRsp'
-    /v1/package/{pkg}/comment:
-        post:
+                                $ref: '#/components/schemas/CommentsLookupRsp'
+    /v1/modules:
+        get:
            tags:
                - PkgdashService
-            operationId: AddComment
-            parameters:
-                - name: pkg
-                  in: path
-                  required: true
-                  schema:
-                    type: string
-            requestBody:
-                content:
-                    application/json:
-                        schema:
-                            $ref: '#/components/schemas/AddCommentReq'
-                required: true
+            operationId: ModulesList
            responses:
                default:
                    description: Default
@@ -141,12 +52,12 @@ paths:
                    content:
                        application/json:
                            schema:
-                                $ref: '#/components/schemas/AddCommentRsp'
+                                $ref: '#/components/schemas/ModulesListRsp'
    /v1/packages:
        get:
            tags:
                - PkgdashService
-            operationId: ListPackage
+            operationId: PackagesList
            responses:
                default:
                    description: Default
@@ -159,40 +70,173 @@ paths:
                    content:
                        application/json:
                            schema:
-                                $ref: '#/components/schemas/ListPackageRsp'
+                                $ref: '#/components/schemas/PackagesListRsp'
+        post:
+            tags:
+                - PkgdashService
+            operationId: PackagesCreate
+            requestBody:
+                content:
+                    application/json:
+                        schema:
+                            $ref: '#/components/schemas/PackagesCreateReq'
+                required: true
+            responses:
+                default:
+                    description: Default
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/ErrorRsp'
+                "200":
+                    description: OK
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/PackagesCreateRsp'
+    /v1/packages/{id}:
+        put:
+            tags:
+                - PkgdashService
+            operationId: PackagesUpdate
+            parameters:
+                - name: id
+                  in: path
+                  required: true
+                  schema:
+                    type: integer
+                    format: uint64
+            requestBody:
+                content:
+                    application/json:
+                        schema:
+                            $ref: '#/components/schemas/PackagesUpdateReq'
+                required: true
+            responses:
+                default:
+                    description: Default
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/ErrorRsp'
+                "200":
+                    description: OK
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/PackagesUpdateRsp'
+        delete:
+            tags:
+                - PkgdashService
+            operationId: PackagesDelete
+            parameters:
+                - name: id
+                  in: path
+                  required: true
+                  schema:
+                    type: integer
+                    format: uint64
+            responses:
+                default:
+                    description: Default
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/ErrorRsp'
+                "200":
+                    description: OK
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/PackagesDeleteRsp'
+    /v1/packages/{package_id}/comments:
+        get:
+            tags:
+                - PkgdashService
+            operationId: CommentsList
+            parameters:
+                - name: package_id
+                  in: path
+                  required: true
+                  schema:
+                    type: integer
+                    format: uint64
+            responses:
+                default:
+                    description: Default
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/ErrorRsp'
+                "200":
+                    description: OK
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/CommentsListRsp'
+        post:
+            tags:
+                - PkgdashService
+            operationId: CommentsCreate
+            parameters:
+                - name: package_id
+                  in: path
+                  required: true
+                  schema:
+                    type: integer
+                    format: uint64
+            requestBody:
+                content:
+                    application/json:
+                        schema:
+                            $ref: '#/components/schemas/CommentsCreateReq'
+                required: true
+            responses:
+                default:
+                    description: Default
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/ErrorRsp'
+                "200":
+                    description: OK
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/CommentsCreateRsp'
+    /v1/packages/{package_id}/comments/{id}:
+        delete:
+            tags:
+                - PkgdashService
+            operationId: CommentsDelete
+            parameters:
+                - name: package_id
+                  in: path
+                  required: true
+                  schema:
+                    type: integer
+                    format: uint64
+                - name: id
+                  in: path
+                  required: true
+                  schema:
+                    type: integer
+                    format: uint64
+            responses:
+                default:
+                    description: Default
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/ErrorRsp'
+                "200":
+                    description: OK
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/CommentsDeleteRsp'
 components:
    schemas:
-        AddCommentReq:
-            type: object
-            properties:
-                idPackage:
-                    type: integer
-                    format: uint64
-                text:
-                    type: string
-        AddCommentRsp:
-            type: object
-            properties:
-                id:
-                    type: integer
-                    format: uint64
-        AddPackageReq:
-            type: object
-            properties:
-                name:
-                    type: string
-                url:
-                    type: string
-                modules:
-                    type: array
-                    items:
-                        type: integer
-                        format: uint64
-        AddPackageRsp:
-            type: object
-            properties:
-                status:
-                    type: string
        Comment:
            type: object
            properties:
@@ -206,9 +250,39 @@ components:
                    type: string
                created:
                    type: string
+                    format: RFC3339
                updated:
                    type: string
-        Error:
+                    format: RFC3339
+        CommentsCreateReq:
+            type: object
+            properties:
+                package_id:
+                    type: integer
+                    format: uint64
+                text:
+                    type: string
+        CommentsCreateRsp:
+            type: object
+            properties:
+                comment:
+                    $ref: '#/components/schemas/Comment'
+        CommentsDeleteRsp:
+            type: object
+            properties: {}
+        CommentsListRsp:
+            type: object
+            properties:
+                comments:
+                    type: array
+                    items:
+                        $ref: '#/components/schemas/Comment'
+        CommentsLookupRsp:
+            type: object
+            properties:
+                comment:
+                    $ref: '#/components/schemas/Comment'
+        ErrorRsp:
            type: object
            properties:
                code:
@@ -219,32 +293,6 @@ components:
                    type: string
                details:
                    type: string
-        ErrorRsp:
-            type: object
-            properties:
-                error:
-                    $ref: '#/components/schemas/Error'
-        GetCommentsRsp:
-            type: object
-            properties:
-                comments:
-                    type: array
-                    items:
-                        $ref: '#/components/schemas/Comment'
-        GetModuleRsp:
-            type: object
-            properties:
-                modules:
-                    type: array
-                    items:
-                        $ref: '#/components/schemas/Module'
-        ListPackageRsp:
-            type: object
-            properties:
-                packages:
-                    type: array
-                    items:
-                        $ref: '#/components/schemas/Package'
        Module:
            type: object
            properties:
@@ -260,6 +308,19 @@ components:
                    format: uint64
                last_version:
                    type: string
+                created:
+                    type: string
+                    format: RFC3339
+                updated:
+                    type: string
+                    format: RFC3339
+        ModulesListRsp:
+            type: object
+            properties:
+                modules:
+                    type: array
+                    items:
+                        $ref: '#/components/schemas/Module'
        Package:
            type: object
            properties:
@@ -285,7 +346,40 @@ components:
                    items:
                        type: integer
                        format: uint64
-        UpdatePackageReq:
+                created:
+                    type: string
+                    format: RFC3339
+                updated:
+                    type: string
+                    format: RFC3339
+        PackagesCreateReq:
+            type: object
+            properties:
+                name:
+                    type: string
+                url:
+                    type: string
+                modules:
+                    type: array
+                    items:
+                        type: integer
+                        format: uint64
+        PackagesCreateRsp:
+            type: object
+            properties:
+                status:
+                    type: string
+        PackagesDeleteRsp:
+            type: object
+            properties: {}
+        PackagesListRsp:
+            type: object
+            properties:
+                packages:
+                    type: array
+                    items:
+                        $ref: '#/components/schemas/Package'
+        PackagesUpdateReq:
            type: object
            properties:
                id:
@@ -305,11 +399,10 @@ components:
                    items:
                        type: integer
                        format: uint64
-        UpdatePackageRsp:
+        PackagesUpdateRsp:
            type: object
            properties:
-                id:
-                    type: integer
-                    format: uint64
+                package:
+                    $ref: '#/components/schemas/Package'
 tags:
    - name: PkgdashService
--- a/proto/pkgdash.pb.go
+++ b/proto/pkgdash.pb.go
--- a/proto/pkgdash.pb.validate.go
+++ b/proto/pkgdash.pb.validate.go
--- a/proto/pkgdash.proto
+++ b/proto/pkgdash.proto
@@ -2,17 +2,17 @@ syntax = "proto3";

 package pkgdash;

-option go_package = "go.unistack.org/unistack-org/pkgdash/proto;pkgdashpb";
-
 import "api/annotations.proto";
 import "openapiv3/annotations.proto";
 import "validate/validate.proto";
-import "google/protobuf/empty.proto";
+import "google/protobuf/timestamp.proto";
+
+option go_package = "go.unistack.org/unistack-org/pkgdash/proto;pkgdashpb";

 service PkgdashService {
-  rpc ListPackage(google.protobuf.Empty) returns (ListPackageRsp) {
+  rpc PackagesCreate(PackagesCreateReq) returns (PackagesCreateRsp) {
    option (micro.openapiv3.openapiv3_operation) = {
-      operation_id: "ListPackage";
+      operation_id: "PackagesCreate";
      responses: {
        default: {
          reference: {_ref: ".pkgdash.ErrorRsp"};
@@ -20,84 +20,113 @@ service PkgdashService {
      };
    };
    option (micro.api.http) = {
-      get: "/v1/packages";
-    };
-  };
-  rpc UpdatePackage(UpdatePackageReq) returns (UpdatePackageRsp) {
-    option (micro.openapiv3.openapiv3_operation) = {
-      operation_id: "UpdateInfo";
-      responses: {
-        default: {
-          reference: {_ref: ".pkgdash.ErrorRsp"};
-        };
-      };
-    };
-    option (micro.api.http) = {
-      post: "/v1/package/{id}";
+      post: "/v1/packages";
      body: "*";
    };
-  };
-  rpc AddComment(AddCommentReq) returns (AddCommentRsp) {
-    option (micro.openapiv3.openapiv3_operation) = {
-      operation_id: "AddComment";
-      responses: {
-        default: {
-          reference: {_ref: ".pkgdash.ErrorRsp"};
-        };
-      };
-    };
-    option (micro.api.http) = {
-      post: "/v1/package/{pkg}/comment";
-      body: "*";
-    };
-  };
-  rpc AddPackage(AddPackageReq) returns (AddPackageRsp) {
-    option (micro.openapiv3.openapiv3_operation) = {
-      operation_id: "AddPackage";
-      responses: {
-        default: {
-          reference: {_ref: ".pkgdash.ErrorRsp"};
-        };
-      };
-    };
-    option (micro.api.http) = {
-      post: "/v1/package";
-      body: "*";
-    };
-  };
-  rpc GetModule(GetModuleReq) returns (GetModuleRsp) {
-    option (micro.openapiv3.openapiv3_operation) = {
-      operation_id: "GetModule";
-      responses: {
-        default: {
-          reference: {_ref: ".pkgdash.ErrorRsp"};
-        };
-      };
-    };
-    option (micro.api.http) = {
-      get: "/v1/module";
-    };
-  };
-  rpc GetComments(GetCommentsReq) returns (GetCommentsRsp) {
-    option (micro.openapiv3.openapiv3_operation) = {
-      operation_id: "GetComments";
-      responses: {
-        default: {
-          reference: {_ref: ".pkgdash.ErrorRsp"};
-        };
-      };
-    };
-    option (micro.api.http) = {
-      get: "/v1/comment";
-    };
  }
-};
-
-message ErrorRsp {
-  Error error = 1 [json_name = "error"];
+  rpc PackagesDelete(PackagesDeleteReq) returns (PackagesDeleteRsp) {
+    option (micro.openapiv3.openapiv3_operation) = {
+      operation_id: "PackagesDelete";
+      responses: {
+        default: {
+          reference: {_ref: ".pkgdash.ErrorRsp"};
+        };
+      };
+    };
+    option (micro.api.http) = {delete: "/v1/packages/{id}"};
+  }
+  rpc PackagesList(PackagesListReq) returns (PackagesListRsp) {
+    option (micro.openapiv3.openapiv3_operation) = {
+      operation_id: "PackagesList";
+      responses: {
+        default: {
+          reference: {_ref: ".pkgdash.ErrorRsp"};
+        };
+      };
+    };
+    option (micro.api.http) = {get: "/v1/packages"};
+  }
+  rpc PackagesUpdate(PackagesUpdateReq) returns (PackagesUpdateRsp) {
+    option (micro.openapiv3.openapiv3_operation) = {
+      operation_id: "PackagesUpdate";
+      responses: {
+        default: {
+          reference: {_ref: ".pkgdash.ErrorRsp"};
+        };
+      };
+    };
+    option (micro.api.http) = {
+      put: "/v1/packages/{id}";
+      body: "*";
+    };
+  }
+  rpc CommentsCreate(CommentsCreateReq) returns (CommentsCreateRsp) {
+    option (micro.openapiv3.openapiv3_operation) = {
+      operation_id: "CommentsCreate";
+      responses: {
+        default: {
+          reference: {_ref: ".pkgdash.ErrorRsp"};
+        };
+      };
+    };
+    option (micro.api.http) = {
+      post: "/v1/packages/{package_id}/comments";
+      body: "*";
+    };
+  }
+  rpc CommentsLookup(CommentsLookupReq) returns (CommentsLookupRsp) {
+    option (micro.openapiv3.openapiv3_operation) = {
+      operation_id: "CommentsLookup";
+      responses: {
+        default: {
+          reference: {_ref: ".pkgdash.ErrorRsp"};
+        };
+      };
+    };
+    option (micro.api.http) = {
+      get: "/v1/comments/{id}/comments";
+      additional_bindings {get: "/v1/comments/{package_id}/comments/{id}"};
+    };
+  }
+  rpc CommentsList(CommentsListReq) returns (CommentsListRsp) {
+    option (micro.openapiv3.openapiv3_operation) = {
+      operation_id: "CommentsList";
+      responses: {
+        default: {
+          reference: {_ref: ".pkgdash.ErrorRsp"};
+        };
+      };
+    };
+    option (micro.api.http) = {get: "/v1/packages/{package_id}/comments"};
+  }
+  rpc CommentsDelete(CommentsDeleteReq) returns (CommentsDeleteRsp) {
+    option (micro.openapiv3.openapiv3_operation) = {
+      operation_id: "CommentsDelete";
+      responses: {
+        default: {
+          reference: {_ref: ".pkgdash.ErrorRsp"};
+        };
+      };
+    };
+    option (micro.api.http) = {
+      delete: "/v1/packages/{package_id}/comments/{id}";
+      additional_bindings {delete: "/v1/comments/{id}"};
+    };
+  }
+  rpc ModulesList(ModulesListReq) returns (ModulesListRsp) {
+    option (micro.openapiv3.openapiv3_operation) = {
+      operation_id: "ModulesList";
+      responses: {
+        default: {
+          reference: {_ref: ".pkgdash.ErrorRsp"};
+        };
+      };
+    };
+    option (micro.api.http) = {get: "/v1/modules"};
+  }
 }

-message Error {
+message ErrorRsp {
  string code = 1 [json_name = "code"];
  string title = 2 [json_name = "title"];
  string uuid = 3 [json_name = "uuid"];
@@ -111,7 +140,9 @@ message Package {
  repeated uint64 modules = 4;
  repeated uint64 issues = 5;
  repeated uint64 comments = 6;
-};
+  google.protobuf.Timestamp created = 7;
+  google.protobuf.Timestamp updated = 8;
+}

 message Module {
  uint64 id = 1 [(validate.rules).uint64.gt = 0];
@@ -119,6 +150,8 @@ message Module {
  string version = 3 [(validate.rules).string.min_len = 1];
  uint64 package = 4 [(validate.rules).uint64.gt = 0];
  string last_version = 5 [(validate.rules).string.min_len = 1];
+  google.protobuf.Timestamp created = 6;
+  google.protobuf.Timestamp updated = 7;
 }

 message Issue {
@@ -127,75 +160,90 @@ message Issue {
  string desc = 3 [(validate.rules).string.min_len = 1];
  uint64 package = 4 [(validate.rules).uint64.gt = 0];
  repeated uint64 modules = 5;
+  google.protobuf.Timestamp created = 6;
+  google.protobuf.Timestamp updated = 7;
 }

 message Comment {
  uint64 id = 1 [(validate.rules).uint64.gt = 0];
  uint64 package = 2 [(validate.rules).uint64.gt = 0];
  string text = 3;
-  string created = 4 ;
-  string updated = 5 ;
+  google.protobuf.Timestamp created = 4;
+  google.protobuf.Timestamp updated = 5;
 }

-message ListPackageReq {}
-message ListPackageRsp{
+message CommentsDeleteReq {
+  uint64 id = 1 [json_name = "id"];
+  uint64 package_id = 2 [json_name = "package_id"];
+}
+
+message CommentsDeleteRsp {}
+
+message PackagesDeleteReq {
+  uint64 id = 1 [json_name = "id"];
+}
+
+message PackagesDeleteRsp {}
+
+message PackagesListReq {}
+
+message PackagesListRsp {
  repeated Package packages = 1;
 }

-message UpdatePackageReq {
+message PackagesUpdateReq {
  uint64 id = 1 [(validate.rules).uint64.gt = 0];
  string name = 2 [(validate.rules).string.min_len = 1];
  string url = 3 [(validate.rules).string.min_len = 1];
-  repeated uint64 modules = 4 ;
-  repeated uint64 issues = 5 ;
-}
-message UpdatePackageRsp {
-  uint64 id = 1 [(validate.rules).uint64.gt = 0];
+  repeated uint64 modules = 4;
+  repeated uint64 issues = 5;
 }

-message CommentReq {
-  uint64 pkg = 1 [(validate.rules).uint64.gt = 0];
+message PackagesUpdateRsp {
+  Package package = 1 [json_name = "package"];
+}
+
+message CommentsCreateReq {
+  uint64 package_id = 1 [
+    json_name = "package_id",
+    (validate.rules).uint64.gt = 0
+  ];
  string text = 2;
 }

-message AddCommentReq {
-  uint64 idPackage = 1 [(validate.rules).uint64.gt = 0];
-  string text = 2;
+message CommentsCreateRsp {
+  Comment comment = 1 [json_name = "comment"];
 }

-message AddCommentRsp {
-  uint64 id = 1 [(validate.rules).uint64.gt = 0];
-}
-
-message AddPackageReq {
+message PackagesCreateReq {
  string name = 1 [(validate.rules).string.min_len = 1];
-  string url = 2  [(validate.rules).string.min_len = 1];
+  string url = 2 [(validate.rules).string.min_len = 1];
  repeated uint64 modules = 3;
 }

-message AddPackageRsp{
+message PackagesCreateRsp {
  string status = 1 [(validate.rules).string.min_len = 1];
 }

-message GetModuleReq {
-  repeated uint64 id = 1 ;
-}
-message GetModuleRsp {
-  repeated Module modules = 1 ;
+message ModulesListReq {}
+
+message ModulesListRsp {
+  repeated Module modules = 1;
 }

-message GetCommentsReq {
-  repeated uint64 id = 1 [(validate.rules).repeated = {
-    unique: true
-    min_items: 1
-    items: {
-      uint64: {
-        gt: 0
-      }
-    }
-  }] ;
+message CommentsListReq {
+  uint64 package_id = 1 [json_name = "package_id"];
 }

-message GetCommentsRsp {
-  repeated Comment comments = 1;
-}
+message CommentsListRsp {
+  repeated Comment comments = 1 [json_name = "comments"];
+}
+
+message CommentsLookupReq {
+  uint64 id = 1 [json_name = "id"];
+  uint64 package_id = 2 [json_name = "package_id"];
+}
+
+message CommentsLookupRsp {
+  Comment comment = 1 [json_name = "comment"];
+}
--- a/proto/pkgdash_micro.pb.go
+++ b/proto/pkgdash_micro.pb.go
@@ -10,7 +10,6 @@ import (
 	context "context"
 	_ "go.unistack.org/micro/v4/client"
 	options "go.unistack.org/micro/v4/options"
-	emptypb "google.golang.org/protobuf/types/known/emptypb"
 )

 var (
@@ -18,19 +17,25 @@ var (
 )

 type PkgdashServiceClient interface {
-	ListPackage(ctx context.Context, req *emptypb.Empty, opts ...options.Option) (*ListPackageRsp, error)
-	UpdatePackage(ctx context.Context, req *UpdatePackageReq, opts ...options.Option) (*UpdatePackageRsp, error)
-	AddComment(ctx context.Context, req *AddCommentReq, opts ...options.Option) (*AddCommentRsp, error)
-	AddPackage(ctx context.Context, req *AddPackageReq, opts ...options.Option) (*AddPackageRsp, error)
-	GetModule(ctx context.Context, req *GetModuleReq, opts ...options.Option) (*GetModuleRsp, error)
-	GetComments(ctx context.Context, req *GetCommentsReq, opts ...options.Option) (*GetCommentsRsp, error)
+	PackagesCreate(ctx context.Context, req *PackagesCreateReq, opts ...options.Option) (*PackagesCreateRsp, error)
+	PackagesDelete(ctx context.Context, req *PackagesDeleteReq, opts ...options.Option) (*PackagesDeleteRsp, error)
+	PackagesList(ctx context.Context, req *PackagesListReq, opts ...options.Option) (*PackagesListRsp, error)
+	PackagesUpdate(ctx context.Context, req *PackagesUpdateReq, opts ...options.Option) (*PackagesUpdateRsp, error)
+	CommentsCreate(ctx context.Context, req *CommentsCreateReq, opts ...options.Option) (*CommentsCreateRsp, error)
+	CommentsLookup(ctx context.Context, req *CommentsLookupReq, opts ...options.Option) (*CommentsLookupRsp, error)
+	CommentsList(ctx context.Context, req *CommentsListReq, opts ...options.Option) (*CommentsListRsp, error)
+	CommentsDelete(ctx context.Context, req *CommentsDeleteReq, opts ...options.Option) (*CommentsDeleteRsp, error)
+	ModulesList(ctx context.Context, req *ModulesListReq, opts ...options.Option) (*ModulesListRsp, error)
 }

 type PkgdashServiceServer interface {
-	ListPackage(ctx context.Context, req *emptypb.Empty, rsp *ListPackageRsp) error
-	UpdatePackage(ctx context.Context, req *UpdatePackageReq, rsp *UpdatePackageRsp) error
-	AddComment(ctx context.Context, req *AddCommentReq, rsp *AddCommentRsp) error
-	AddPackage(ctx context.Context, req *AddPackageReq, rsp *AddPackageRsp) error
-	GetModule(ctx context.Context, req *GetModuleReq, rsp *GetModuleRsp) error
-	GetComments(ctx context.Context, req *GetCommentsReq, rsp *GetCommentsRsp) error
+	PackagesCreate(ctx context.Context, req *PackagesCreateReq, rsp *PackagesCreateRsp) error
+	PackagesDelete(ctx context.Context, req *PackagesDeleteReq, rsp *PackagesDeleteRsp) error
+	PackagesList(ctx context.Context, req *PackagesListReq, rsp *PackagesListRsp) error
+	PackagesUpdate(ctx context.Context, req *PackagesUpdateReq, rsp *PackagesUpdateRsp) error
+	CommentsCreate(ctx context.Context, req *CommentsCreateReq, rsp *CommentsCreateRsp) error
+	CommentsLookup(ctx context.Context, req *CommentsLookupReq, rsp *CommentsLookupRsp) error
+	CommentsList(ctx context.Context, req *CommentsListReq, rsp *CommentsListRsp) error
+	CommentsDelete(ctx context.Context, req *CommentsDeleteReq, rsp *CommentsDeleteRsp) error
+	ModulesList(ctx context.Context, req *ModulesListReq, rsp *ModulesListRsp) error
 }
--- a/proto/pkgdash_micro_http.pb.go
+++ b/proto/pkgdash_micro_http.pb.go
@@ -11,50 +11,84 @@ import (
 	client "go.unistack.org/micro/v4/client"
 	options "go.unistack.org/micro/v4/options"
 	server "go.unistack.org/micro/v4/server"
-	emptypb "google.golang.org/protobuf/types/known/emptypb"
 	http "net/http"
 )

 var (
 	PkgdashServiceServerEndpoints = []v4.EndpointMetadata{
 		{
-			Name:   "PkgdashService.ListPackage",
+			Name:   "PkgdashService.PackagesCreate",
+			Path:   "/v1/packages",
+			Method: "POST",
+			Body:   "*",
+			Stream: false,
+		},
+		{
+			Name:   "PkgdashService.PackagesDelete",
+			Path:   "/v1/packages/{id}",
+			Method: "DELETE",
+			Body:   "",
+			Stream: false,
+		},
+		{
+			Name:   "PkgdashService.PackagesList",
 			Path:   "/v1/packages",
 			Method: "GET",
 			Body:   "",
 			Stream: false,
 		},
 		{
-			Name:   "PkgdashService.UpdatePackage",
-			Path:   "/v1/package/{id}",
+			Name:   "PkgdashService.PackagesUpdate",
+			Path:   "/v1/packages/{id}",
+			Method: "PUT",
+			Body:   "*",
+			Stream: false,
+		},
+		{
+			Name:   "PkgdashService.CommentsCreate",
+			Path:   "/v1/packages/{package_id}/comments",
 			Method: "POST",
 			Body:   "*",
 			Stream: false,
 		},
 		{
-			Name:   "PkgdashService.AddComment",
-			Path:   "/v1/package/{pkg}/comment",
-			Method: "POST",
-			Body:   "*",
-			Stream: false,
-		},
-		{
-			Name:   "PkgdashService.AddPackage",
-			Path:   "/v1/package",
-			Method: "POST",
-			Body:   "*",
-			Stream: false,
-		},
-		{
-			Name:   "PkgdashService.GetModule",
-			Path:   "/v1/module",
+			Name:   "PkgdashService.CommentsLookup",
+			Path:   "/v1/comments/{id}/comments",
 			Method: "GET",
 			Body:   "",
 			Stream: false,
 		},
 		{
-			Name:   "PkgdashService.GetComments",
-			Path:   "/v1/comment",
+			Name:   "PkgdashService.CommentsLookup",
+			Path:   "/v1/comments/{package_id}/comments/{id}",
+			Method: "GET",
+			Body:   "",
+			Stream: false,
+		},
+		{
+			Name:   "PkgdashService.CommentsList",
+			Path:   "/v1/packages/{package_id}/comments",
+			Method: "GET",
+			Body:   "",
+			Stream: false,
+		},
+		{
+			Name:   "PkgdashService.CommentsDelete",
+			Path:   "/v1/packages/{package_id}/comments/{id}",
+			Method: "DELETE",
+			Body:   "",
+			Stream: false,
+		},
+		{
+			Name:   "PkgdashService.CommentsDelete",
+			Path:   "/v1/comments/{id}",
+			Method: "DELETE",
+			Body:   "",
+			Stream: false,
+		},
+		{
+			Name:   "PkgdashService.ModulesList",
+			Path:   "/v1/modules",
 			Method: "GET",
 			Body:   "",
 			Stream: false,
@@ -71,7 +105,44 @@ func NewPkgdashServiceClient(name string, c client.Client) PkgdashServiceClient
 	return &pkgdashServiceClient{c: c, name: name}
 }

-func (c *pkgdashServiceClient) ListPackage(ctx context.Context, req *emptypb.Empty, opts ...options.Option) (*ListPackageRsp, error) {
+func (c *pkgdashServiceClient) PackagesCreate(ctx context.Context, req *PackagesCreateReq, opts ...options.Option) (*PackagesCreateRsp, error) {
+	errmap := make(map[string]interface{}, 1)
+	errmap["default"] = &ErrorRsp{}
+	opts = append(opts,
+		v41.ErrorMap(errmap),
+	)
+	opts = append(opts,
+		v41.Method(http.MethodPost),
+		v41.Path("/v1/packages"),
+		v41.Body("*"),
+	)
+	rsp := &PackagesCreateRsp{}
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.PackagesCreate", req), rsp, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return rsp, nil
+}
+
+func (c *pkgdashServiceClient) PackagesDelete(ctx context.Context, req *PackagesDeleteReq, opts ...options.Option) (*PackagesDeleteRsp, error) {
+	errmap := make(map[string]interface{}, 1)
+	errmap["default"] = &ErrorRsp{}
+	opts = append(opts,
+		v41.ErrorMap(errmap),
+	)
+	opts = append(opts,
+		v41.Method(http.MethodDelete),
+		v41.Path("/v1/packages/{id}"),
+	)
+	rsp := &PackagesDeleteRsp{}
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.PackagesDelete", req), rsp, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return rsp, nil
+}
+
+func (c *pkgdashServiceClient) PackagesList(ctx context.Context, req *PackagesListReq, opts ...options.Option) (*PackagesListRsp, error) {
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &ErrorRsp{}
 	opts = append(opts,
@@ -81,15 +152,34 @@ func (c *pkgdashServiceClient) ListPackage(ctx context.Context, req *emptypb.Emp
 		v41.Method(http.MethodGet),
 		v41.Path("/v1/packages"),
 	)
-	rsp := &ListPackageRsp{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.ListPackage", req), rsp, opts...)
+	rsp := &PackagesListRsp{}
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.PackagesList", req), rsp, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return rsp, nil
 }

-func (c *pkgdashServiceClient) UpdatePackage(ctx context.Context, req *UpdatePackageReq, opts ...options.Option) (*UpdatePackageRsp, error) {
+func (c *pkgdashServiceClient) PackagesUpdate(ctx context.Context, req *PackagesUpdateReq, opts ...options.Option) (*PackagesUpdateRsp, error) {
+	errmap := make(map[string]interface{}, 1)
+	errmap["default"] = &ErrorRsp{}
+	opts = append(opts,
+		v41.ErrorMap(errmap),
+	)
+	opts = append(opts,
+		v41.Method(http.MethodPut),
+		v41.Path("/v1/packages/{id}"),
+		v41.Body("*"),
+	)
+	rsp := &PackagesUpdateRsp{}
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.PackagesUpdate", req), rsp, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return rsp, nil
+}
+
+func (c *pkgdashServiceClient) CommentsCreate(ctx context.Context, req *CommentsCreateReq, opts ...options.Option) (*CommentsCreateRsp, error) {
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &ErrorRsp{}
 	opts = append(opts,
@@ -97,56 +187,18 @@ func (c *pkgdashServiceClient) UpdatePackage(ctx context.Context, req *UpdatePac
 	)
 	opts = append(opts,
 		v41.Method(http.MethodPost),
-		v41.Path("/v1/package/{id}"),
+		v41.Path("/v1/packages/{package_id}/comments"),
 		v41.Body("*"),
 	)
-	rsp := &UpdatePackageRsp{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.UpdatePackage", req), rsp, opts...)
+	rsp := &CommentsCreateRsp{}
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.CommentsCreate", req), rsp, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return rsp, nil
 }

-func (c *pkgdashServiceClient) AddComment(ctx context.Context, req *AddCommentReq, opts ...options.Option) (*AddCommentRsp, error) {
-	errmap := make(map[string]interface{}, 1)
-	errmap["default"] = &ErrorRsp{}
-	opts = append(opts,
-		v41.ErrorMap(errmap),
-	)
-	opts = append(opts,
-		v41.Method(http.MethodPost),
-		v41.Path("/v1/package/{pkg}/comment"),
-		v41.Body("*"),
-	)
-	rsp := &AddCommentRsp{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.AddComment", req), rsp, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return rsp, nil
-}
-
-func (c *pkgdashServiceClient) AddPackage(ctx context.Context, req *AddPackageReq, opts ...options.Option) (*AddPackageRsp, error) {
-	errmap := make(map[string]interface{}, 1)
-	errmap["default"] = &ErrorRsp{}
-	opts = append(opts,
-		v41.ErrorMap(errmap),
-	)
-	opts = append(opts,
-		v41.Method(http.MethodPost),
-		v41.Path("/v1/package"),
-		v41.Body("*"),
-	)
-	rsp := &AddPackageRsp{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.AddPackage", req), rsp, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return rsp, nil
-}
-
-func (c *pkgdashServiceClient) GetModule(ctx context.Context, req *GetModuleReq, opts ...options.Option) (*GetModuleRsp, error) {
+func (c *pkgdashServiceClient) CommentsLookup(ctx context.Context, req *CommentsLookupReq, opts ...options.Option) (*CommentsLookupRsp, error) {
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &ErrorRsp{}
 	opts = append(opts,
@@ -154,17 +206,17 @@ func (c *pkgdashServiceClient) GetModule(ctx context.Context, req *GetModuleReq,
 	)
 	opts = append(opts,
 		v41.Method(http.MethodGet),
-		v41.Path("/v1/module"),
+		v41.Path("/v1/comments/{id}/comments"),
 	)
-	rsp := &GetModuleRsp{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.GetModule", req), rsp, opts...)
+	rsp := &CommentsLookupRsp{}
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.CommentsLookup", req), rsp, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return rsp, nil
 }

-func (c *pkgdashServiceClient) GetComments(ctx context.Context, req *GetCommentsReq, opts ...options.Option) (*GetCommentsRsp, error) {
+func (c *pkgdashServiceClient) CommentsList(ctx context.Context, req *CommentsListReq, opts ...options.Option) (*CommentsListRsp, error) {
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &ErrorRsp{}
 	opts = append(opts,
@@ -172,10 +224,46 @@ func (c *pkgdashServiceClient) GetComments(ctx context.Context, req *GetComments
 	)
 	opts = append(opts,
 		v41.Method(http.MethodGet),
-		v41.Path("/v1/comment"),
+		v41.Path("/v1/packages/{package_id}/comments"),
 	)
-	rsp := &GetCommentsRsp{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.GetComments", req), rsp, opts...)
+	rsp := &CommentsListRsp{}
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.CommentsList", req), rsp, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return rsp, nil
+}
+
+func (c *pkgdashServiceClient) CommentsDelete(ctx context.Context, req *CommentsDeleteReq, opts ...options.Option) (*CommentsDeleteRsp, error) {
+	errmap := make(map[string]interface{}, 1)
+	errmap["default"] = &ErrorRsp{}
+	opts = append(opts,
+		v41.ErrorMap(errmap),
+	)
+	opts = append(opts,
+		v41.Method(http.MethodDelete),
+		v41.Path("/v1/packages/{package_id}/comments/{id}"),
+	)
+	rsp := &CommentsDeleteRsp{}
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.CommentsDelete", req), rsp, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return rsp, nil
+}
+
+func (c *pkgdashServiceClient) ModulesList(ctx context.Context, req *ModulesListReq, opts ...options.Option) (*ModulesListRsp, error) {
+	errmap := make(map[string]interface{}, 1)
+	errmap["default"] = &ErrorRsp{}
+	opts = append(opts,
+		v41.ErrorMap(errmap),
+	)
+	opts = append(opts,
+		v41.Method(http.MethodGet),
+		v41.Path("/v1/modules"),
+	)
+	rsp := &ModulesListRsp{}
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.ModulesList", req), rsp, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -186,38 +274,53 @@ type pkgdashServiceServer struct {
 	PkgdashServiceServer
 }

-func (h *pkgdashServiceServer) ListPackage(ctx context.Context, req *emptypb.Empty, rsp *ListPackageRsp) error {
-	return h.PkgdashServiceServer.ListPackage(ctx, req, rsp)
+func (h *pkgdashServiceServer) PackagesCreate(ctx context.Context, req *PackagesCreateReq, rsp *PackagesCreateRsp) error {
+	return h.PkgdashServiceServer.PackagesCreate(ctx, req, rsp)
 }

-func (h *pkgdashServiceServer) UpdatePackage(ctx context.Context, req *UpdatePackageReq, rsp *UpdatePackageRsp) error {
-	return h.PkgdashServiceServer.UpdatePackage(ctx, req, rsp)
+func (h *pkgdashServiceServer) PackagesDelete(ctx context.Context, req *PackagesDeleteReq, rsp *PackagesDeleteRsp) error {
+	return h.PkgdashServiceServer.PackagesDelete(ctx, req, rsp)
 }

-func (h *pkgdashServiceServer) AddComment(ctx context.Context, req *AddCommentReq, rsp *AddCommentRsp) error {
-	return h.PkgdashServiceServer.AddComment(ctx, req, rsp)
+func (h *pkgdashServiceServer) PackagesList(ctx context.Context, req *PackagesListReq, rsp *PackagesListRsp) error {
+	return h.PkgdashServiceServer.PackagesList(ctx, req, rsp)
 }

-func (h *pkgdashServiceServer) AddPackage(ctx context.Context, req *AddPackageReq, rsp *AddPackageRsp) error {
-	return h.PkgdashServiceServer.AddPackage(ctx, req, rsp)
+func (h *pkgdashServiceServer) PackagesUpdate(ctx context.Context, req *PackagesUpdateReq, rsp *PackagesUpdateRsp) error {
+	return h.PkgdashServiceServer.PackagesUpdate(ctx, req, rsp)
 }

-func (h *pkgdashServiceServer) GetModule(ctx context.Context, req *GetModuleReq, rsp *GetModuleRsp) error {
-	return h.PkgdashServiceServer.GetModule(ctx, req, rsp)
+func (h *pkgdashServiceServer) CommentsCreate(ctx context.Context, req *CommentsCreateReq, rsp *CommentsCreateRsp) error {
+	return h.PkgdashServiceServer.CommentsCreate(ctx, req, rsp)
 }

-func (h *pkgdashServiceServer) GetComments(ctx context.Context, req *GetCommentsReq, rsp *GetCommentsRsp) error {
-	return h.PkgdashServiceServer.GetComments(ctx, req, rsp)
+func (h *pkgdashServiceServer) CommentsLookup(ctx context.Context, req *CommentsLookupReq, rsp *CommentsLookupRsp) error {
+	return h.PkgdashServiceServer.CommentsLookup(ctx, req, rsp)
+}
+
+func (h *pkgdashServiceServer) CommentsList(ctx context.Context, req *CommentsListReq, rsp *CommentsListRsp) error {
+	return h.PkgdashServiceServer.CommentsList(ctx, req, rsp)
+}
+
+func (h *pkgdashServiceServer) CommentsDelete(ctx context.Context, req *CommentsDeleteReq, rsp *CommentsDeleteRsp) error {
+	return h.PkgdashServiceServer.CommentsDelete(ctx, req, rsp)
+}
+
+func (h *pkgdashServiceServer) ModulesList(ctx context.Context, req *ModulesListReq, rsp *ModulesListRsp) error {
+	return h.PkgdashServiceServer.ModulesList(ctx, req, rsp)
 }

 func RegisterPkgdashServiceServer(s server.Server, sh PkgdashServiceServer, opts ...options.Option) error {
 	type pkgdashService interface {
-		ListPackage(ctx context.Context, req *emptypb.Empty, rsp *ListPackageRsp) error
-		UpdatePackage(ctx context.Context, req *UpdatePackageReq, rsp *UpdatePackageRsp) error
-		AddComment(ctx context.Context, req *AddCommentReq, rsp *AddCommentRsp) error
-		AddPackage(ctx context.Context, req *AddPackageReq, rsp *AddPackageRsp) error
-		GetModule(ctx context.Context, req *GetModuleReq, rsp *GetModuleRsp) error
-		GetComments(ctx context.Context, req *GetCommentsReq, rsp *GetCommentsRsp) error
+		PackagesCreate(ctx context.Context, req *PackagesCreateReq, rsp *PackagesCreateRsp) error
+		PackagesDelete(ctx context.Context, req *PackagesDeleteReq, rsp *PackagesDeleteRsp) error
+		PackagesList(ctx context.Context, req *PackagesListReq, rsp *PackagesListRsp) error
+		PackagesUpdate(ctx context.Context, req *PackagesUpdateReq, rsp *PackagesUpdateRsp) error
+		CommentsCreate(ctx context.Context, req *CommentsCreateReq, rsp *CommentsCreateRsp) error
+		CommentsLookup(ctx context.Context, req *CommentsLookupReq, rsp *CommentsLookupRsp) error
+		CommentsList(ctx context.Context, req *CommentsListReq, rsp *CommentsListRsp) error
+		CommentsDelete(ctx context.Context, req *CommentsDeleteReq, rsp *CommentsDeleteRsp) error
+		ModulesList(ctx context.Context, req *ModulesListReq, rsp *ModulesListRsp) error
 	}
 	type PkgdashService struct {
 		pkgdashService