This commit is contained in:
Kristian 2026-05-31 21:15:12 +02:00 committed by GitHub
parent 865430d21c
commit 86ac6b33a4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 30 additions and 30 deletions

View file

@ -43,7 +43,7 @@ func main() {
server.RegisterHandler("note/goto", note.NewGotoNoteHandler(noteRepo)) server.RegisterHandler("note/goto", note.NewGotoNoteHandler(noteRepo))
server.RegisterHandler("note/backlinks", note.NewGetBackLinksHandler(linkRepo, noteRepo)) server.RegisterHandler("note/backlinks", note.NewGetBackLinksHandler(linkRepo, noteRepo))
server.RegisterHandler("note/search_by_tag", note.NewGetNotesByTagHandler(noteRepo)) server.RegisterHandler("note/search_by_tag", note.NewGetNotesByTagHandler(noteRepo))
server.RegisterHandler("note/search_by_cfe", note.NewGetNotesByCfeHandler(cfeRepo)) server.RegisterHandler("note/search_by_cf", note.NewGetNotesByCfeHandler(cfeRepo))
server.RegisterHandler("completion/tag", completion.NewCompleteTagHandler(tagRepo)) server.RegisterHandler("completion/tag", completion.NewCompleteTagHandler(tagRepo))
server.RegisterHandler("completion/slug", completion.NewCompleteSlugHandler(noteRepo)) server.RegisterHandler("completion/slug", completion.NewCompleteSlugHandler(noteRepo))

View file

@ -22,14 +22,14 @@ type CreateNoteHandler struct {
uow *repositories.UnitOfWork uow *repositories.UnitOfWork
tagSvc services.ITagService tagSvc services.ITagService
noteRepo repositories.INoteRepository noteRepo repositories.INoteRepository
cfeSvc services.ICfeService cfeSvc services.ICfService
} }
func NewCreateNoteHandler( func NewCreateNoteHandler(
uow *repositories.UnitOfWork, uow *repositories.UnitOfWork,
tagSvc services.ITagService, tagSvc services.ITagService,
noteRepo repositories.INoteRepository, noteRepo repositories.INoteRepository,
cfeSvc services.ICfeService, cfeSvc services.ICfService,
) *CreateNoteHandler { ) *CreateNoteHandler {
return &CreateNoteHandler{uow, tagSvc, noteRepo, cfeSvc} return &CreateNoteHandler{uow, tagSvc, noteRepo, cfeSvc}
} }

View file

