Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove unfinished endpoints #877

Merged
merged 2 commits into from
Apr 7, 2024
Merged

fix: remove unfinished endpoints #877

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a94653a
fix: remove unfinished endpoints
fmartingr Apr 7, 2024
a4c1060
Merge branch 'master' into fix/auth-bookmark-api-v1
fmartingr Apr 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
140 changes: 0 additions & 140 deletions internal/http/routes/api/v1/bookmarks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package api_v1

import (
"fmt"
"log"
"net/http"
"os"
fp "path/filepath"
Expand All @@ -25,10 +24,7 @@ type BookmarksAPIRoutes struct {
}

func (r *BookmarksAPIRoutes) Setup(g *gin.RouterGroup) model.Routes {
g.GET("/", r.listHandler)
g.PUT("/cache", r.updateCache)
g.POST("/", r.createHandler)
g.DELETE("/:id", r.deleteHandler)
return r
}

Expand Down Expand Up @@ -59,142 +55,6 @@ func (p *updateCachePayload) IsValid() error {
return nil
}

func (r *BookmarksAPIRoutes) listHandler(c *gin.Context) {
bookmarks, err := r.deps.Database.GetBookmarks(c, database.GetBookmarksOptions{})
if err != nil {
r.logger.WithError(err).Error("error getting bookmarks")
response.SendInternalServerError(c)
return
}

response.Send(c, 200, bookmarks)
}

type apiCreateBookmarkPayload struct {
URL string `json:"url"`
Title string `json:"title"`
Excerpt string `json:"excerpt"`
Tags []model.Tag `json:"tags"`
CreateArchive bool `json:"create_archive"`
MakePublic int `json:"public"`
Async bool `json:"async"`
}

func (payload *apiCreateBookmarkPayload) ToBookmark() (*model.BookmarkDTO, error) {
bookmark := &model.BookmarkDTO{
URL: payload.URL,
Title: payload.Title,
Excerpt: payload.Excerpt,
Tags: payload.Tags,
Public: payload.MakePublic,
CreateArchive: payload.CreateArchive,
}

log.Println(bookmark.URL)

var err error
bookmark.URL, err = core.RemoveUTMParams(bookmark.URL)
if err != nil {
return nil, err
}

// Ensure title is not empty
if bookmark.Title == "" {
bookmark.Title = bookmark.URL
}

return bookmark, nil
}

func newAPICreateBookmarkPayload() *apiCreateBookmarkPayload {
return &apiCreateBookmarkPayload{
CreateArchive: false,
Async: true,
}
}

func (r *BookmarksAPIRoutes) createHandler(c *gin.Context) {
payload := newAPICreateBookmarkPayload()
if err := c.ShouldBindJSON(&payload); err != nil {
r.logger.WithError(err).Error("Error parsing payload")
response.SendError(c, 400, "Couldn't understand request")
return
}

bookmark, err := payload.ToBookmark()
if err != nil {
r.logger.WithError(err).Error("Error creating bookmark from request")
response.SendError(c, 400, "Couldn't understand request parameters")
return
}

results, err := r.deps.Database.SaveBookmarks(c, true, *bookmark)
if err != nil || len(results) == 0 {
r.logger.WithError(err).WithField("payload", payload).Error("Error creating bookmark")
response.SendInternalServerError(c)
return
}

book := results[0]

if payload.Async {
go func() {
bookmark, err := r.deps.Domains.Archiver.DownloadBookmarkArchive(book)
if err != nil {
r.logger.WithError(err).Error("Error downloading bookmark")
return
}
if _, err := r.deps.Database.SaveBookmarks(c, false, *bookmark); err != nil {
r.logger.WithError(err).Error("Error saving bookmark")
}
}()
} else {
// Workaround. Download content after saving the bookmark so we have the proper database
// id already set in the object regardless of the database engine.
book, err := r.deps.Domains.Archiver.DownloadBookmarkArchive(book)
if err != nil {
r.logger.WithError(err).Error("Error downloading bookmark")
} else if _, err := r.deps.Database.SaveBookmarks(c, false, *book); err != nil {
r.logger.WithError(err).Error("Error saving bookmark")
}
}

response.Send(c, 201, book)
}

func (r *BookmarksAPIRoutes) deleteHandler(c *gin.Context) {
bookmarkIDParam, exists := c.Params.Get("id")
if !exists {
response.SendError(c, 400, "Incorrect bookmark ID")
return
}

bookmarkID, err := strconv.Atoi(bookmarkIDParam)
if err != nil {
response.SendInternalServerError(c)
return
}

_, found, err := r.deps.Database.GetBookmark(c, bookmarkID, "")
if err != nil {
response.SendError(c, 400, "Incorrect bookmark ID")
return
}

if !found {
response.SendError(c, 404, "Bookmark not found")
return
}

if err := r.deps.Database.DeleteBookmarks(c, bookmarkID); err != nil {
r.logger.WithError(err).Error("Error deleting bookmark")
response.SendInternalServerError(c)
return
}

response.Send(c, 200, "Bookmark deleted")
}

// updateCache godoc
//
// @Summary Update Cache and Ebook on server.
Expand Down
Loading