Renamed Type to RecipientType in OCM shares and used it where missing

Author: glpatcern

pkg/share/manager/sql/conversions.go

@@ -42,6 +42,16 @@ func convertFromCS3OCMShareType(shareType ocm.ShareType) model.OcmShareType {
 	return -1
 }
 
+func convertToCS3OCMShareType(recipientType model.OcmShareType) ocm.ShareType {
+	switch recipientType {
+	case model.OcmShareTypeUser:
+		return ocm.ShareType_SHARE_TYPE_USER
+	case model.OcmShareTypeGroup:
+		return ocm.ShareType_SHARE_TYPE_GROUP
+	}
+	return ocm.ShareType_SHARE_TYPE_INVALID
+}
+
 func convertFromCS3OCMShareState(shareState ocm.ShareState) model.OcmShareState {
 	switch shareState {
 	case ocm.ShareState_SHARE_STATE_ACCEPTED:
@@ -96,7 +106,7 @@ func convertToCS3OCMShare(s *model.OcmShare, am []*ocm.AccessMethod) *ocm.Share
 		Mtime: &types.Timestamp{
 			Seconds: uint64(s.Mtime),
 		},
-		ShareType:     ocm.ShareType_SHARE_TYPE_USER,
+		ShareType:     convertToCS3OCMShareType(s.RecipientType),
 		AccessMethods: am,
 	}
 	if s.Expiration.Valid {
@@ -133,7 +143,7 @@ func convertToCS3OCMReceivedShare(s *model.OcmReceivedShare, p []*ocm.Protocol)
 			Seconds: uint64(s.Mtime),
 		},
 		ResourceType: convertToCS3ResourceType(s.ItemType),
-		ShareType:    ocm.ShareType_SHARE_TYPE_USER,
+		ShareType:    convertToCS3OCMShareType(s.RecipientType),
 		State:        convertToCS3OCMShareState(s.State),
 		Protocols:    p,
 	}

pkg/share/manager/sql/model/model.go

@@ -166,19 +166,19 @@ type ShareState struct {
 // for that, we redeclare the DeletedAt as in Share. In addition, tokens must be unique.
 type OcmShare struct {
 	BaseModel
-	DeletedAt  gorm.DeletedAt     `gorm:"uniqueIndex:u_ocmshare"`
-	Token      string             `gorm:"size:255;not null;uniqueIndex:u_ocmshare_token"`
-	StorageId  string             `gorm:"size:64;not null;uniqueIndex:u_ocmshare"`
-	FileId     string             `gorm:"size:64;not null;uniqueIndex:u_ocmshare"`
-	Name       string             `gorm:"type:text;not null"`
-	ShareWith  string             `gorm:"size:255;not null;uniqueIndex:u_ocmshare"`
-	Owner      string             `gorm:"size:255;not null;uniqueIndex:u_ocmshare"`
-	Initiator  string             `gorm:"type:text;not null"`
-	Ctime      uint64             `gorm:"not null"`
-	Mtime      uint64             `gorm:"not null"`
-	Expiration sql.NullInt64      `gorm:"default:null"`
-	Type       OcmShareType       `gorm:"not null"`
-	Protocols  []OcmShareProtocol `gorm:"constraint:OnDelete:CASCADE;"`
+	DeletedAt     gorm.DeletedAt     `gorm:"uniqueIndex:u_ocmshare"`
+	Token         string             `gorm:"size:255;not null;uniqueIndex:u_ocmshare_token"`
+	StorageId     string             `gorm:"size:64;not null;uniqueIndex:u_ocmshare"`
+	FileId        string             `gorm:"size:64;not null;uniqueIndex:u_ocmshare"`
+	Name          string             `gorm:"type:text;not null"`
+	ShareWith     string             `gorm:"size:255;not null;uniqueIndex:u_ocmshare"`
+	Owner         string             `gorm:"size:255;not null;uniqueIndex:u_ocmshare"`
+	Initiator     string             `gorm:"type:text;not null"`
+	Ctime         uint64             `gorm:"not null"`
+	Mtime         uint64             `gorm:"not null"`
+	Expiration    sql.NullInt64      `gorm:"default:null"`
+	RecipientType OcmShareType       `gorm:"not null"`
+	Protocols     []OcmShareProtocol `gorm:"constraint:OnDelete:CASCADE;"`
 }
 
 // OcmShareProtocol represents the protocol used to access an OCM share, named AccessMethod in the OCM CS3 APIs.
@@ -201,7 +201,7 @@ type OcmReceivedShare struct {
 	Ctime         uint64        `gorm:"not null"`
 	Mtime         uint64        `gorm:"not null"`
 	Expiration    sql.NullInt64 `gorm:"default:null"`
-	Type          OcmShareType  `gorm:"index:i_ocmrecshare_type;not null"`
+	RecipientType OcmShareType  `gorm:"index:i_ocmrecshare_type;not null"`
 	State         OcmShareState `gorm:"index:i_ocmrecshare_state;not null"`
 	Alias         string        `gorm:"size:64"`
 	Hidden        bool

pkg/share/manager/sql/ocm_shares.go

@@ -89,16 +89,16 @@ func (m *mgr) StoreShare(ctx context.Context, s *ocm.Share) (*ocm.Share, error)
 	err = m.db.Transaction(func(tx *gorm.DB) error {
 
 		share := &model.OcmShare{
-			Token:     s.Token,
-			StorageId: s.ResourceId.StorageId,
-			FileId:    s.ResourceId.OpaqueId,
-			Name:      s.Name,
-			ShareWith: formatUserID(s.Grantee.GetUserId()),
-			Owner:     s.Owner.OpaqueId,
-			Initiator: s.Creator.OpaqueId,
-			Ctime:     s.Ctime.Seconds,
-			Mtime:     s.Mtime.Seconds,
-			Type:      convertFromCS3OCMShareType(s.ShareType),
+			Token:         s.Token,
+			StorageId:     s.ResourceId.StorageId,
+			FileId:        s.ResourceId.OpaqueId,
+			Name:          s.Name,
+			ShareWith:     formatUserID(s.Grantee.GetUserId()),
+			Owner:         s.Owner.OpaqueId,
+			Initiator:     s.Creator.OpaqueId,
+			Ctime:         s.Ctime.Seconds,
+			Mtime:         s.Mtime.Seconds,
+			RecipientType: convertFromCS3OCMShareType(s.ShareType),
 		}
 		if s.Expiration != nil {
 			share.Expiration.Int64 = int64(s.Expiration.Seconds)
@@ -271,7 +271,7 @@ func (m *mgr) StoreReceivedShare(ctx context.Context, s *ocm.ReceivedShare) (*oc
 			Initiator:     formatUserID(s.Creator),
 			Ctime:         s.Ctime.Seconds,
 			Mtime:         s.Mtime.Seconds,
-			Type:          convertFromCS3OCMShareType(s.ShareType),
+			RecipientType: convertFromCS3OCMShareType(s.ShareType),
 			State:         convertFromCS3OCMShareState(s.State),
 		}