capytal/comicverse
1
0
Fork 0
Code Issues Pull Requests Activity

refactor(service,router): return ProjectPage struct instead of just image reader

Browse Source
This commit is contained in:
Guz
2025-03-28 16:39:32 -03:00
parent 8af80c702f
commit 5c873a2707
2 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
router/editor.go
View File

@@ -87,7 +87,7 @@ func (router *router) getPage(w http.ResponseWriter, r *http.Request) {
imgID := r.PathValue("PageID")
router.assert.NotZero(imgID, "This method should be used after the path values are checked")
img, err := router.service.GetPage(id, imgID)
page, err := router.service.GetPage(id, pageID)
if errors.Is(err, service.ErrPageNotExists) {
exception.NotFound(exception.WithError(err)).ServeHTTP(w, r)
return
@@ -97,10 +97,10 @@ func (router *router) getPage(w http.ResponseWriter, r *http.Request) {
return
}
if i, ok := img.(io.WriterTo); ok {
if i, ok := page.Image.(io.WriterTo); ok {
_, err = i.WriteTo(w)
} else {
_, err = io.Copy(w, img)
_, err = io.Copy(w, page.Image)
}
if err != nil {

35
service/editor.go
View File

@@ -5,6 +5,7 @@ import (
"fmt"
"io"
"net/http"
"slices"
"forge.capytal.company/capytalcode/project-comicverse/internals/randstr"
awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http"
@@ -21,7 +22,10 @@ type Project struct {
Pages []ProjectPage `json:"pages"`
}
type ProjectPage struct{}
type ProjectPage struct {
ID string `json:"id"`
Image io.ReadCloser `json:"-"`
}
func (s *Service) AddPage(projectID string, img io.Reader) error {
s.assert.NotNil(s.ctx)
@@ -56,14 +60,25 @@ func (s *Service) AddPage(projectID string, img io.Reader) error {
return err
}
func (s *Service) GetPage(projectID string, imgID string) (io.Reader, error) {
func (s *Service) GetPage(projectID string, pageID string) (ProjectPage, error) {
s.assert.NotNil(s.ctx)
s.assert.NotNil(s.s3)
s.assert.NotNil(s.bucket)
s.assert.NotZero(projectID)
s.assert.NotNil(imgID)
s.assert.NotNil(pageID)
k := fmt.Sprintf("%s/%s", projectID, imgID)
p, err := s.GetProject(projectID)
if err != nil {
return ProjectPage{}, errors.Join(errors.New("unable to get project"), err)
}
pageIndex := slices.IndexFunc(p.Pages, func(p ProjectPage) bool { return p.ID == pageID })
if pageIndex == -1 {
return ProjectPage{}, ErrPageNotExists
}
page := p.Pages[pageIndex]
k := fmt.Sprintf("%s/%s", projectID, pageID)
res, err := s.s3.GetObject(s.ctx, &s3.GetObjectInput{
Key: &k,
Bucket: &s.bucket,
@@ -71,13 +86,19 @@ func (s *Service) GetPage(projectID string, imgID string) (io.Reader, error) {
if err != nil {
var resErr *awshttp.ResponseError
if errors.As(err, &resErr) && resErr.ResponseError.HTTPStatusCode() == http.StatusNotFound {
return nil, errors.Join(ErrPageNotExists, resErr)
// TODO: This would probably be better in some background "maintenance" worker
p.Pages = slices.Delete(p.Pages, pageIndex, pageIndex)
_ = s.UpdateProject(projectID, p)
return ProjectPage{}, errors.Join(ErrPageNotExists, resErr)
}
return nil, err
return ProjectPage{}, err
}
s.assert.NotNil(res.Body)
return res.Body, nil
page.Image = res.Body
return page, nil
}
func (s *Service) DeletePage(projectID string, id string) error {