filter workspace by product id

internal/comm/helper/zentao/zentao.go

@@ -164,16 +164,18 @@ func LoadModule(productId int, config commDomain.WorkspaceConf) (modules []serve
 		return
 	}
 
-	// tree-browse-1-case-0-0-qa.html
-	params := ""
-	if commConsts.RequestType == commConsts.PathInfo {
-		params = fmt.Sprintf("%d-case-0-0-qa", productId)
-	} else {
-		params = fmt.Sprintf("rootID=%d&viewType=case&from=qa", productId)
+	if config.Url == "" {
+		err = errors.New(i118Utils.Sprintf("pls_config_workspace"))
+		return
+	}
+
+	err = Login(config)
+	if err != nil {
+		return
 	}
 
-	url := config.Url + GenApiUriOld("tree", "browse", params)
-	url += "#app=product"
+	uri := fmt.Sprintf("products/%d?fields=modules", productId)
+	url := GenApiUrl(uri, nil, config.Url)
 
 	bytes, err := httpUtils.Get(url)
 	if err != nil {

internal/server/modules/v1/controller/workspace.go

@@ -26,12 +26,13 @@ func (c *WorkspaceCtrl) List(ctx iris.Context) {
 		return
 	}
 
-	var req serverDomain.ReqPaginate
+	var req serverDomain.WorkspaceReqPaginate
 	if err := ctx.ReadQuery(&req); err != nil {
 		ctx.JSON(c.ErrResp(commConsts.CommErr, err.Error()))
 		return
 	}
 
+	req.ProductId = currProductId
 	data, err := c.WorkspaceService.Paginate(req)
 	if err != nil {
 		ctx.JSON(c.ErrResp(commConsts.CommErr, err.Error()))

internal/server/modules/v1/domain/workspace.go

 package serverDomain
+
+type WorkspaceReqPaginate struct {
+	ReqPaginate
+
+	ProductId int `json:"productId"`
+}

internal/server/modules/v1/repo/workspace.go

@@ -22,10 +22,12 @@ func NewWorkspaceRepo() *WorkspaceRepo {
 	return &WorkspaceRepo{}
 }
 
-func (r *WorkspaceRepo) Paginate(req serverDomain.ReqPaginate) (data domain.PageData, err error) {
+func (r *WorkspaceRepo) Paginate(req serverDomain.WorkspaceReqPaginate) (data domain.PageData, err error) {
 	var count int64
 
-	db := r.DB.Model(&model.Workspace{}).Where("NOT deleted")
+	db := r.DB.Model(&model.Workspace{}).
+		Where("product_id = ?", req.ProductId).
+		Where("NOT deleted")
 
 	if req.Keywords != "" {
 		db = db.Where("name LIKE ?", fmt.Sprintf("%%%s%%", req.Keywords))

internal/server/modules/v1/service/workspace.go

@@ -24,7 +24,7 @@ func NewWorkspaceService() *WorkspaceService {
 	return &WorkspaceService{}
 }
 
-func (s *WorkspaceService) Paginate(req serverDomain.ReqPaginate) (ret domain.PageData, err error) {
+func (s *WorkspaceService) Paginate(req serverDomain.WorkspaceReqPaginate) (ret domain.PageData, err error) {
 	ret, err = s.WorkspaceRepo.Paginate(req)
 	return
 }

ui/src/store/zentao.ts

@@ -100,7 +100,7 @@ const StoreModel: ModuleType = {
 
             // cache current site and product
             await setCurrSiteId(payload.currSite.id);
-            await setCurrProductIdBySite(settings.currProductIdBySite, payload.currProduct.id);
+            await setCurrProductIdBySite(state.currSite.id, payload.currProduct.id);
         },
         saveProducts(state, payload) {
             console.log('payload', payload)