@ -8,26 +8,26 @@ import (
"github.com/KristianJBorgwarth/dendrite.daemon/persistence/repositories" "github.com/KristianJBorgwarth/dendrite.daemon/persistence/repositories"
) )
type getNotesByCfeQuery struct { type getNotesByCfQuery struct {
Key string `json:"key"` Key string `json:"key"`
Value string `json:"value"` Value string `json:"value"`
} }
type GetNotesByCfeHandler struct { type GetNotesByCfHandler struct {
cfeRepo repositories.ICfeRepository cfeRepo repositories.ICfRepository
} }
func NewGetNotesByCfeHandler( func NewGetNotesByCfeHandler(
cfeRepo repositories.ICfeRepository, cfeRepo repositories.ICfRepository,
) *GetNotesByCfeHandler { ) *GetNotesByCfHandler {
return &GetNotesByCfeHandler{cfeRepo: cfeRepo} return &GetNotesByCfHandler{cfeRepo: cfeRepo}
} }
func (h *GetNotesByCfeHandler) Handle( func (h *GetNotesByCfHandler) Handle(
ctx context.Context, ctx context.Context,
raw json.RawMessage, raw json.RawMessage,
) (any, error) { ) (any, error) {
var query getNotesByCfeQuery var query getNotesByCfQuery
if err := json.Unmarshal(raw, &query); err != nil { if err := json.Unmarshal(raw, &query); err != nil {
return nil, err return nil, err
} }

View file

@ -20,7 +20,7 @@ type SaveNoteHandler struct {
tagService services.ITagService tagService services.ITagService
noteService services.INoteService noteService services.INoteService
linkService services.ILinkService linkService services.ILinkService
cfeSvc services.ICfeService cfeSvc services.ICfService
} }
func NewSaveNoteHandler( func NewSaveNoteHandler(
@ -29,7 +29,7 @@ func NewSaveNoteHandler(
ts services.ITagService, ts services.ITagService,
ns services.INoteService, ns services.INoteService,
ls services.ILinkService, ls services.ILinkService,
cfs services.ICfeService, cfs services.ICfService,
) *SaveNoteHandler { ) *SaveNoteHandler {
return &SaveNoteHandler{uow, nr, ts, ns, ls, cfs} return &SaveNoteHandler{uow, nr, ts, ns, ls, cfs}
} }

View file

@ -15,7 +15,7 @@ func MapToLinkModel(noteID string, extractedLinks []*filehandling.ExtractedLink)
return links return links
} }
func MapToCfe(noteID string, extractedCfe map[string]any) ([]*CustomFronMatter, error) { func MapToCustomFrontmatter(noteID string, extractedCfe map[string]any) ([]*CustomFronMatter, error) {
var cfe []*CustomFronMatter var cfe []*CustomFronMatter
for key, value := range extractedCfe { for key, value := range extractedCfe {
if valueStr, ok := value.(string); ok { if valueStr, ok := value.(string); ok {

View file

@ -8,19 +8,19 @@ import (
"github.com/KristianJBorgwarth/dendrite.daemon/persistence/repositories" "github.com/KristianJBorgwarth/dendrite.daemon/persistence/repositories"
) )
type ICfeService interface { type ICfService interface {
AddCfe(ctx context.Context, dbCtx persistence.IDbContext, noteID string, cfe map[string]any) error AddCfe(ctx context.Context, dbCtx persistence.IDbContext, noteID string, cfe map[string]any) error
} }
type cfeService struct { type cfService struct {
cfeRepo repositories.ICfeRepository cfRepo repositories.ICfRepository
} }
func NewCfeService(cfeRepo repositories.ICfeRepository) ICfeService { func NewCfeService(cfRepo repositories.ICfRepository) ICfService {
return &cfeService{cfeRepo} return &cfService{cfRepo}
} }
func (s *cfeService) AddCfe( func (s *cfService) AddCfe(
ctx context.Context, ctx context.Context,
dbCtx persistence.IDbContext, dbCtx persistence.IDbContext,
noteID string, noteID string,
@ -29,9 +29,9 @@ func (s *cfeService) AddCfe(
if len(cfe) == 0 { if len(cfe) == 0 {
return nil return nil
} }
cfeModels, err := models.MapToCfe(noteID, cfe) cfModels, err := models.MapToCustomFrontmatter(noteID, cfe)
if err != nil { if err != nil {
return err return err
} }
return s.cfeRepo.InsertRange(ctx, dbCtx, cfeModels) return s.cfRepo.InsertRange(ctx, dbCtx, cfModels)
} }

View file

@ -33,7 +33,7 @@ type indexRebuilder struct {
linkRepo repositories.ILinkRepository linkRepo repositories.ILinkRepository
tagRepo repositories.ITagRepository tagRepo repositories.ITagRepository
indexRepo repositories.IIndexRepository indexRepo repositories.IIndexRepository
cfeRepo repositories.ICfeRepository cfeRepo repositories.ICfRepository
} }
func NewIndexRebuilder( func NewIndexRebuilder(
@ -42,7 +42,7 @@ func NewIndexRebuilder(
linkRepo repositories.ILinkRepository, linkRepo repositories.ILinkRepository,
tagRepo repositories.ITagRepository, tagRepo repositories.ITagRepository,
indexRepo repositories.IIndexRepository, indexRepo repositories.IIndexRepository,
cfeRepo repositories.ICfeRepository, cfeRepo repositories.ICfRepository,
) *indexRebuilder { ) *indexRebuilder {
return &indexRebuilder{ return &indexRebuilder{
uow: uow, uow: uow,
@ -177,7 +177,7 @@ func (r *indexRebuilder) buildDBModels(files []*filehandling.File) (*index, erro
noteTags = append(noteTags, models.CreateNoteTags(note.ID(), file.FrontMatter.Tags)...) noteTags = append(noteTags, models.CreateNoteTags(note.ID(), file.FrontMatter.Tags)...)
links = append(links, models.MapToLinkModel(note.ID(), file.ExtractedLinks)...) links = append(links, models.MapToLinkModel(note.ID(), file.ExtractedLinks)...)
mappedCfe, err := models.MapToCfe(note.ID(), file.FrontMatter.Custom) mappedCfe, err := models.MapToCustomFrontmatter(note.ID(), file.FrontMatter.Custom)
if err != nil { if err != nil {
return nil, err return nil, err
} }

View file

@ -21,14 +21,14 @@ type noteService struct {
tagRepo repositories.ITagRepository tagRepo repositories.ITagRepository
linkRepo repositories.ILinkRepository linkRepo repositories.ILinkRepository
noteRepo repositories.INoteRepository noteRepo repositories.INoteRepository
cfeRepo repositories.ICfeRepository cfeRepo repositories.ICfRepository
} }
func NewNoteService( func NewNoteService(
tagRepo repositories.ITagRepository, tagRepo repositories.ITagRepository,
linkRepo repositories.ILinkRepository, linkRepo repositories.ILinkRepository,
noteRepo repositories.INoteRepository, noteRepo repositories.INoteRepository,
cfeRepo repositories.ICfeRepository, cfeRepo repositories.ICfRepository,
) INoteService { ) INoteService {
return &noteService{tagRepo, linkRepo, noteRepo, cfeRepo} return &noteService{tagRepo, linkRepo, noteRepo, cfeRepo}
} }

View file

@ -7,7 +7,7 @@ import (
"github.com/KristianJBorgwarth/dendrite.daemon/persistence" "github.com/KristianJBorgwarth/dendrite.daemon/persistence"
) )
type ICfeRepository interface { type ICfRepository interface {
InsertRange(ctx context.Context, dbContext persistence.IDbContext, cfe []*models.CustomFronMatter) error InsertRange(ctx context.Context, dbContext persistence.IDbContext, cfe []*models.CustomFronMatter) error
Search(ctx context.Context, key string, value string) ([]*models.Note, error) Search(ctx context.Context, key string, value string) ([]*models.Note, error)
Delete(ctx context.Context, dbContext persistence.IDbContext, noteID string) error Delete(ctx context.Context, dbContext persistence.IDbContext, noteID string) error
@ -17,7 +17,7 @@ type cfeRepository struct {
readDBContext persistence.ReadContext readDBContext persistence.ReadContext
} }
func NewCfeRepository(rdb persistence.ReadContext) ICfeRepository { func NewCfeRepository(rdb persistence.ReadContext) ICfRepository {
return &cfeRepository{readDBContext: rdb} return &cfeRepository{readDBContext: rdb}
} }

View file

@ -13,7 +13,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )
func newGetNotesByCfeHandler() *note.GetNotesByCfeHandler { func newGetNotesByCfeHandler() *note.GetNotesByCfHandler {
return note.NewGetNotesByCfeHandler( return note.NewGetNotesByCfeHandler(
repositories.NewCfeRepository(persistence.NewReadContext()), repositories.NewCfeRepository(persistence.NewReadContext()),
) )