feat: asset filtering

internal/adapter/gql/gqlmodel/convert.go

@@ -85,3 +85,15 @@ func FromListOperation(op ListOperation) interfaces.ListOperation {
 	}
 	return interfaces.ListOperation("")
 }
+
+func ToPagination(pagination *Pagination) *usecase.Pagination {
+	if pagination == nil {
+		return nil
+	}
+	return &usecase.Pagination{
+		Before: pagination.Before,
+		After:  pagination.After,
+		First:  pagination.First,
+		Last:   pagination.Last,
+	}
+}

internal/adapter/gql/gqlmodel/convert_asset.go

@@ -18,3 +18,18 @@ func ToAsset(a *asset.Asset) *Asset {
 		ContentType: a.ContentType(),
 	}
 }
+
+func AssetSortTypeFrom(ast *AssetSortType) *asset.SortType {
+	if ast == nil {
+		return nil
+	}
+	switch *ast {
+	case AssetSortTypeDate:
+		return &asset.SortTypeID
+	case AssetSortTypeName:
+		return &asset.SortTypeName
+	case AssetSortTypeSize:
+		return &asset.SortTypeSize
+	}
+	return &asset.SortTypeID
+}

internal/adapter/gql/loader_asset.go

@@ -7,6 +7,7 @@ import (
 	"github.com/reearth/reearth-backend/internal/adapter/gql/gqlmodel"
 	"github.com/reearth/reearth-backend/internal/usecase"
 	"github.com/reearth/reearth-backend/internal/usecase/interfaces"
+	"github.com/reearth/reearth-backend/pkg/asset"
 	"github.com/reearth/reearth-backend/pkg/id"
 )
 
@@ -32,9 +33,10 @@ func (c *AssetLoader) Fetch(ctx context.Context, ids []id.AssetID) ([]*gqlmodel.
 	return assets, nil
 }
 
-func (c *AssetLoader) FindByTeam(ctx context.Context, teamID id.ID, first *int, last *int, before *usecase.Cursor, after *usecase.Cursor) (*gqlmodel.AssetConnection, error) {
-	p := usecase.NewPagination(first, last, before, after)
-	assets, pi, err := c.usecase.FindByTeam(ctx, id.TeamID(teamID), p, getOperator(ctx))
+func (c *AssetLoader) FindByTeam(ctx context.Context, teamID id.ID, keyword *string, sort *asset.SortType, pagination *gqlmodel.Pagination) (*gqlmodel.AssetConnection, error) {
+	p := gqlmodel.ToPagination(pagination)
+
+	assets, pi, err := c.usecase.FindByTeam(ctx, id.TeamID(teamID), keyword, sort, p, getOperator(ctx))
 	if err != nil {
 		return nil, err
 	}

internal/adapter/gql/resolver_query.go

@@ -14,8 +14,8 @@ func (r *Resolver) Query() QueryResolver {
 
 type queryResolver struct{ *Resolver }
 
-func (r *queryResolver) Assets(ctx context.Context, teamID id.ID, first *int, last *int, after *usecase.Cursor, before *usecase.Cursor) (*gqlmodel.AssetConnection, error) {
-	return loaders(ctx).Asset.FindByTeam(ctx, teamID, first, last, before, after)
+func (r *queryResolver) Assets(ctx context.Context, teamID id.ID, keyword *string, sortType *gqlmodel.AssetSortType, pagination *gqlmodel.Pagination) (*gqlmodel.AssetConnection, error) {
+	return loaders(ctx).Asset.FindByTeam(ctx, teamID, keyword, gqlmodel.AssetSortTypeFrom(sortType), pagination)
 }
 
 func (r *queryResolver) Me(ctx context.Context) (*gqlmodel.User, error) {

internal/adapter/gql/resolver_team.go

@@ -19,7 +19,12 @@ func (r *Resolver) TeamMember() TeamMemberResolver {
 type teamResolver struct{ *Resolver }
 
 func (r *teamResolver) Assets(ctx context.Context, obj *gqlmodel.Team, first *int, last *int, after *usecase.Cursor, before *usecase.Cursor) (*gqlmodel.AssetConnection, error) {
-	return loaders(ctx).Asset.FindByTeam(ctx, obj.ID, first, last, before, after)
+	return loaders(ctx).Asset.FindByTeam(ctx, obj.ID, nil, nil, &gqlmodel.Pagination{
+		First:  first,
+		Last:   last,
+		After:  after,
+		Before: before,
+	})
 }
 
 func (r *teamResolver) Projects(ctx context.Context, obj *gqlmodel.Team, includeArchived *bool, first *int, last *int, after *usecase.Cursor, before *usecase.Cursor) (*gqlmodel.ProjectConnection, error) {

internal/infrastructure/memory/asset.go

@@ -66,7 +66,7 @@ func (r *Asset) Remove(ctx context.Context, id id.AssetID) error {
 	return nil
 }
 
-func (r *Asset) FindByTeam(ctx context.Context, id id.TeamID, pagination *usecase.Pagination) ([]*asset.Asset, *usecase.PageInfo, error) {
+func (r *Asset) FindByTeam(ctx context.Context, id id.TeamID, filter repo.AssetFilter) ([]*asset.Asset, *usecase.PageInfo, error) {
 	r.lock.Lock()
 	defer r.lock.Unlock()