updates

Author: cedi

.gitignore

@@ -0,0 +1,8 @@
+.pio
+.vscode/.browse.c_cpp.db*
+.vscode/c_cpp_properties.json
+.vscode/launch.json
+.vscode/ipch
+.DS_Store
+**/.DS_Store
+.trunk

go.mod

@@ -1,4 +1,4 @@
-module github.com/cedi/icaltest
+module github.com/cedi/meeting_epd
 
 go 1.22.7
 

main.go

@@ -14,8 +14,8 @@ import (
 	"github.com/uptrace/opentelemetry-go-extra/otelzap"
 	"go.uber.org/zap"
 
-	"github.com/cedi/icaltest/pkg/api"
-	"github.com/cedi/icaltest/pkg/client"
+	"github.com/cedi/meeting_epd/pkg/api"
+	"github.com/cedi/meeting_epd/pkg/client"
 )
 
 var (

pkg/api/grpc_api.go

@@ -10,8 +10,8 @@ import (
 	"github.com/uptrace/opentelemetry-go-extra/otelzap"
 	"google.golang.org/grpc"
 
-	"github.com/cedi/icaltest/pkg/client"
-	pb "github.com/cedi/icaltest/pkg/protos"
+	"github.com/cedi/meeting_epd/pkg/client"
+	pb "github.com/cedi/meeting_epd/pkg/protos"
 )
 
 type GrpcApi struct {

pkg/api/rest_api.go

@@ -15,7 +15,7 @@ import (
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 
-	"github.com/cedi/icaltest/pkg/client"
+	"github.com/cedi/meeting_epd/pkg/client"
 )
 
 type RestApi struct {
@@ -76,7 +76,12 @@ func (e *RestApi) ListenAndServe() error {
 }
 
 func (e *RestApi) GetCalendar(ct *gin.Context) {
-	ct.JSON(http.StatusOK, e.client.GetEvents(ct.Request.Context()))
+	switch ct.ContentType() {
+	case "application/protobuf":
+		ct.ProtoBuf(http.StatusOK, e.client.GetEvents(ct.Request.Context()))
+	default:
+		ct.JSON(http.StatusOK, e.client.GetEvents(ct.Request.Context()))
+	}
 }
 
 func (e *RestApi) Addr() string {

pkg/client/ical_client.go

@@ -12,12 +12,11 @@ import (
 	"time"
 
 	"github.com/apognu/gocal"
-	"github.com/cedi/icaltest/pkg/errors"
+	"github.com/cedi/meeting_epd/pkg/errors"
 	"github.com/spf13/viper"
 	"github.com/uptrace/opentelemetry-go-extra/otelzap"
-	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 
-	pb "github.com/cedi/icaltest/pkg/protos"
+	pb "github.com/cedi/meeting_epd/pkg/protos"
 )
 
 type ICalClient struct {
@@ -59,14 +58,14 @@ func NewICalClient(zapLog *otelzap.Logger) *ICalClient {
 		zapLog:          zapLog,
 		cacheExpiration: time.Now(),
 		cache: &pb.CalendarResponse{
-			LastUpdated: timestamppb.Now(),
+			LastUpdated: time.Now().Unix(),
 		},
 	}
 }
 
 func (e *ICalClient) FetchEvents(ctx context.Context) {
 	response := &pb.CalendarResponse{
-		LastUpdated: timestamppb.Now(),
+		LastUpdated: time.Now().Unix(),
 		Entries:     make([]*pb.CalendarEntry, 0),
 	}
 
@@ -90,7 +89,7 @@ func (e *ICalClient) FetchEvents(ctx context.Context) {
 			}
 
 			eventsMux.Lock()
-			response.LastUpdated = timestamppb.Now()
+			response.LastUpdated = time.Now().Unix()
 			response.Entries = append(response.Entries, events...)
 			eventsMux.Unlock()
 
@@ -100,6 +99,10 @@ func (e *ICalClient) FetchEvents(ctx context.Context) {
 		}()
 	}
 
+	eventsMux.Lock()
+	response.CalendarEntries = int32(len(response.Entries))
+	eventsMux.Unlock()
+
 	wg.Wait()
 	e.cache = response
 }
@@ -198,8 +201,8 @@ func NewCalendarEntryFromGocalEvent(e gocal.Event) *pb.CalendarEntry {
 
 	return &pb.CalendarEntry{
 		Title:  e.Summary,
-		Start:  timestamppb.New(start),
-		End:    timestamppb.New(end),
+		Start:  start.Unix(),
+		End:    end.Unix(),
 		AllDay: allDay,
 		Busy:   busy,
 	}

pkg/client/parser_rules.go

@@ -8,7 +8,7 @@ import (
 	"github.com/spf13/viper"
 	"github.com/uptrace/opentelemetry-go-extra/otelzap"
 
-	pb "github.com/cedi/icaltest/pkg/protos"
+	pb "github.com/cedi/meeting_epd/pkg/protos"
 )
 
 type RelabelConfig struct {