From e67fc11d514a8512aa643ad5b92850de547c9808 Mon Sep 17 00:00:00 2001
From: Sydonian <794346190@qq.com>
Date: Tue, 25 Apr 2023 14:36:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86=E8=B0=83=E7=94=A8=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E4=B8=8A=E7=9A=84=E4=BB=A3=E7=A0=81=EF=BC=9B=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=88=9B=E5=BB=BABucket=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.go                     |  2 +-
 services/bucket.go          | 20 ++++++++++++++------
 services/command_service.go |  2 ++
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/main.go b/main.go
index f6ba6fb..7c8e68e 100644
--- a/main.go
+++ b/main.go
@@ -8,7 +8,7 @@ import (
 	"gitlink.org.cn/cloudream/coordinator/config"
 	"gitlink.org.cn/cloudream/coordinator/services"
 	mydb "gitlink.org.cn/cloudream/db"
-	rasvr "gitlink.org.cn/cloudream/rabbitmq/server"
+	rasvr "gitlink.org.cn/cloudream/rabbitmq/server/coordinator"
 	"gitlink.org.cn/cloudream/utils/logger"
 )
 
diff --git a/services/bucket.go b/services/bucket.go
index 659c2c0..b7f6cf1 100644
--- a/services/bucket.go
+++ b/services/bucket.go
@@ -3,7 +3,7 @@ package services
 import (
 	log "github.com/sirupsen/logrus"
 	"gitlink.org.cn/cloudream/db/model"
-	ramsg "gitlink.org.cn/cloudream/rabbitmq/message"
+	ramsg "gitlink.org.cn/cloudream/rabbitmq/message/coordinator"
 	"gitlink.org.cn/cloudream/utils/consts/errorcode"
 )
 
@@ -12,7 +12,7 @@ func (svc *Service) GetBucket(userID int, bucketID int) (model.Bucket, error) {
 	panic("not implement yet")
 }
 
-func (svc *Service) GetUserBuckets(msg *ramsg.GetUserBucketsCommand) ramsg.GetUserBucketsResp {
+func (svc *Service) GetUserBuckets(msg *ramsg.GetUserBucketsCommand) *ramsg.GetUserBucketsResp {
 	buckets, err := svc.db.GetUserBuckets(msg.UserID)
 
 	if err != nil {
@@ -24,7 +24,7 @@ func (svc *Service) GetUserBuckets(msg *ramsg.GetUserBucketsCommand) ramsg.GetUs
 	return ramsg.NewGetUserBucketsRespOK(buckets)
 }
 
-func (svc *Service) GetBucketObjects(msg *ramsg.GetBucketObjectsCommand) ramsg.GetBucketObjectsResp {
+func (svc *Service) GetBucketObjects(msg *ramsg.GetBucketObjectsCommand) *ramsg.GetBucketObjectsResp {
 	objects, err := svc.db.GetBucketObjects(msg.UserID, msg.BucketID)
 
 	if err != nil {
@@ -37,9 +37,17 @@ func (svc *Service) GetBucketObjects(msg *ramsg.GetBucketObjectsCommand) ramsg.G
 	return ramsg.NewGetBucketObjectsRespOK(objects)
 }
 
-func (svc *Service) CreateBucket(userID int, bucketName string) (model.Bucket, error) {
-	// TODO
-	panic("not implement yet")
+func (svc *Service) CreateBucket(msg *ramsg.CreateBucketCommand) *ramsg.CreateBucketResp {
+	bucketID, err := svc.db.CreateBucket(msg.UserID, msg.BucketName)
+
+	if err != nil {
+		log.WithField("UserID", msg.UserID).
+			WithField("BucketName", msg.BucketName).
+			Warnf("create bucket failed, err: %s", err.Error())
+		return ramsg.NewCreateBucketRespFailed(errorcode.OPERATION_FAILED, "create bucket failed")
+	}
+
+	return ramsg.NewCreateBucketRespOK(bucketID)
 }
 
 func (src *Service) DeleteBucket(userID int, bucketID int) error {
diff --git a/services/command_service.go b/services/command_service.go
index ce19cf8..0533ca9 100644
--- a/services/command_service.go
+++ b/services/command_service.go
@@ -150,6 +150,8 @@ func (service *Service) Move(msg *ramsg.MoveCommand) ramsg.MoveResp {
 	//--查询节点延迟表，得到command.destination与各个nodeIps的的延迟，存到一个map类型中（Delay）
 	//--kx:根据查出来的hash/hashs、nodeIps、TempOrPins、Times(移动/读取策略)、Delay确定hashs、ids
 
+	// TODO 需要在StorageData中增加记录
+
 	// 查询用户关联的存储服务
 	stg, err := service.db.QueryUserStorage(msg.UserID, msg.StorageID)
 	if err != nil {