added date to the GetNews endpoint

TUM-Dev · Sep 19, 2023 · a191059 · a191059
1 parent aae98ca
commit a191059
Show file tree

Hide file tree

Showing 7 changed files with 118 additions and 100 deletions.
diff --git a/client/go.mod b/client/go.mod
@@ -3,7 +3,7 @@ module github.com/TUM-Dev/Campus-Backend/client
 go 1.21
 
 require (
-	github.com/TUM-Dev/Campus-Backend/server v0.0.0-20230919162132-71bec88330f7
+	github.com/TUM-Dev/Campus-Backend/server v0.0.0-20230919222217-aae98ca6718a
 	github.com/sirupsen/logrus v1.9.3
 	google.golang.org/grpc v1.58.1
 )

diff --git a/client/go.sum b/client/go.sum
@@ -1,5 +1,5 @@
-github.com/TUM-Dev/Campus-Backend/server v0.0.0-20230919162132-71bec88330f7 h1:TDgiN5Z1vi3V0Qo94MIXURiD9+U7TGiRtiUIqN/rulo=
-github.com/TUM-Dev/Campus-Backend/server v0.0.0-20230919162132-71bec88330f7/go.mod h1:fjoLL3rbdY6wTRJIksekT2p3OUp5ocFfXjB/avV/TVI=
+github.com/TUM-Dev/Campus-Backend/server v0.0.0-20230919222217-aae98ca6718a h1:liiUwphQFYkB0DeDCOX3iasHwgcUSQxEEYDohpurAI0=
+github.com/TUM-Dev/Campus-Backend/server v0.0.0-20230919222217-aae98ca6718a/go.mod h1:fjoLL3rbdY6wTRJIksekT2p3OUp5ocFfXjB/avV/TVI=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

diff --git a/server/api/tumdev/campus_backend.pb.go b/server/api/tumdev/campus_backend.pb.go
diff --git a/server/api/tumdev/campus_backend.proto b/server/api/tumdev/campus_backend.proto
@@ -238,6 +238,7 @@ message News {
   string image_url = 5;
   string source = 6;
   google.protobuf.Timestamp created = 7;
+  google.protobuf.Timestamp date = 8;
 }
 
 message GetNewsReply {

diff --git a/server/api/tumdev/campus_backend.swagger.json b/server/api/tumdev/campus_backend.swagger.json
@@ -1586,6 +1586,10 @@
         "created": {
           "type": "string",
           "format": "date-time"
+        },
+        "date": {
+          "type": "string",
+          "format": "date-time"
         }
       }
     },

diff --git a/server/backend/news.go b/server/backend/news.go
@@ -65,6 +65,7 @@ func (s *CampusServer) GetNews(ctx context.Context, req *pb.GetNewsRequest) (*pb
 			ImageUrl: item.Image.String,
 			Source:   fmt.Sprintf("%d", item.Src),
 			Created:  timestamppb.New(item.Created),
+			Date:     timestamppb.New(item.Date),
 		}
 	}
 	return &pb.GetNewsReply{News: resp}, nil

diff --git a/server/backend/news_test.go b/server/backend/news_test.go
@@ -179,8 +179,8 @@ func (s *NewsSuite) Test_GetNewsMultiple() {
 	require.NoError(s.T(), err)
 	expectedResp := &pb.GetNewsReply{
 		News: []*pb.News{
-			{Id: n1.News, Title: n1.Title, Text: n1.Description, Link: n1.Link, ImageUrl: n1.Image.String, Source: fmt.Sprintf("%d", n1.Src), Created: timestamppb.New(n1.Created)},
-			{Id: n2.News, Title: n2.Title, Text: n2.Description, Link: n2.Link, ImageUrl: n2.Image.String, Source: fmt.Sprintf("%d", n2.Src), Created: timestamppb.New(n2.Created)},
+			{Id: n1.News, Title: n1.Title, Text: n1.Description, Link: n1.Link, ImageUrl: n1.Image.String, Source: fmt.Sprintf("%d", n1.Src), Created: timestamppb.New(n1.Created), Date: timestamppb.New(n1.Date)},
+			{Id: n2.News, Title: n2.Title, Text: n2.Description, Link: n2.Link, ImageUrl: n2.Image.String, Source: fmt.Sprintf("%d", n2.Src), Created: timestamppb.New(n2.Created), Date: timestamppb.New(n2.Date)},
 		},
 	}
 	require.Equal(s.T(), expectedResp, response)