Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: getFileList添加返回指fatherPath #24

Merged
merged 1 commit into from
Feb 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions biz/adaptor/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ type ContentServerImpl struct {
OrderService service.IOrderService
}

func (s *ContentServerImpl) CompletelyRemoveFile(ctx context.Context, req *content.CompletelyRemoveFileReq) (res *content.CompletelyRemoveFileResp, err error) {
//TODO implement me
panic("implement me")
}

func (s *ContentServerImpl) CreateProduct(ctx context.Context, req *content.CreateProductReq) (res *content.CreateProductResp, err error) {
return s.ProductService.CreateProduct(ctx, req)
}
Expand Down
100 changes: 67 additions & 33 deletions biz/application/service/file.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package service

import (
"context"
"errors"
"fmt"
"github.com/CloudStriver/cloudmind-content/biz/infrastructure/consts"
"github.com/CloudStriver/cloudmind-content/biz/infrastructure/convertor"
filemapper "github.com/CloudStriver/cloudmind-content/biz/infrastructure/mapper/file"
Expand Down Expand Up @@ -88,50 +90,82 @@ func (s *FileService) GetFile(ctx context.Context, req *gencontent.GetFileReq) (

func (s *FileService) GetFileList(ctx context.Context, req *gencontent.GetFileListReq) (resp *gencontent.GetFileListResp, err error) {
resp = new(gencontent.GetFileListResp)
resp.FatherPath = "CloudMind"
var (
files []*filemapper.File
total int64
cursor mongop.MongoCursor
err2 error
)

switch req.GetSortOptions() {
case gencontent.SortOptions_SortOptions_createAtAsc:
cursor = filemapper.CreateAtAscCursorType
case gencontent.SortOptions_SortOptions_createAtDesc:
cursor = filemapper.CreateAtDescCursorType
case gencontent.SortOptions_SortOptions_updateAtAsc:
cursor = filemapper.UpdateAtAscCursorType
case gencontent.SortOptions_SortOptions_updateAtDesc:
cursor = filemapper.UpdateAtDescCursorType
}

filter := convertor.FileFilterOptionsToFilterOptions(req.FilterOptions)
p := convertor.ParsePagination(req.PaginationOptions)
if req.SearchOptions == nil {
if files, total, err = s.FileMongoMapper.FindManyAndCount(ctx, filter, p, cursor); err != nil {
log.CtxError(ctx, "查询文件列表: 发生异常[%v]\n", err)
return resp, err
if err = mr.Finish(func() error {
getFileResp, err1 := s.GetFile(ctx, &gencontent.GetFileReq{
FilterOptions: &gencontent.FileFilterOptions{
OnlyFileId: lo.ToPtr(req.GetFilterOptions().GetOnlyFatherId()),
},
})
fmt.Println(getFileResp)
if errors.Is(err1, consts.ErrNotFound) {
return nil
}
} else {
switch o := req.SearchOptions.Type.(type) {
case *gencontent.SearchOptions_AllFieldsKey:
files, total, err = s.FileEsMapper.Search(ctx, convertor.ConvertFileAllFieldsSearchQuery(o), filter, p, esp.ScoreCursorType)
case *gencontent.SearchOptions_MultiFieldsKey:
files, total, err = s.FileEsMapper.Search(ctx, convertor.ConvertFileMultiFieldsSearchQuery(o), filter, p, esp.ScoreCursorType)
if err1 != nil {
return err1
}
if err != nil {
log.CtxError(ctx, "搜索文件列表异常[%v]\n", err)
return resp, err
paths := strings.Split(getFileResp.File.Path, "/")
if len(paths) > 1 {
filelist, err1 := s.FileMongoMapper.FindManyNotPagination(ctx, &filemapper.FilterOptions{
OnlyFileIds: paths[1:],
})
if err1 != nil {
return err1
}
lo.ForEach(filelist, func(item *filemapper.File, _ int) {
resp.FatherPath += "/" + item.Name
})
}
return nil
}, func() error {
switch req.GetSortOptions() {
case gencontent.SortOptions_SortOptions_createAtAsc:
cursor = filemapper.CreateAtAscCursorType
case gencontent.SortOptions_SortOptions_createAtDesc:
cursor = filemapper.CreateAtDescCursorType
case gencontent.SortOptions_SortOptions_updateAtAsc:
cursor = filemapper.UpdateAtAscCursorType
case gencontent.SortOptions_SortOptions_updateAtDesc:
cursor = filemapper.UpdateAtDescCursorType
}
}

if p.LastToken != nil {
resp.Token = *p.LastToken
filter := convertor.FileFilterOptionsToFilterOptions(req.FilterOptions)
p := convertor.ParsePagination(req.PaginationOptions)
if req.SearchOptions == nil {
if files, total, err2 = s.FileMongoMapper.FindManyAndCount(ctx, filter, p, cursor); err != nil {
log.CtxError(ctx, "查询文件列表: 发生异常[%v]\n", err2)
return err2
}
} else {
switch o := req.SearchOptions.Type.(type) {
case *gencontent.SearchOptions_AllFieldsKey:
files, total, err2 = s.FileEsMapper.Search(ctx, convertor.ConvertFileAllFieldsSearchQuery(o), filter, p, esp.ScoreCursorType)
case *gencontent.SearchOptions_MultiFieldsKey:
files, total, err2 = s.FileEsMapper.Search(ctx, convertor.ConvertFileMultiFieldsSearchQuery(o), filter, p, esp.ScoreCursorType)
}
if err2 != nil {
log.CtxError(ctx, "搜索文件列表异常[%v]\n", err2)
return err2
}
}
if p.LastToken != nil {
resp.Token = *p.LastToken
}
resp.Total = total
resp.Files = lo.Map[*filemapper.File, *gencontent.FileInfo](files, func(item *filemapper.File, _ int) *gencontent.FileInfo {
return convertor.FileMapperToFile(item)
})
return nil
}); err != nil {
return resp, err
}
resp.Total = total
resp.Files = lo.Map[*filemapper.File, *gencontent.FileInfo](files, func(item *filemapper.File, _ int) *gencontent.FileInfo {
return convertor.FileMapperToFile(item)
})

return resp, nil
}
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.20

require (
github.com/CloudStriver/go-pkg v0.0.0-20231229114943-910edcb8788d
github.com/CloudStriver/service-idl-gen-go v0.0.0-20240131033233-5831dba09dd6
github.com/CloudStriver/service-idl-gen-go v0.0.0-20240201060740-cadd39081dc7
github.com/bytedance/sonic v1.10.2
github.com/cloudwego/kitex v0.8.0
github.com/elastic/go-elasticsearch/v8 v8.11.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/CloudStriver/go-pkg v0.0.0-20231229114943-910edcb8788d h1:c5M3637HJJN+pD3erToZAw0vutEMLmC+5I63szm5PYU=
github.com/CloudStriver/go-pkg v0.0.0-20231229114943-910edcb8788d/go.mod h1:Oj6+J8ixQxqNunSpl9v64q6tAQ83wY/rRFI+3rhHVCk=
github.com/CloudStriver/service-idl-gen-go v0.0.0-20240131033233-5831dba09dd6 h1:cR6ImN7VBBNIce70nHPLvKaUBVnAgMWzZSLc4sQOdsE=
github.com/CloudStriver/service-idl-gen-go v0.0.0-20240131033233-5831dba09dd6/go.mod h1:chtR82RvfrjUujTGWROSCNAwF9Lh/U959k34bXIDvBI=
github.com/CloudStriver/service-idl-gen-go v0.0.0-20240201060740-cadd39081dc7 h1:FUhcRGxdhBvxV3uFlbaiRjWJw516KM7wJLv9FhHUwvA=
github.com/CloudStriver/service-idl-gen-go v0.0.0-20240201060740-cadd39081dc7/go.mod h1:chtR82RvfrjUujTGWROSCNAwF9Lh/U959k34bXIDvBI=
github.com/ajstarks/deck v0.0.0-20200831202436-30c9fc6549a9/go.mod h1:JynElWSGnm/4RlzPXRlREEwqTHAN3T56Bv2ITsFT3gY=
github.com/ajstarks/deck/generate v0.0.0-20210309230005-c3f852c02e19/go.mod h1:T13YZdzov6OU0A1+RfKZiZN9ca6VeKdBdyDV+BY97Tk=
github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
Expand Down
Loading