feat:#36 updated feed service with more protobuf endpoints

services/ical/model/icalModel.go

@@ -19,7 +19,6 @@ package model
 import (
 	"encoding/json"
 	"fmt"
-	"log/slog"
 	"strings"
 	"time"
 )
@@ -88,7 +87,6 @@ func (jt *JSONTime) UnmarshalJSON(b []byte) error {
 func ToJSONTime(timeString string) JSONTime {
 	t, err := time.Parse(DefaultDateLayout, timeString)
 	if err != nil {
-		slog.Error("error parsing time string: ", "error", err)
 		return JSONTime(time.Time{})
 	}
 	return JSONTime(t)

services/ical/service/connector/grpc/feeds.go

@@ -0,0 +1,52 @@
+package grpc
+
+import (
+	"context"
+	"github.com/goccy/go-json"
+	"google.golang.org/grpc"
+	pb "htwkalender/common/genproto/modules"
+	"htwkalender/ical/model"
+	"log/slog"
+	"time"
+)
+
+func GetFeed(feedId string, conn *grpc.ClientConn) (model.FeedRecord, error) {
+	c := pb.NewFeedServiceClient(conn)
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+	defer cancel()
+
+	r, err := c.GetFeed(ctx, &pb.GetFeedRequest{Id: feedId})
+	if err != nil {
+		slog.Error("could not get modules: %v", "error", err)
+		return model.FeedRecord{}, err
+	}
+
+	feed, err := protoToFeed(r.GetFeed())
+	if err != nil {
+		slog.Error("could not convert feed: %v", "error", err)
+		return model.FeedRecord{}, err
+	}
+
+	return feed, nil
+}
+
+func protoToFeed(feed *pb.Feed) (model.FeedRecord, error) {
+
+	// unmarshal the []model.FeedModule from json
+	var modules []model.FeedModule
+	err := json.Unmarshal([]byte(feed.Modules), &modules)
+	if err != nil {
+		slog.Error("could not unmarshal modules: %v", "error", err)
+		return model.FeedRecord{}, err
+	}
+
+	return model.FeedRecord{
+		BaseModel: model.BaseModel{
+			Id:      feed.Id,
+			Created: model.ToJSONTime(feed.Created),
+			Updated: model.ToJSONTime(feed.Updated),
+		},
+		Retrieved: model.ToJSONTime(feed.Retrieved),
+		Modules:   modules,
+	}, nil
+}

services/ical/service/ical/ical.go

@@ -14,7 +14,7 @@ const expirationTime = 5 * time.Minute
 
 func Feed(app model.AppType, token string) (string, error) {
 	// get feed by token
-	feed, err := connector.GetFeedByToken(app.DataManagerURL, token)
+	feed, err := htwkalenderGrpc.GetFeed(token, app.GrpcClient)
 	if err != nil {
 		return "", err
 	}