create event model

add many2many btw user-event

finish event CRUD repo, service

create event proto

gen event-protobuf

fix event proto & service

add event to automigreate

fix bug

fix bug


complete event crud


create event model

add many2many btw user-event

finish event CRUD repo, service

create event proto

gen event-protobuf

fix event proto & service

add event to automigreate

fix bug

fix bug


complete event crud


Add event repository


almost complete estamp api 

some bugs in user.service_test
Fix build failed


fix association bug

Author: Lolymoly

src/app/repository/user/user.repository.go

@@ -49,10 +49,10 @@ func (r *Repository) Delete(id string) error {
 
 func (r *Repository) ConfirmEstamp(uId string, thisUser *user.User, thisEvent *event.Event) error {
 	//Add this estamp to user
-	return r.db.Model(thisUser).Where("id = ?", uId).Omit("Events.*").Association("Events").Append(thisEvent)
+	return r.db.Model(thisUser).Omit("Events.*").Association("Events").Append(thisEvent)
 }
 
 func (r *Repository) GetUserEstamp(uId string, thisUser *user.User, results *[]*event.Event) error {
 	//Get all estamp that this user has
-	return r.db.Model(thisUser).Where("user_id", uId).Association("Events").Find(&results)
+	return r.db.Model(thisUser).Association("Events").Find(&results)
 }

src/app/service/user/user.service.go

@@ -38,6 +38,10 @@ type IEventRepository interface {
 	FindAllEvent(result *[]*event.Event) error
 }
 
+type IEventRepository interface {
+	FindEventByID(id string, result *event.Event) error
+}
+
 type IFileService interface {
 	GetSignedUrl(string) (string, error)
 }
@@ -213,6 +217,10 @@ func (s *Service) ConfirmEstamp(_ context.Context, req *proto.ConfirmEstampReque
 	if err != nil {
 		return nil, err
 	}
+	err = s.eventRepo.FindEventByID(req.EId, &event)
+	if err != nil {
+		return nil, status.Error(codes.NotFound, "event not found")
+	}
 
 	user := user.User{
 		Base: model.Base{
@@ -229,6 +237,10 @@ func (s *Service) ConfirmEstamp(_ context.Context, req *proto.ConfirmEstampReque
 	if err != nil {
 		return nil, status.Error(codes.NotFound, "something wrong")
 	}
+	err = s.eventRepo.FindEventByID(req.EId, &event)
+	if err != nil {
+		return nil, status.Error(codes.NotFound, "event not found")
+	}
 
 	return &proto.ConfirmEstampResponse{}, nil
 }

src/main.go

@@ -12,6 +12,8 @@ import (
 	grpRepo "github.com/isd-sgcu/rnkm65-backend/src/app/repository/group"
 	ur "github.com/isd-sgcu/rnkm65-backend/src/app/repository/user"
 	bSrv "github.com/isd-sgcu/rnkm65-backend/src/app/service/baan"
+	evtService "github.com/isd-sgcu/rnkm65-backend/src/app/service/event"
+	bSrv "github.com/isd-sgcu/rnkm65-backend/src/app/service/baan"
 	csr "github.com/isd-sgcu/rnkm65-backend/src/app/service/checkin"
 	evtService "github.com/isd-sgcu/rnkm65-backend/src/app/service/event"
 	fSrv "github.com/isd-sgcu/rnkm65-backend/src/app/service/file"