refactor: migrate bookmark static pages to new http server

internal/cmd/add.go

@@ -45,7 +45,7 @@ func addHandler(cmd *cobra.Command, args []string) {
 	excerpt = normalizeSpace(excerpt)
 
 	// Create bookmark item
-	book := model.Bookmark{
+	book := model.BookmarkDTO{
 		URL:           url,
 		Title:         title,
 		Excerpt:       excerpt,

internal/cmd/check.go

@@ -76,7 +76,7 @@ func checkHandler(cmd *cobra.Command, args []string) {
 	for i, book := range bookmarks {
 		wg.Add(1)
 
-		go func(i int, book model.Bookmark) {
+		go func(i int, book model.BookmarkDTO) {
 			// Make sure to finish the WG
 			defer wg.Done()
 

internal/cmd/import.go

@@ -52,7 +52,7 @@ func importHandler(cmd *cobra.Command, args []string) {
 	defer srcFile.Close()
 
 	// Parse bookmark's file
-	bookmarks := []model.Bookmark{}
+	bookmarks := []model.BookmarkDTO{}
 	mapURL := make(map[string]struct{})
 
 	doc, err := goquery.NewDocumentFromReader(srcFile)
@@ -135,7 +135,7 @@ func importHandler(cmd *cobra.Command, args []string) {
 		}
 
 		// Add item to list
-		bookmark := model.Bookmark{
+		bookmark := model.BookmarkDTO{
 			URL:      url,
 			Title:    title,
 			Tags:     tags,

internal/cmd/pocket.go

@@ -36,7 +36,7 @@ func pocketHandler(cmd *cobra.Command, args []string) {
 	defer srcFile.Close()
 
 	// Parse pocket's file
-	bookmarks := []model.Bookmark{}
+	bookmarks := []model.BookmarkDTO{}
 	mapURL := make(map[string]struct{})
 
 	doc, err := goquery.NewDocumentFromReader(srcFile)
@@ -93,7 +93,7 @@ func pocketHandler(cmd *cobra.Command, args []string) {
 		}
 
 		// Add item to list
-		bookmark := model.Bookmark{
+		bookmark := model.BookmarkDTO{
 			URL:      url,
 			Title:    title,
 			Modified: modified.Format(model.DatabaseDateFormat),

internal/cmd/root.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/go-shiori/shiori/internal/config"
 	"github.com/go-shiori/shiori/internal/database"
+	"github.com/go-shiori/shiori/internal/dependencies"
 	"github.com/go-shiori/shiori/internal/domains"
 	"github.com/go-shiori/shiori/internal/model"
 	"github.com/sirupsen/logrus"
@@ -47,7 +48,7 @@ func ShioriCmd() *cobra.Command {
 	return rootCmd
 }
 
-func initShiori(ctx context.Context, cmd *cobra.Command) (*config.Config, *config.Dependencies) {
+func initShiori(ctx context.Context, cmd *cobra.Command) (*config.Config, *dependencies.Dependencies) {
 	logger := logrus.New()
 
 	portableMode, _ := cmd.Flags().GetBool("portable")
@@ -96,9 +97,10 @@ func initShiori(ctx context.Context, cmd *cobra.Command) (*config.Config, *confi
 		logger.Warn("Development mode is ENABLED, this will enable some helpers for local development, unsuitable for production environments")
 	}
 
-	dependencies := config.NewDependencies(logger, db, cfg)
+	dependencies := dependencies.NewDependencies(logger, db, cfg)
 	dependencies.Domains.Auth = domains.NewAccountsDomain(logger, cfg.Http.SecretKey, db)
 	dependencies.Domains.Archiver = domains.NewArchiverDomain(logger, cfg.Storage.DataDir)
+	dependencies.Domains.Bookmarks = domains.NewBookmarksDomain(logger, db, cfg)
 
 	// Workaround: Get accounts to make sure at least one is present in the database.
 	// If there's no accounts in the database, create the shiori/gopher account the legacy api

internal/cmd/server.go

@@ -66,7 +66,10 @@ func newServerCommandHandler() func(cmd *cobra.Command, args []string) {
 
 		dependencies.Log.Infof("Starting Shiori v%s", model.BuildVersion)
 
-		server := http.NewHttpServer(dependencies.Log).Setup(cfg, dependencies)
+		server, err := http.NewHttpServer(dependencies.Log).Setup(cfg, dependencies)
+		if err != nil {
+			dependencies.Log.WithError(err).Fatal("error setting up server")
+		}
 
 		if err := server.Start(ctx); err != nil {
 			dependencies.Log.WithError(err).Fatal("error starting server")

internal/cmd/update.go

@@ -147,7 +147,7 @@ func updateHandler(cmd *cobra.Command, args []string) {
 				book.URL = url
 			}
 
-			go func(i int, book model.Bookmark) {
+			go func(i int, book model.BookmarkDTO) {
 				// Make sure to finish the WG
 				defer wg.Done()
 

internal/cmd/utils.go

@@ -41,7 +41,7 @@ func isURLValid(s string) bool {
 	return err == nil && tmp.Scheme != "" && tmp.Hostname() != ""
 }
 
-func printBookmarks(bookmarks ...model.Bookmark) {
+func printBookmarks(bookmarks ...model.BookmarkDTO) {
 	for _, bookmark := range bookmarks {
 		// Create bookmark index
 		strBookmarkIndex := fmt.Sprintf("%d. ", bookmark.ID)

internal/core/ebook.go

@@ -15,7 +15,7 @@ import (
 // GenerateEbook receives a `ProcessRequest` and generates an ebook file in the destination path specified.
 // The destination path `dstPath` should include file name with ".epub" extension
 // The bookmark model will be used to update the UI based on whether this function is successful or not.
-func GenerateEbook(req ProcessRequest, dstPath string) (book model.Bookmark, err error) {
+func GenerateEbook(req ProcessRequest, dstPath string) (book model.BookmarkDTO, err error) {
 
 	book = req.Bookmark
 

internal/core/ebook_test.go

@@ -19,7 +19,7 @@ func TestGenerateEbook(t *testing.T) {
 			dstDir := t.TempDir()
 
 			mockRequest := core.ProcessRequest{
-				Bookmark: model.Bookmark{
+				Bookmark: model.BookmarkDTO{
 					ID:       1,
 					Title:    "Example Bookmark",
 					HTML:     "<html><body>Example HTML</body></html>",
@@ -39,7 +39,7 @@ func TestGenerateEbook(t *testing.T) {
 			dstDir := t.TempDir()
 
 			mockRequest := core.ProcessRequest{
-				Bookmark: model.Bookmark{
+				Bookmark: model.BookmarkDTO{
 					ID:       1,
 					HasEbook: false,
 				},
@@ -74,7 +74,7 @@ func TestGenerateEbook(t *testing.T) {
 			dstDir := t.TempDir()
 
 			mockRequest := core.ProcessRequest{
-				Bookmark: model.Bookmark{
+				Bookmark: model.BookmarkDTO{
 					ID:       1,
 					HasEbook: false,
 				},
@@ -104,7 +104,7 @@ func TestGenerateEbook(t *testing.T) {
 		t.Run("invalid bookmarkId that return Error", func(t *testing.T) {
 			tempDir := t.TempDir()
 			mockRequest := core.ProcessRequest{
-				Bookmark: model.Bookmark{
+				Bookmark: model.BookmarkDTO{
 					ID:       0,
 					HasEbook: false,
 				},
@@ -114,7 +114,7 @@ func TestGenerateEbook(t *testing.T) {
 
 			bookmark, err := core.GenerateEbook(mockRequest, tempDir)
 
-			assert.Equal(t, model.Bookmark{
+			assert.Equal(t, model.BookmarkDTO{
 				ID:       0,
 				HasEbook: false,
 			}, bookmark)
@@ -125,7 +125,7 @@ func TestGenerateEbook(t *testing.T) {
 			dstDir := t.TempDir()
 
 			mockRequest := core.ProcessRequest{
-				Bookmark: model.Bookmark{
+				Bookmark: model.BookmarkDTO{
 					ID:       1,
 					HasEbook: false,
 				},
@@ -155,7 +155,7 @@ func TestGenerateEbook(t *testing.T) {
 			tempDir := t.TempDir()
 
 			mockRequest := core.ProcessRequest{
-				Bookmark: model.Bookmark{
+				Bookmark: model.BookmarkDTO{
 					ID:       1,
 					HasEbook: false,
 				},

internal/core/processing.go

@@ -30,7 +30,7 @@ import (
 // ProcessRequest is the request for processing bookmark.
 type ProcessRequest struct {
 	DataDir     string
-	Bookmark    model.Bookmark
+	Bookmark    model.BookmarkDTO
 	Content     io.Reader
 	ContentType string
 	KeepTitle   bool
@@ -42,7 +42,7 @@ var ErrNoSupportedImageType = errors.New("unsupported image type")
 
 // ProcessBookmark process the bookmark and archive it if needed.
 // Return three values, is error fatal, and error value.
-func ProcessBookmark(req ProcessRequest) (book model.Bookmark, isFatalErr bool, err error) {
+func ProcessBookmark(req ProcessRequest) (book model.BookmarkDTO, isFatalErr bool, err error) {
 	book = req.Bookmark
 	contentType := req.ContentType
 

internal/core/processing_test.go

@@ -104,7 +104,7 @@ func TestDownloadBookImage(t *testing.T) {
 func TestProcessBookmark(t *testing.T) {
 	t.Run("ProcessRequest with sucssesful result", func(t *testing.T) {
 		t.Run("Normal without image", func(t *testing.T) {
-			bookmark := model.Bookmark{
+			bookmark := model.BookmarkDTO{
 				ID:            1,
 				URL:           "https://example.com",
 				Title:         "Example",
@@ -148,7 +148,7 @@ func TestProcessBookmark(t *testing.T) {
 		    <p>This is an example article</p>
 		  </body>
 		</html>`
-			bookmark := model.Bookmark{
+			bookmark := model.BookmarkDTO{
 				ID:            1,
 				URL:           "https://example.com",
 				Title:         "Example",
@@ -198,7 +198,7 @@ func TestProcessBookmark(t *testing.T) {
     			<p>This is an example article</p>
   			</body>
 			</html>`
-			bookmark := model.Bookmark{
+			bookmark := model.BookmarkDTO{
 				ID:            1,
 				URL:           "https://example.com",
 				Title:         "Example",
@@ -231,7 +231,7 @@ func TestProcessBookmark(t *testing.T) {
 			}
 		})
 		t.Run("ProcessRequest sucssesful with empty title ", func(t *testing.T) {
-			bookmark := model.Bookmark{
+			bookmark := model.BookmarkDTO{
 				ID:            1,
 				URL:           "https://example.com",
 				Title:         "",
@@ -264,7 +264,7 @@ func TestProcessBookmark(t *testing.T) {
 			}
 		})
 		t.Run("ProcessRequest sucssesful with empty Excerpt", func(t *testing.T) {
-			bookmark := model.Bookmark{
+			bookmark := model.BookmarkDTO{
 				ID:            1,
 				URL:           "https://example.com",
 				Title:         "",
@@ -299,7 +299,7 @@ func TestProcessBookmark(t *testing.T) {
 		t.Run("Specific case", func(t *testing.T) {
 			t.Run("ProcessRequest with ID zero", func(t *testing.T) {
 
-				bookmark := model.Bookmark{
+				bookmark := model.BookmarkDTO{
 					ID:            0,
 					URL:           "https://example.com",
 					Title:         "Example",
@@ -324,7 +324,7 @@ func TestProcessBookmark(t *testing.T) {
 
 			t.Run("ProcessRequest that content type not zero", func(t *testing.T) {
 
-				bookmark := model.Bookmark{
+				bookmark := model.BookmarkDTO{
 					ID:            1,
 					URL:           "https://example.com",
 					Title:         "Example",

internal/database/database.go

@@ -72,10 +72,10 @@ type DB interface {
 	Migrate() error
 
 	// SaveBookmarks saves bookmarks data to database.
-	SaveBookmarks(ctx context.Context, create bool, bookmarks ...model.Bookmark) ([]model.Bookmark, error)
+	SaveBookmarks(ctx context.Context, create bool, bookmarks ...model.BookmarkDTO) ([]model.BookmarkDTO, error)
 
 	// GetBookmarks fetch list of bookmarks based on submitted options.
-	GetBookmarks(ctx context.Context, opts GetBookmarksOptions) ([]model.Bookmark, error)
+	GetBookmarks(ctx context.Context, opts GetBookmarksOptions) ([]model.BookmarkDTO, error)
 
 	// GetBookmarksCount get count of bookmarks in database.
 	GetBookmarksCount(ctx context.Context, opts GetBookmarksOptions) (int, error)
@@ -84,7 +84,7 @@ type DB interface {
 	DeleteBookmarks(ctx context.Context, ids ...int) error
 
 	// GetBookmark fetches bookmark based on its ID or URL.
-	GetBookmark(ctx context.Context, id int, url string) (model.Bookmark, bool, error)
+	GetBookmark(ctx context.Context, id int, url string) (model.BookmarkDTO, bool, error)
 
 	// SaveAccount saves new account in database
 	SaveAccount(ctx context.Context, a model.Account) error