fix: avatar and groups_bill route

Monify-Dev · Jun 24, 2024 · cff6b36 · cff6b36
1 parent a89dac0
commit cff6b36
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 15 deletions.
diff --git a/migrations/2406210105_default_avatar.up.sql b/migrations/2406210105_default_avatar.up.sql
@@ -8,11 +8,12 @@ INSERT INTO confirmed_file(
                            confirmed_at
 ) VALUES (
              '00000000-0000-0000-0000-000000000000',
-                            '/default_avatar.png',
+                            'default_avatar.png',
                             1,
              '00000000-0000-0000-0000-000000000000',
                             CURRENT_TIMESTAMP,
                             CURRENT_TIMESTAMP
 );
 
+
 ALTER TABLE user_identity ADD COLUMN avatar_id uuid DEFAULT '00000000-0000-0000-0000-000000000000' NOT NULL;
diff --git a/protobuf/gen/go/group_bill.pb.go b/protobuf/gen/go/group_bill.pb.go
diff --git a/protobuf/gen/go/group_bill.pb.gw.go b/protobuf/gen/go/group_bill.pb.gw.go
diff --git a/protobuf/gen/monify.swagger.json b/protobuf/gen/monify.swagger.json
@@ -606,7 +606,7 @@
         ]
       }
     },
-    "/v1/group_bill/history": {
+    "/v1/groups_bill/history": {
       "get": {
         "operationId": "GroupsBillService_GetHistory",
         "responses": {

diff --git a/protobuf/group_bill.proto b/protobuf/group_bill.proto
@@ -41,7 +41,7 @@ service GroupsBillService{
     rpc GetHistory(GetHistoryRequest) returns (GetHistoryResponse) {
         option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) ={security: {security_requirement: {key: "Bearer"}}};
         option (google.api.http) = {
-            get: "/v1/group_bill/history"
+            get: "/v1/groups_bill/history"
         };
     }
 }

diff --git a/services/api/controllers/group_bill/get_history.go b/services/api/controllers/group_bill/get_history.go
@@ -7,9 +7,11 @@ import (
 	"go.uber.org/zap"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/types/known/timestamppb"
 	"monify/lib"
 	monify "monify/protobuf/gen/go"
 	"monify/services/api/controllers/group"
+	"time"
 )
 
 func (s Service) GetHistory(ctx context.Context, req *monify.GetHistoryRequest) (*monify.GetHistoryResponse, error) {
@@ -48,10 +50,12 @@ func (s Service) GetHistory(ctx context.Context, req *monify.GetHistoryRequest)
 	var histories []*monify.GroupBillHistory
 	for rows.Next() {
 		var history monify.GroupBillHistory
-		if err := rows.Scan(&history.Type, &history.Title, &history.Timestamp, &history.OperatorName); err != nil {
+		var t time.Time
+		if err := rows.Scan(&history.Type, &history.Title, &history.OperatorName, &t); err != nil {
 			logger.Error("Failed to scan group bill history", zap.Error(err))
 			return nil, status.Error(codes.Internal, "Internal")
 		}
+		history.Timestamp = timestamppb.New(t)
 		histories = append(histories, &history)
 	}
 	return &monify.GetHistoryResponse{Histories: histories}, nil