u

code/allapp/allapp-go/api/handler/space/index.go

@@ -53,11 +53,24 @@ func CreateSpace(c fiber.Ctx) error {
 	spaceId := uniqueid.NextId()
 
 	err := db.WithTx(c.Context(), func(q *repo.Queries) error {
+		// 查询是否存在空间
+		countSpaces, err3 := q.CountUserSpaces(c.Context(), userID)
+		if err3 != nil {
+			return err3
+		}
+
+		isDefault := 0
+
+		if countSpaces == 0 {
+			isDefault = 1
+		}
+
 		// 创建空间
 		params := repo.InsertSpaceParams{
 			ID:         spaceId,
 			Name:       dto.Name,
 			InviteCode: inviteCode,
+			OwnerID:    userID,
 		}
 
 		err := q.InsertSpace(c.Context(), params)
@@ -68,10 +81,13 @@ func CreateSpace(c fiber.Ctx) error {
 
 		// 将创建用户默认添加到该空间内
 		spaceMemberParams := repo.InsertSpaceMemberParams{
-			ID:      uniqueid.NextId(),
-			SpaceID: spaceId,
-			UserID:  userID,
-			Role:    0,
+			ID:         uniqueid.NextId(),
+			SpaceID:    spaceId,
+			UserID:     userID,
+			Role:       0,
+			IsDefault:  int16(isDefault),
+			UserName:   dto.UserName,
+			SortNumber: dto.SortNumber,
 		}
 
 		err = q.InsertSpaceMember(c.Context(), spaceMemberParams)
@@ -98,6 +114,41 @@ func CreateSpace(c fiber.Ctx) error {
 	return responsex.OK(c, vo)
 }
 
+func ListUserSpaces(c fiber.Ctx) error {
+	vo := new(types.ListSpacesVO)
+
+	userID, err := middleware.GetUserID(c)
+
+	if err != nil {
+		return err
+	}
+
+	rows, err := db.Queries.ListSpacesByUserId(c.Context(), userID)
+
+	if err != nil {
+		return err
+	}
+
+	userSpaces := make([]types.UserSpace, 0, len(rows))
+
+	for _, row := range rows {
+		userSpaces = append(userSpaces, types.UserSpace{
+			Id:          row.ID,
+			OwnerId:     row.OwnerID,
+			Name:        row.Name,
+			Role:        row.Role,
+			MemberCount: row.MemberCount,
+			IsDefault:   row.IsDefault,
+			UserName:    row.UserName,
+			SortNumber:  row.SortNumber,
+		})
+	}
+
+	vo.Spaces = userSpaces
+
+	return responsex.OK(c, vo)
+}
+
 func initFinanceCategory(ctx context.Context, q *repo.Queries, spaceId int64, userId int64) error {
 	categoryDefaults, err := q.ListFinanceCategoryDefault(ctx)
 	if err != nil {