From 86ac6b33a493c90ace3feef86168c4126aa40639 Mon Sep 17 00:00:00 2001 From: Kristian <10348902@pm.me> Date: Sun, 31 May 2026 21:15:12 +0200 Subject: [PATCH] cleanup (#47) --- cmd/main.go | 2 +- core/handlers/note/create_note_handler.go | 4 ++-- ...cfe_handler.go => get_notes_by_cf_handler.go} | 16 ++++++++-------- core/handlers/note/save_note_handler.go | 4 ++-- core/models/mappers.go | 2 +- core/services/{cfe_service.go => cf_service.go} | 16 ++++++++-------- core/services/index_rebuilder.go | 6 +++--- core/services/note_service.go | 4 ++-- persistence/repositories/cfe_repository.go | 4 ++-- .../get_notes_by_cfe_handler_test.go | 2 +- 10 files changed, 30 insertions(+), 30 deletions(-) rename core/handlers/note/{get_notes_by_cfe_handler.go => get_notes_by_cf_handler.go} (69%) rename core/services/{cfe_service.go => cf_service.go} (61%) diff --git a/cmd/main.go b/cmd/main.go index e431377..b552a8a 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -43,7 +43,7 @@ func main() { server.RegisterHandler("note/goto", note.NewGotoNoteHandler(noteRepo)) server.RegisterHandler("note/backlinks", note.NewGetBackLinksHandler(linkRepo, 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/slug", completion.NewCompleteSlugHandler(noteRepo)) diff --git a/core/handlers/note/create_note_handler.go b/core/handlers/note/create_note_handler.go index 4da91ee..64555dc 100644 --- a/core/handlers/note/create_note_handler.go +++ b/core/handlers/note/create_note_handler.go @@ -22,14 +22,14 @@ type CreateNoteHandler struct { uow *repositories.UnitOfWork tagSvc services.ITagService noteRepo repositories.INoteRepository - cfeSvc services.ICfeService + cfeSvc services.ICfService } func NewCreateNoteHandler( uow *repositories.UnitOfWork, tagSvc services.ITagService, noteRepo repositories.INoteRepository, - cfeSvc services.ICfeService, + cfeSvc services.ICfService, ) *CreateNoteHandler { return &CreateNoteHandler{uow, tagSvc, noteRepo, cfeSvc} } diff --git a/core/handlers/note/get_notes_by_cfe_handler.go b/core/handlers/note/get_notes_by_cf_handler.go similarity index 69% rename from core/handlers/note/get_notes_by_cfe_handler.go rename to core/handlers/note/get_notes_by_cf_handler.go index 6de0d5b..9b36a20 100644 --- a/core/handlers/note/get_notes_by_cfe_handler.go +++ b/core/handlers/note/get_notes_by_cf_handler.go @@ -8,26 +8,26 @@ import ( "github.com/KristianJBorgwarth/dendrite.daemon/persistence/repositories" ) -type getNotesByCfeQuery struct { +type getNotesByCfQuery struct { Key string `json:"key"` Value string `json:"value"` } -type GetNotesByCfeHandler struct { - cfeRepo repositories.ICfeRepository +type GetNotesByCfHandler struct { + cfeRepo repositories.ICfRepository } func NewGetNotesByCfeHandler( - cfeRepo repositories.ICfeRepository, -) *GetNotesByCfeHandler { - return &GetNotesByCfeHandler{cfeRepo: cfeRepo} + cfeRepo repositories.ICfRepository, +) *GetNotesByCfHandler { + return &GetNotesByCfHandler{cfeRepo: cfeRepo} } -func (h *GetNotesByCfeHandler) Handle( +func (h *GetNotesByCfHandler) Handle( ctx context.Context, raw json.RawMessage, ) (any, error) { - var query getNotesByCfeQuery + var query getNotesByCfQuery if err := json.Unmarshal(raw, &query); err != nil { return nil, err } diff --git a/core/handlers/note/save_note_handler.go b/core/handlers/note/save_note_handler.go index 37da6e9..4a1f639 100644 --- a/core/handlers/note/save_note_handler.go +++ b/core/handlers/note/save_note_handler.go @@ -20,7 +20,7 @@ type SaveNoteHandler struct { tagService services.ITagService noteService services.INoteService linkService services.ILinkService - cfeSvc services.ICfeService + cfeSvc services.ICfService } func NewSaveNoteHandler( @@ -29,7 +29,7 @@ func NewSaveNoteHandler( ts services.ITagService, ns services.INoteService, ls services.ILinkService, - cfs services.ICfeService, + cfs services.ICfService, ) *SaveNoteHandler { return &SaveNoteHandler{uow, nr, ts, ns, ls, cfs} } diff --git a/core/models/mappers.go b/core/models/mappers.go index 7aa9a22..f3880c9 100644 --- a/core/models/mappers.go +++ b/core/models/mappers.go @@ -15,7 +15,7 @@ func MapToLinkModel(noteID string, extractedLinks []*filehandling.ExtractedLink) 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 for key, value := range extractedCfe { if valueStr, ok := value.(string); ok { diff --git a/core/services/cfe_service.go b/core/services/cf_service.go similarity index 61% rename from core/services/cfe_service.go rename to core/services/cf_service.go index c86c691..6df143f 100644 --- a/core/services/cfe_service.go +++ b/core/services/cf_service.go @@ -8,19 +8,19 @@ import ( "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 } -type cfeService struct { - cfeRepo repositories.ICfeRepository +type cfService struct { + cfRepo repositories.ICfRepository } -func NewCfeService(cfeRepo repositories.ICfeRepository) ICfeService { - return &cfeService{cfeRepo} +func NewCfeService(cfRepo repositories.ICfRepository) ICfService { + return &cfService{cfRepo} } -func (s *cfeService) AddCfe( +func (s *cfService) AddCfe( ctx context.Context, dbCtx persistence.IDbContext, noteID string, @@ -29,9 +29,9 @@ func (s *cfeService) AddCfe( if len(cfe) == 0 { return nil } - cfeModels, err := models.MapToCfe(noteID, cfe) + cfModels, err := models.MapToCustomFrontmatter(noteID, cfe) if err != nil { return err } - return s.cfeRepo.InsertRange(ctx, dbCtx, cfeModels) + return s.cfRepo.InsertRange(ctx, dbCtx, cfModels) } diff --git a/core/services/index_rebuilder.go b/core/services/index_rebuilder.go index 18423af..0b540fd 100644 --- a/core/services/index_rebuilder.go +++ b/core/services/index_rebuilder.go @@ -33,7 +33,7 @@ type indexRebuilder struct { linkRepo repositories.ILinkRepository tagRepo repositories.ITagRepository indexRepo repositories.IIndexRepository - cfeRepo repositories.ICfeRepository + cfeRepo repositories.ICfRepository } func NewIndexRebuilder( @@ -42,7 +42,7 @@ func NewIndexRebuilder( linkRepo repositories.ILinkRepository, tagRepo repositories.ITagRepository, indexRepo repositories.IIndexRepository, - cfeRepo repositories.ICfeRepository, + cfeRepo repositories.ICfRepository, ) *indexRebuilder { return &indexRebuilder{ 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)...) 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 { return nil, err } diff --git a/core/services/note_service.go b/core/services/note_service.go index 18a3a09..f43dd48 100644 --- a/core/services/note_service.go +++ b/core/services/note_service.go @@ -21,14 +21,14 @@ type noteService struct { tagRepo repositories.ITagRepository linkRepo repositories.ILinkRepository noteRepo repositories.INoteRepository - cfeRepo repositories.ICfeRepository + cfeRepo repositories.ICfRepository } func NewNoteService( tagRepo repositories.ITagRepository, linkRepo repositories.ILinkRepository, noteRepo repositories.INoteRepository, - cfeRepo repositories.ICfeRepository, + cfeRepo repositories.ICfRepository, ) INoteService { return ¬eService{tagRepo, linkRepo, noteRepo, cfeRepo} } diff --git a/persistence/repositories/cfe_repository.go b/persistence/repositories/cfe_repository.go index 18356e4..3c49e8d 100644 --- a/persistence/repositories/cfe_repository.go +++ b/persistence/repositories/cfe_repository.go @@ -7,7 +7,7 @@ import ( "github.com/KristianJBorgwarth/dendrite.daemon/persistence" ) -type ICfeRepository interface { +type ICfRepository interface { InsertRange(ctx context.Context, dbContext persistence.IDbContext, cfe []*models.CustomFronMatter) error Search(ctx context.Context, key string, value string) ([]*models.Note, error) Delete(ctx context.Context, dbContext persistence.IDbContext, noteID string) error @@ -17,7 +17,7 @@ type cfeRepository struct { readDBContext persistence.ReadContext } -func NewCfeRepository(rdb persistence.ReadContext) ICfeRepository { +func NewCfeRepository(rdb persistence.ReadContext) ICfRepository { return &cfeRepository{readDBContext: rdb} } diff --git a/test/test_integration/get_notes_by_cfe_handler_test.go b/test/test_integration/get_notes_by_cfe_handler_test.go index 4dabdcf..11e2222 100644 --- a/test/test_integration/get_notes_by_cfe_handler_test.go +++ b/test/test_integration/get_notes_by_cfe_handler_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/require" ) -func newGetNotesByCfeHandler() *note.GetNotesByCfeHandler { +func newGetNotesByCfeHandler() *note.GetNotesByCfHandler { return note.NewGetNotesByCfeHandler( repositories.NewCfeRepository(persistence.NewReadContext()), )