feat:#36 added protobuf communication for modules

services/ical/service/connector/feedConnector.go

@@ -7,12 +7,12 @@ import (
 	"log/slog"
 )
 
-func GetFeedByToken(token string) (model.FeedRecord, error) {
+func GetFeedByToken(host string, token string) (model.FeedRecord, error) {
 	var feed model.FeedRecord
 
 	// /api/collections/feeds/records/{id}
 
-	response, err := RequestApi("/api/collections/feeds/records/" + token)
+	response, err := RequestApi(host, "/api/collections/feeds/records/"+token)
 	if err != nil {
 		return model.FeedRecord{}, err
 	}
@@ -39,8 +39,8 @@ func parseResponse(response []byte) (model.FeedRecord, error) {
 	return feedRecord, nil
 }
 
-func DeleteFeedRecord(token string) error {
-	err := DeleteRequestApi("/api/feed?token=" + token)
+func DeleteFeedRecord(app model.AppType, token string) error {
+	err := DeleteRequestApi(app.DataManagerURL, "/api/feed?token="+token)
 	if err != nil {
 		return err
 	}
@@ -48,10 +48,10 @@ func DeleteFeedRecord(token string) error {
 	return nil
 }
 
-func GetModuleWithEvents(module model.FeedModule) (model.Module, error) {
+func GetModuleWithEvents(app model.AppType, module model.FeedModule) (model.Module, error) {
 	var modules model.Module
 
-	response, err := RequestApi("/api/module?uuid=" + module.UUID)
+	response, err := RequestApi(app.DataManagerURL, "/api/module?uuid="+module.UUID)
 	if err != nil {
 		return model.Module{}, err
 	}
@@ -77,10 +77,10 @@ func parseModuleResponse(body []byte) (model.Module, error) {
 	return module, nil
 }
 
-func SaveFeedRecord(modules []model.FeedCollection) (string, error) {
+func SaveFeedRecord(app model.AppType, modules []model.FeedCollection) (string, error) {
 	var token string
 
-	response, err := PostRequestApi("/api/feed", modules)
+	response, err := PostRequestApi(app.DataManagerURL, "/api/feed", modules)
 	if err != nil {
 		return "", err
 	}

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

@@ -0,0 +1,21 @@
+package grpc
+
+import (
+	"google.golang.org/grpc"
+	"log/slog"
+)
+
+func ConnectGRPCServer(host string) *grpc.ClientConn {
+	conn, err := grpc.Dial(host+":50051", grpc.WithInsecure(), grpc.WithBlock())
+	if err != nil {
+		slog.Error("could not connect to grpc server", "error", err)
+	}
+	return conn
+}
+
+func CloseGRPCServer(conn *grpc.ClientConn) {
+	err := conn.Close()
+	if err != nil {
+		slog.Error("could not close connection", "error", err)
+	}
+}

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

@@ -0,0 +1,54 @@
+package grpc
+
+import (
+	"context"
+	"google.golang.org/grpc"
+	pb "htwkalender/common/genproto/modules"
+	"htwkalender/ical/model"
+	"log/slog"
+	"time"
+)
+
+func GetModuleWithEvents(module model.FeedModule, conn *grpc.ClientConn) (model.Module, error) {
+	c := pb.NewModuleServiceClient(conn)
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+	defer cancel()
+	r, err := c.GetModule(ctx, &pb.GetModuleRequest{Uuid: module.UUID})
+	if err != nil {
+		slog.Error("could not get module: %v", "error", err)
+	}
+
+	events := make([]model.Event, 0)
+	for _, event := range r.GetModule().Events {
+		events = append(events, protoToEvent(event))
+	}
+
+	return model.Module{
+		UUID:     r.GetModule().Uuid,
+		Name:     r.GetModule().Name,
+		Prof:     r.GetModule().Prof,
+		Course:   r.GetModule().Course,
+		Semester: r.GetModule().Semester,
+		Events:   events,
+	}, nil
+}
+
+func protoToEvent(event *pb.Event) model.Event {
+
+	return model.Event{
+		UUID:       event.Uuid,
+		Day:        event.Day,
+		Week:       event.Week,
+		Start:      model.ToJSONTime(event.Start),
+		End:        model.ToJSONTime(event.End),
+		Name:       event.Name,
+		EventType:  event.EventType,
+		Compulsory: event.Compulsory,
+		Prof:       event.Prof,
+		Rooms:      event.Rooms,
+		Notes:      event.Notes,
+		BookedAt:   event.BookedAt,
+		Course:     event.Course,
+		Semester:   event.Semester,
+	}
+}

services/ical/service/connector/restHandler.go

@@ -6,9 +6,7 @@ import (
 	"time"
 )
 
-const host = "http://htwkalender-data-manager:8090"
-
-func RequestApi(path string) (*client.Response, error) {
+func RequestApi(host string, path string) (*client.Response, error) {
 
 	cc := client.New()
 	cc.SetTimeout(5 * time.Second)
@@ -22,7 +20,7 @@ func RequestApi(path string) (*client.Response, error) {
 	return response, nil
 }
 
-func DeleteRequestApi(path string) error {
+func DeleteRequestApi(host string, path string) error {
 
 	cc := client.New()
 	cc.SetTimeout(5 * time.Second)
@@ -36,7 +34,7 @@ func DeleteRequestApi(path string) error {
 	return nil
 }
 
-func PostRequestApi(path string, body []model.FeedCollection) (*client.Response, error) {
+func PostRequestApi(host string, path string, body []model.FeedCollection) (*client.Response, error) {
 
 	cc := client.New()
 	cc.SetTimeout(5 * time.Second)