Merge branch 'main' into feature/docker-development

kioku-project · Feb 13, 2024 · 2771200 · 2771200
2 parents 62f8507 + 696a685
commit 2771200
Show file tree

Hide file tree

Showing 43 changed files with 723 additions and 634 deletions.
diff --git a/backend/api-documentation/decks/new deck.bru b/backend/api-documentation/decks/new deck.bru
@@ -16,6 +16,8 @@ auth:bearer {
 
 body:json {
   {
+    "deckType": "PRIVATE",
+    "deckDescription": "description",
     "deckName": "test deck"
   }
 }

diff --git a/backend/pkg/converter/fiberSerializerTypes.go b/backend/pkg/converter/fiberSerializerTypes.go
@@ -21,12 +21,14 @@ type FiberGroup struct {
 }
 
 type FiberDeck struct {
-	DeckID     string `json:"deckID"`
-	DeckName   string `json:"deckName"`
-	DeckType   string `json:"deckType"`
-	GroupID    string `json:"groupID"`
-	IsActive   bool   `json:"isActive"`
-	IsFavorite bool   `json:"isFavorite"`
+	DeckID          string `json:"deckID"`
+	DeckName        string `json:"deckName"`
+	DeckDescription string `json:"deckDescription"`
+	DeckType        string `json:"deckType"`
+	DeckRole        string `json:"deckRole"`
+	GroupID         string `json:"groupID"`
+	IsActive        bool   `json:"isActive"`
+	IsFavorite      bool   `json:"isFavorite"`
 }
 
 type FiberGroupMemberAdmission struct {

diff --git a/backend/pkg/converter/typeConverter.go b/backend/pkg/converter/typeConverter.go
@@ -174,35 +174,40 @@ func ProtoGroupWithRoleToFiberGroupConverter(group *pbCommon.Group) FiberGroup {
 
 func ProtoDeckToFiberDeckConverter(deck *pbCommon.Deck) FiberDeck {
 	return FiberDeck{
-		DeckID:     deck.DeckID,
-		DeckName:   deck.DeckName,
-		DeckType:   deck.DeckType.String(),
-		GroupID:    deck.GroupID,
-		IsActive:   deck.IsActive,
-		IsFavorite: deck.IsFavorite,
+		DeckID:          deck.DeckID,
+		DeckName:        deck.DeckName,
+		DeckDescription: deck.DeckDescription,
+		DeckType:        deck.DeckType.String(),
+		GroupID:         deck.GroupID,
+		IsActive:        deck.IsActive,
+		IsFavorite:      deck.IsFavorite,
+		DeckRole:        deck.DeckRole.String(),
 	}
 }
 
 func ProtoDeckRespToFiberDeckConverter(deck *pbCommon.Deck) FiberDeck {
 	return FiberDeck{
-		DeckID:     deck.DeckID,
-		DeckName:   deck.DeckName,
-		DeckType:   deck.DeckType.String(),
-		GroupID:    deck.GroupID,
-		IsActive:   deck.IsActive,
-		IsFavorite: deck.IsFavorite,
+		DeckID:          deck.DeckID,
+		DeckName:        deck.DeckName,
+		DeckDescription: deck.DeckDescription,
+		DeckType:        deck.DeckType.String(),
+		GroupID:         deck.GroupID,
+		IsActive:        deck.IsActive,
+		IsFavorite:      deck.IsFavorite,
+		DeckRole:        deck.DeckRole.String(),
 	}
 }
 
 func StoreDeckToProtoDeckConverter(deck model.Deck) *pbCommon.Deck {
 	dt, _ := MigrateModelDeckTypeToProtoDeckType(deck.DeckType)
 	return &pbCommon.Deck{
-		DeckID:     deck.ID,
-		DeckName:   deck.Name,
-		DeckType:   dt,
-		GroupID:    deck.GroupID,
-		IsFavorite: deck.IsFavorite,
-		IsActive:   deck.IsActive,
+		DeckID:          deck.ID,
+		DeckName:        deck.Name,
+		DeckDescription: deck.Description,
+		DeckType:        dt,
+		GroupID:         deck.GroupID,
+		IsFavorite:      deck.IsFavorite,
+		IsActive:        deck.IsActive,
 	}
 }
 

diff --git a/backend/pkg/helper/errors.go b/backend/pkg/helper/errors.go
@@ -61,6 +61,10 @@ func NewMicroCantLeaveAsLastAdminErr(id ClientID) error {
 	return microErrors.BadRequest(string(id), "You can't leave when you are the last admin")
 }
 
+func NewMicroCantInviteToHomegroupErr(id ClientID) error {
+	return microErrors.BadRequest(string(id), "You can't invite users to your homegroup")
+}
+
 func NewMicroUserAdmissionInProgressErr(id ClientID) error {
 	return microErrors.BadRequest(string(id), "user already invited")
 }

diff --git a/backend/pkg/model/deck.go b/backend/pkg/model/deck.go
@@ -15,15 +15,16 @@ const (
 )
 
 type Deck struct {
-	ID         string   `gorm:"primaryKey"`
-	Name       string   `gorm:"not null"`
-	DeckType   DeckType `gorm:"not null"`
-	CreatedAt  time.Time
-	GroupID    string `gorm:"not null"`
-	Group      Group
-	Cards      []Card `gorm:"constraint:OnUpdate:CASCADE,OnDelete:CASCADE;"`
-	IsFavorite bool   `gorm:"-"`
-	IsActive   bool   `gorm:"-"`
+	ID          string `gorm:"primaryKey"`
+	Name        string `gorm:"not null"`
+	Description string
+	DeckType    DeckType `gorm:"not null"`
+	CreatedAt   time.Time
+	GroupID     string `gorm:"not null"`
+	Group       Group
+	Cards       []Card `gorm:"constraint:OnUpdate:CASCADE,OnDelete:CASCADE;"`
+	IsFavorite  bool   `gorm:"-"`
+	IsActive    bool   `gorm:"-"`
 }
 
 func (d *Deck) BeforeCreate(db *gorm.DB) (err error) {

diff --git a/backend/pkg/proto/common.pb.go b/backend/pkg/proto/common.pb.go
diff --git a/backend/pkg/proto/common.proto b/backend/pkg/proto/common.proto
@@ -111,12 +111,15 @@ enum DeckType {
 message Deck {
   string deckID = 1;
   string deckName = 2;
-  DeckType deckType = 3;
-  int64 createdAt = 4;
-  string groupID = 5;
-  bool isActive = 6;
-  bool isFavorite = 7;
+  string deckDescription = 3;
+  GroupRole deckRole = 4;
+  DeckType deckType = 5;
+  int64 createdAt = 6;
+  string groupID = 7;
+  bool isActive = 8;
+  bool isFavorite = 9;
 }
+
 message DeckRequest {
   string userID = 1;
   Deck deck = 2;