toby3d/home
toby3d
/
home
1
0
Fork 0
Code Actions Packages Releases Activity

👔 Replaced static on resource module in Page and Site use cases

This commit is contained in:
Maxim Lebedev 2023-11-18 19:01:34 +06:00
parent 345c3890bb
commit 5ad5537b3e
Signed by: toby3d
GPG Key ID: 1F14E25B7C119FC5
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/page/usecase/page_ucase.go
View File

@ -7,19 +7,19 @@ import (
"source.toby3d.me/toby3d/home/internal/domain"
"source.toby3d.me/toby3d/home/internal/page"
"source.toby3d.me/toby3d/home/internal/static"
"source.toby3d.me/toby3d/home/internal/resource"
"source.toby3d.me/toby3d/home/internal/urlutil"
)
type pageUseCase struct {
pages page.Repository
statics static.Repository
pages page.Repository
resources resource.Repository
}
func NewPageUseCase(pages page.Repository, statics static.Repository) page.UseCase {
func NewPageUseCase(pages page.Repository, resources resource.Repository) page.UseCase {
return &pageUseCase{
pages: pages,
statics: statics,
pages: pages,
resources: resources,
}
}
@ -47,7 +47,7 @@ func (ucase *pageUseCase) Do(ctx context.Context, lang domain.Language, p string
continue
}
if out.Resources, _, err = ucase.statics.Fetch(ctx, out.File.Dir()+"*"); err != nil {
if out.Resources, _, err = ucase.resources.Fetch(ctx, out.File.Dir()+"*"); err != nil {
return out, nil
}

4
internal/page/usecase/page_ucase_test.go
View File

@ -11,7 +11,7 @@ import (
"source.toby3d.me/toby3d/home/internal/domain"
pagefsrepo "source.toby3d.me/toby3d/home/internal/page/repository/fs"
"source.toby3d.me/toby3d/home/internal/page/usecase"
"source.toby3d.me/toby3d/home/internal/static"
"source.toby3d.me/toby3d/home/internal/resource"
)
func TestDo(t *testing.T) {
@ -25,7 +25,7 @@ func TestDo(t *testing.T) {
filepath.Join("index.md"): &fstest.MapFile{Data: []byte(`index.md`)},
})
ucase := usecase.NewPageUseCase(pages, static.NewDummyRepository())
ucase := usecase.NewPageUseCase(pages, resource.NewDummyRepository())
for name, tc := range map[string]struct {
input string

14
internal/site/usecase/site_ucase.go
View File

@ -5,19 +5,19 @@ import (
"fmt"
"source.toby3d.me/toby3d/home/internal/domain"
"source.toby3d.me/toby3d/home/internal/resource"
"source.toby3d.me/toby3d/home/internal/site"
"source.toby3d.me/toby3d/home/internal/static"
)
type siteUseCase struct {
sites site.Repository
statics static.Repository
sites site.Repository
resources resource.Repository
}
func NewSiteUseCase(sites site.Repository, statics static.Repository) site.UseCase {
func NewSiteUseCase(sites site.Repository, resources resource.Repository) site.UseCase {
return &siteUseCase{
sites: sites,
statics: statics,
sites: sites,
resources: resources,
}
}
@ -27,7 +27,7 @@ func (ucase *siteUseCase) Do(ctx context.Context, lang domain.Language) (*domain
return nil, fmt.Errorf("cannot find base site data: %w", err)
}
if out.Resources, _, err = ucase.statics.Fetch(ctx, ""); err == nil {
if out.Resources, _, err = ucase.resources.Fetch(ctx, ""); err == nil {
for _, res := range out.Resources.Match("index.*.md") {
out.Languages = append(out.Languages, res.File.Language)
}