完成资产隔离

pkg/model/asset.go

@@ -58,7 +58,7 @@ func FindAssetByConditions(protocol string, account User) (o []Asset, err error)
 	return
 }
 
-func FindPageAsset(pageIndex, pageSize int, name, protocol, tags string, account User) (o []AssetVo, total int64, err error) {
+func FindPageAsset(pageIndex, pageSize int, name, protocol, tags string, account User, owner, sharer string) (o []AssetVo, total int64, err error) {
 	db := global.DB.Table("assets").Select("assets.id,assets.name,assets.ip,assets.port,assets.protocol,assets.active,assets.owner,assets.created, users.nickname as owner_name,COUNT(resources.user_id) as sharer_count").Joins("left join users on assets.owner = users.id").Joins("left join resources on assets.id = resources.resource_id").Group("assets.id")
 	dbCounter := global.DB.Table("assets").Select("DISTINCT assets.id").Joins("left join resources on assets.id = resources.resource_id")
 
@@ -66,6 +66,15 @@ func FindPageAsset(pageIndex, pageSize int, name, protocol, tags string, account
 		owner := account.ID
 		db = db.Where("assets.owner = ? or resources.user_id = ?", owner, owner)
 		dbCounter = dbCounter.Where("assets.owner = ? or resources.user_id = ?", owner, owner)
+	} else {
+		if len(owner) > 0 {
+			db = db.Where("assets.owner = ?", owner)
+			dbCounter = dbCounter.Where("assets.owner = ?", owner)
+		}
+		if len(sharer) > 0 {
+			db = db.Where("resources.user_id = ?", sharer)
+			dbCounter = dbCounter.Where("resources.user_id = ?", sharer)
+		}
 	}
 
 	if len(name) > 0 {

pkg/model/resource.go

@@ -1,6 +1,7 @@
 package model
 
 import (
+	"gorm.io/gorm"
 	"next-terminal/pkg/global"
 	"next-terminal/pkg/utils"
 )
@@ -45,3 +46,28 @@ func OverwriteUserIdsByResourceId(resourceId, resourceType string, userIds []str
 	}
 	db.Commit()
 }
+
+func DeleteByUserIdAndResourceTypeAndResourceIdIn(userId, resourceType string, resourceIds []string) error {
+	return global.DB.Where("user_id = ? and resource_type = ? and resource_id in ?", userId, resourceType, resourceIds).Delete(&Resource{}).Error
+}
+
+func AddSharerResources(userId, resourceType string, resourceIds []string) error {
+	return global.DB.Transaction(func(tx *gorm.DB) (err error) {
+
+		for i := range resourceIds {
+			resourceId := resourceIds[i]
+			id := utils.Sign([]string{resourceId, resourceType, userId})
+			resource := &Resource{
+				ID:           id,
+				ResourceId:   resourceId,
+				ResourceType: resourceType,
+				UserId:       userId,
+			}
+			err = tx.Create(resource).Error
+			if err != nil {
+				return err
+			}
+		}
+		return nil
+	})
+}

pkg/model/user-group-member.go

@@ -1,5 +1,7 @@
 package model
 
+import "next-terminal/pkg/global"
+
 type UserGroupMember struct {
 	ID          string `gorm:"primary_key" json:"name"`
 	UserId      string `json:"userId"`
@@ -9,3 +11,8 @@ type UserGroupMember struct {
 func (r *UserGroupMember) TableName() string {
 	return "user_group_members"
 }
+
+func FindUserGroupMembersByUserGroupId(id string) (o []string, err error) {
+	err = global.DB.Table("user_group_members").Select("user_id").Where("user_group_id = ?", id).Find(&o).Error
+	return
+}

pkg/model/user-group.go

@@ -86,9 +86,28 @@ func FindUserGroupById(id string) (o UserGroup, err error) {
 	return
 }
 
-func UpdateUserGroupById(o *UserGroup, id string) {
-	o.ID = id
-	global.DB.Updates(o)
+func UpdateUserGroupById(o *UserGroup, members []string, id string) error {
+	return global.DB.Transaction(func(tx *gorm.DB) error {
+		o.ID = id
+		err := tx.Updates(o).Error
+		if err != nil {
+			return err
+		}
+
+		err = tx.Where("user_group_id = ?", id).Delete(&UserGroupMember{}).Error
+		if err != nil {
+			return err
+		}
+		if members != nil {
+			userGroupId := o.ID
+			err = AddUserGroupMembers(tx, members, userGroupId)
+			if err != nil {
+				return err
+			}
+		}
+		return err
+	})
+
 }
 
 func DeleteUserGroupById(id string) {

pkg/model/user.go

@@ -23,6 +23,18 @@ type User struct {
 	Type       string         `json:"type"`
 }
 
+type UserVo struct {
+	ID       string         `gorm:"primary_key" json:"id"`
+	Username string         `json:"username"`
+	Nickname string         `json:"nickname"`
+	Online   bool           `json:"online"`
+	Enabled  bool           `json:"enabled"`
+	Created  utils.JsonTime `json:"created"`
+	Type     string         `json:"type"`
+	//OwnerAssetCount  int64          `json:"ownerAssetCount"`
+	SharerAssetCount int64 `json:"sharerAssetCount"`
+}
+
 func (r *User) TableName() string {
 	return "users"
 }
@@ -38,19 +50,27 @@ func FindAllUser() (o []User) {
 	return
 }
 
-func FindPageUser(pageIndex, pageSize int, username, nickname string) (o []User, total int64, err error) {
-	db := global.DB
+func FindPageUser(pageIndex, pageSize int, username, nickname string) (o []UserVo, total int64, err error) {
+	db := global.DB.Table("users").Select("users.id,users.username,users.nickname,users.online,users.enabled,users.created,users.type, count(resources.user_id) as sharer_asset_count").Joins("left join resources on users.id = resources.user_id and resources.resource_type = 'asset'").Group("users.id")
+	dbCounter := global.DB.Table("users")
 	if len(username) > 0 {
-		db = db.Where("username like ?", "%"+username+"%")
+		db = db.Where("users.username like ?", "%"+username+"%")
+		dbCounter = dbCounter.Where("username like ?", "%"+username+"%")
 	}
 
 	if len(nickname) > 0 {
-		db = db.Where("nickname like ?", "%"+nickname+"%")
+		db = db.Where("users.nickname like ?", "%"+nickname+"%")
+		dbCounter = dbCounter.Where("nickname like ?", "%"+nickname+"%")
 	}
 
-	err = db.Order("created desc").Find(&o).Offset((pageIndex - 1) * pageSize).Limit(pageSize).Count(&total).Error
+	err = dbCounter.Count(&total).Error
+	if err != nil {
+		return nil, 0, err
+	}
+
+	err = db.Order("users.created desc").Find(&o).Offset((pageIndex - 1) * pageSize).Limit(pageSize).Error
 	if o == nil {
-		o = make([]User, 0)
+		o = make([]UserVo, 0)
 	}
 	return
 }