Gear be/fdr 50 be gateway checkin

Makefile

@@ -8,9 +8,13 @@ watch:
 	air
 mock-gen:
 	mockgen -source ./internal/auth/auth.service.go -destination ./mocks/auth/auth.service.go
+	mockgen -source ./internal/selection/selection.handler.go -destination ./mocks/selection/selection.handler.go
 	mockgen -source ./internal/pin/pin.service.go -destination ./mocks/pin/pin.service.go
 	mockgen -source ./internal/selection/selection.service.go -destination ./mocks/selection/selection.service.go
 	mockgen -source ./internal/selection/selection.client.go -destination ./mocks/selection/selection.client.go
+	mockgen -source ./internal/checkin/checkin.handler.go -destination ./mocks/checkin/checkin.handler.go
+	mockgen -source ./internal/checkin/checkin.service.go -destination ./mocks/checkin/checkin.service.go
+	mockgen -source ./internal/checkin/checkin.client.go -destination ./mocks/checkin/checkin.client.go
 	mockgen -source ./internal/router/context.go -destination ./mocks/router/context.mock.go
 	mockgen -source ./internal/validator/validator.go -destination ./mocks/validator/validator.mock.go
 

cmd/main.go

@@ -5,11 +5,13 @@ import (
 
 	"github.com/isd-sgcu/rpkm67-gateway/config"
 	auth "github.com/isd-sgcu/rpkm67-gateway/internal/auth"
+	"github.com/isd-sgcu/rpkm67-gateway/internal/checkin"
 	"github.com/isd-sgcu/rpkm67-gateway/internal/router"
 	"github.com/isd-sgcu/rpkm67-gateway/internal/validator"
 	"github.com/isd-sgcu/rpkm67-gateway/logger"
 	"github.com/isd-sgcu/rpkm67-gateway/middleware"
 	authProto "github.com/isd-sgcu/rpkm67-go-proto/rpkm67/auth/auth/v1"
+	checkinProto "github.com/isd-sgcu/rpkm67-go-proto/rpkm67/checkin/checkin/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 )
@@ -34,16 +36,29 @@ func main() {
 		logger.Sugar().Fatalf("cannot connect to auth service", err)
 	}
 
+	checkinConn, err := grpc.NewClient(conf.Svc.CheckIn, grpc.WithTransportCredentials(insecure.NewCredentials()))
+	if err != nil {
+		logger.Sugar().Fatalf("cannot connect to checkin service", err)
+	}
+
 	authClient := authProto.NewAuthServiceClient(authConn)
 	authSvc := auth.NewService(authClient, logger)
 	authHdr := auth.NewHandler(authSvc, validate, logger)
 
+	checkinClient := checkinProto.NewCheckInServiceClient(checkinConn)
+	checkinSvc := checkin.NewService(checkinClient, logger)
+	checkinHdr := checkin.NewHandler(checkinSvc, validate, logger)
+
 	r := router.New(conf, corsHandler, authMiddleware)
 
 	r.V1Get("/auth/google-url", authHdr.GetGoogleLoginUrl)
 	r.V1Post("/auth/verify-google", authHdr.VerifyGoogleLogin)
 	r.V1Post("/auth/test", authHdr.Test)
 
+	r.V1Post("/checkin", checkinHdr.Create)
+	r.V1Post("/checkin/userId", checkinHdr.FindByUserID)
+	r.V1Post("/checkin/email", checkinHdr.FindByEmail)
+
 	if err := r.Run(fmt.Sprintf(":%v", conf.App.Port)); err != nil {
 		logger.Fatal("unable to start server")
 	}

config/config.go

@@ -12,7 +12,9 @@ type AppConfig struct {
 }
 
 type ServiceConfig struct {
-	Auth string
+	Auth    string
+	CheckIn string
+	Store   string
 }
 
 type CorsConfig struct {
@@ -39,7 +41,9 @@ func LoadConfig() (*Config, error) {
 	}
 
 	serviceConfig := ServiceConfig{
-		Auth: os.Getenv("SERVICE_AUTH"),
+		Auth:    os.Getenv("SERVICE_AUTH"),
+		CheckIn: os.Getenv("SERVICE_CHECKIN"),
+		Store:   os.Getenv("SERVICE_STORE"),
 	}
 
 	corsConfig := CorsConfig{

go.mod

@@ -21,8 +21,6 @@ require (
 	google.golang.org/grpc v1.64.0
 )
 
-require github.com/stretchr/objx v0.5.2 // indirect
-
 require (
 	github.com/KyleBanks/depth v1.2.1 // indirect
 	github.com/PuerkitoBio/purell v1.1.1 // indirect

go.sum

@@ -55,20 +55,6 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/isd-sgcu/rpkm67-go-proto v0.0.4 h1:ZO1m0EfTtjQ2IcRy6mUHj+mAb4loM3ckeisKefKqKmY=
-github.com/isd-sgcu/rpkm67-go-proto v0.0.4/go.mod h1:Z5SYz5kEe4W+MdqPouF0zEOiaqvg+s9I1S5d0q6e+Jw=
-github.com/isd-sgcu/rpkm67-go-proto v0.0.5 h1:8zTvNQ0NPokoVRK/NQJYxWjcBFMZNK0avotPs9RSPh0=
-github.com/isd-sgcu/rpkm67-go-proto v0.0.5/go.mod h1:Z5SYz5kEe4W+MdqPouF0zEOiaqvg+s9I1S5d0q6e+Jw=
-github.com/isd-sgcu/rpkm67-go-proto v0.0.6 h1:alECc0pLyJmbJ2cLBukNDplka+ucWutR6yLXqAn0lJM=
-github.com/isd-sgcu/rpkm67-go-proto v0.0.6/go.mod h1:Z5SYz5kEe4W+MdqPouF0zEOiaqvg+s9I1S5d0q6e+Jw=
-github.com/isd-sgcu/rpkm67-go-proto v0.0.7 h1:BrHjp7hDFmXTMuMKuA4mK3bjtHTvzozO0vYC1hV1a+w=
-github.com/isd-sgcu/rpkm67-go-proto v0.0.7/go.mod h1:Z5SYz5kEe4W+MdqPouF0zEOiaqvg+s9I1S5d0q6e+Jw=
-github.com/isd-sgcu/rpkm67-go-proto v0.1.2 h1:sLq8HWYaqnv0VO7cD5o4pLu+Mzf2fnIJuAT7DGqRaB8=
-github.com/isd-sgcu/rpkm67-go-proto v0.1.2/go.mod h1:Z5SYz5kEe4W+MdqPouF0zEOiaqvg+s9I1S5d0q6e+Jw=
-github.com/isd-sgcu/rpkm67-go-proto v0.1.3 h1:9+wrvKUUY5GDot1SmU9HtUgf8JzhPLHWKtCfmBQU+Yw=
-github.com/isd-sgcu/rpkm67-go-proto v0.1.3/go.mod h1:Z5SYz5kEe4W+MdqPouF0zEOiaqvg+s9I1S5d0q6e+Jw=
-github.com/isd-sgcu/rpkm67-go-proto v0.1.5 h1:WShrm8DeVqIY1ZelgM88vW8LMnLxF6dTt650A0YkC8U=
-github.com/isd-sgcu/rpkm67-go-proto v0.1.5/go.mod h1:Z5SYz5kEe4W+MdqPouF0zEOiaqvg+s9I1S5d0q6e+Jw=
 github.com/isd-sgcu/rpkm67-go-proto v0.1.6 h1:6mubghe7HuGJYv+hgpIxJBBrmVk5UdjHjdvzykLLhQ0=
 github.com/isd-sgcu/rpkm67-go-proto v0.1.6/go.mod h1:Z5SYz5kEe4W+MdqPouF0zEOiaqvg+s9I1S5d0q6e+Jw=
 github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
@@ -111,7 +97,6 @@ github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6po
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=

internal/checkin/checkin.client.go

@@ -0,0 +1,36 @@
+package checkin
+
+import (
+	"context"
+
+	checkinProto "github.com/isd-sgcu/rpkm67-go-proto/rpkm67/checkin/checkin/v1"
+	"google.golang.org/grpc"
+)
+
+type clientImpl struct {
+	client checkinProto.CheckInServiceClient
+}
+
+type Client interface {
+	Create(ctx context.Context, in *checkinProto.CreateCheckInRequest, opts ...grpc.CallOption) (*checkinProto.CreateCheckInResponse, error)
+	FindByUserId(ctx context.Context, in *checkinProto.FindByUserIdCheckInRequest, opts ...grpc.CallOption) (*checkinProto.FindByUserIdCheckInResponse, error)
+	FindByEmail(ctx context.Context, in *checkinProto.FindByEmailCheckInRequest, opts ...grpc.CallOption) (*checkinProto.FindByEmailCheckInResponse, error)
+}
+
+func NewClient(client checkinProto.CheckInServiceClient) Client {
+	return &clientImpl{
+		client: client,
+	}
+}
+
+func (c *clientImpl) Create(ctx context.Context, in *checkinProto.CreateCheckInRequest, opts ...grpc.CallOption) (*checkinProto.CreateCheckInResponse, error) {
+	return c.client.Create(ctx, in, opts...)
+}
+
+func (c *clientImpl) FindByUserId(ctx context.Context, in *checkinProto.FindByUserIdCheckInRequest, opts ...grpc.CallOption) (*checkinProto.FindByUserIdCheckInResponse, error) {
+	return c.client.FindByUserId(ctx, in, opts...)
+}
+
+func (c *clientImpl) FindByEmail(ctx context.Context, in *checkinProto.FindByEmailCheckInRequest, opts ...grpc.CallOption) (*checkinProto.FindByEmailCheckInResponse, error) {
+	return c.client.FindByEmail(ctx, in, opts...)
+}

internal/checkin/checkin.handler.go

@@ -0,0 +1,128 @@
+package checkin
+
+import (
+	"net/http"
+	"strings"
+
+	"github.com/isd-sgcu/rpkm67-gateway/internal/dto"
+	"github.com/isd-sgcu/rpkm67-gateway/internal/router"
+	"github.com/isd-sgcu/rpkm67-gateway/internal/validator"
+	"go.uber.org/zap"
+)
+
+type Handler interface {
+	Create(c router.Context)
+	FindByEmail(c router.Context)
+	FindByUserID(c router.Context)
+}
+
+func NewHandler(svc Service, validate validator.DtoValidator, log *zap.Logger) Handler {
+	return &handlerImpl{
+		svc:      svc,
+		validate: validate,
+		log:      log,
+	}
+}
+
+type handlerImpl struct {
+	svc      Service
+	validate validator.DtoValidator
+	log      *zap.Logger
+}
+
+func (h *handlerImpl) Create(c router.Context) {
+	body := &dto.CreateCheckInRequest{}
+	if err := c.Bind(body); err != nil {
+		h.log.Named("Create").Error("Bind: failed to bind request body", zap.Error(err))
+		c.BadRequestError(err.Error())
+		return
+	}
+
+	if errorList := h.validate.Validate(body); errorList != nil {
+		h.log.Named("Create").Error("Validate: ", zap.Strings("errorList", errorList))
+		c.BadRequestError(strings.Join(errorList, ", "))
+		return
+	}
+
+	req := &dto.CreateCheckInRequest{
+		Email:  body.Email,
+		UserID: body.UserID,
+		Event:  body.Event,
+	}
+
+	res, appErr := h.svc.Create(req)
+	if appErr != nil {
+		h.log.Named("Create").Error("Create: ", zap.Error(appErr))
+		c.ResponseError(appErr)
+		return
+	}
+
+	c.JSON(http.StatusCreated, &dto.CreateCheckInResponse{
+		CheckIn: &dto.CheckIn{
+			ID:     res.CheckIn.ID,
+			UserID: res.CheckIn.UserID,
+			Email:  res.CheckIn.Email,
+			Event:  res.CheckIn.Event,
+		},
+	})
+}
+
+func (h *handlerImpl) FindByEmail(c router.Context) {
+	body := &dto.FindByEmailCheckInRequest{}
+	if err := c.Bind(body); err != nil {
+		h.log.Named("FindByEmail").Error("Bind: failed to bind request body", zap.Error(err))
+		c.BadRequestError(err.Error())
+		return
+	}
+
+	if errorList := h.validate.Validate(body); errorList != nil {
+		h.log.Named("FindByEmail").Error("Validate: ", zap.Strings("errorList", errorList))
+		c.BadRequestError(strings.Join(errorList, ", "))
+		return
+	}
+
+	req := &dto.FindByEmailCheckInRequest{
+		Email: body.Email,
+	}
+
+	res, appErr := h.svc.FindByEmail(req)
+	if appErr != nil {
+		h.log.Named("FindByEmail").Error("FindByEmail: ", zap.Error(appErr))
+		c.ResponseError(appErr)
+		return
+	}
+
+	c.JSON(http.StatusOK, &dto.FindByEmailCheckInResponse{
+		CheckIns: res.CheckIns,
+	})
+}
+
+func (h *handlerImpl) FindByUserID(c router.Context) {
+	body := &dto.FindByUserIdCheckInRequest{}
+	if err := c.Bind(body); err != nil {
+		h.log.Named("FindByUserID").Error("Bind: failed to bind request body", zap.Error(err))
+		c.BadRequestError(err.Error())
+		return
+	}
+
+	if errorList := h.validate.Validate(body); errorList != nil {
+		h.log.Named("FindByUserID").Error("Validate: ", zap.Strings("errorList", errorList))
+		c.BadRequestError(strings.Join(errorList, ", "))
+		return
+	}
+
+	req := &dto.FindByUserIdCheckInRequest{
+		UserID: body.UserID,
+	}
+
+	res, appErr := h.svc.FindByUserID(req)
+	if appErr != nil {
+		h.log.Named("FindByUserID").Error("FindByUserID: ", zap.Error(appErr))
+		c.ResponseError(appErr)
+		return
+	}
+
+	c.JSON(http.StatusOK, &dto.FindByUserIdCheckInResponse{
+		CheckIns: res.CheckIns,
+	})
+}