merch-tracker-v2/api
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

switch from pre-signed to public images
All checks were successful
/ Make image (push) Successful in 1m31s
Details

Browse source
This commit is contained in:
nquidox 2025-10-19 19:43:33 +03:00
parent 947220b65c
commit 3298602a23
6 changed files with 71 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/api/merch/controller.go
View file

@ -356,7 +356,7 @@ func (co *controller) getMerchImage(c *gin.Context) {
ctx, cancel := context.WithTimeout(c.Request.Context(), co.expires)
defer cancel()
link, err := co.service.getMerchImage(ctx, userUuid, merchUuid, typeQuery)
link, err := co.service.getPublicImageLink(ctx, userUuid, merchUuid, typeQuery)
if err != nil {
c.JSON(http.StatusInternalServerError, responses.ErrorResponse500{Error: err.Error()})
log.WithError(err).Error("Merch | Failed to get merch image")

12
internal/api/merch/helper.go
View file

@ -1,6 +1,7 @@
package merch
import (
"fmt"
"strconv"
"time"
)
@ -17,3 +18,14 @@ func getPeriod(days string) time.Time {
return time.Now().UTC().Add(-(time.Duration(daysInt) * time.Hour * 24))
}
func (s *service) makeObject(userUuid, merchUuid, imageType string) (string, error) {
switch imageType {
case "thumbnail":
return fmt.Sprintf("%s/merch/%s/thumbnail.jpg", userUuid, merchUuid), nil
case "full":
return fmt.Sprintf("%s/merch/%s/full.jpg", userUuid, merchUuid), nil
default:
return "", fmt.Errorf("unknown image type %s", imageType)
}
}

32
internal/api/merch/service.go
View file

@ -303,7 +303,24 @@ func (s *service) uploadMerchImage(ctx context.Context, userUuid, merchUuid, ima
return nil
}
func (s *service) getMerchImage(ctx context.Context, userUuid, merchUuid, imageType string) (ImageLink, error) {
func (s *service) getPublicImageLink(ctx context.Context, userUuid, merchUuid, imageType string) (ImageLink, error) {
object, err := s.makeObject(userUuid, merchUuid, imageType)
if err != nil {
return ImageLink{}, err
}
link, etag, err := s.media.GetPublicLink(ctx, s.bucketName, object)
if err != nil {
return ImageLink{}, err
}
return ImageLink{
Link: link,
ETag: etag,
}, nil
}
func (s *service) getPresignedImageLink(ctx context.Context, userUuid, merchUuid, imageType string) (ImageLink, error) {
exists, err := s.repo.merchRecordExists(userUuid, merchUuid)
if err != nil {
return ImageLink{}, err
@ -313,17 +330,12 @@ func (s *service) getMerchImage(ctx context.Context, userUuid, merchUuid, imageT
return ImageLink{}, fmt.Errorf("no merch found for user %s with uuid %s", userUuid, merchUuid)
}
var object string
switch imageType {
case "thumbnail":
object = fmt.Sprintf("%s/merch/%s/thumbnail.jpg", userUuid, merchUuid)
case "full":
object = fmt.Sprintf("%s/merch/%s/full.jpg", userUuid, merchUuid)
default:
return ImageLink{}, fmt.Errorf("unknown image type %s", imageType)
object, err := s.makeObject(userUuid, merchUuid, imageType)
if err != nil {
return ImageLink{}, err
}
link, err := s.media.Get(ctx, s.bucketName, object, s.expires, nil)
link, err := s.media.GetPresignedLink(ctx, s.bucketName, object, s.expires, nil)
if err != nil {
return ImageLink{}, err
}