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

merch module enabled + fix

Browse source
This commit is contained in:
nquidox 2025-09-18 17:09:39 +03:00
parent 78a54cc4ac
commit 3ff0e6d641
5 changed files with 34 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cmd/main.go
View file

@ -5,6 +5,7 @@ import (
log "github.com/sirupsen/logrus"
"merch-parser-api/config"
_ "merch-parser-api/docs" //for swagger
"merch-parser-api/internal/api/merch"
"merch-parser-api/internal/api/user"
"merch-parser-api/internal/app"
"merch-parser-api/internal/interfaces"
@ -72,9 +73,15 @@ func main() {
ApiPrefix: c.AppConf.ApiPrefix,
})
merchModule := merch.NewHandler(merch.Deps{
DB: database,
Utils: utilsProvider,
})
//collect modules
modules := []interfaces.Module{
users,
merchModule,
}
//keep last

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

@ -70,10 +70,10 @@ func (co *controller) addMerch(c *gin.Context) {
// @Description Получить всю информацию про мерч по его uuid
// @Tags Merch
// @Security BearerAuth
// @Param uuid path string true "merch_uuid"
// @Success 200 {object} MerchDTO
// @Failure 400 {object} responses.ErrorResponse400
// @Failure 500 {object} responses.ErrorResponse500
// @Param uuid path string true "merch_uuid"
// @Success 200 {object} MerchDTO
// @Failure 400 {object} responses.ErrorResponse400
// @Failure 500 {object} responses.ErrorResponse500
// @Router /merch/{uuid} [get]
func (co *controller) getSingleMerch(c *gin.Context) {
merchUuid := c.Param("uuid")
@ -103,9 +103,9 @@ func (co *controller) getSingleMerch(c *gin.Context) {
// @Description Получить все записи мерча
// @Tags Merch
// @Security BearerAuth
// @Success 200 {array} ListResponse
// @Failure 400 {object} responses.ErrorResponse400
// @Failure 500 {object} responses.ErrorResponse500
// @Success 200 {array} ListResponse
// @Failure 400 {object} responses.ErrorResponse400
// @Failure 500 {object} responses.ErrorResponse500
// @Router /merch/{uuid} [get]
func (co *controller) getAllMerch(c *gin.Context) {
userUuid, err := co.utils.GetUserUuidFromContext(c)
@ -129,10 +129,10 @@ func (co *controller) getAllMerch(c *gin.Context) {
// @Description Обновить информацию про мерч по его uuid в json-е
// @Tags Merch
// @Security BearerAuth
// @Param body body MerchDTO true "merch_uuid"
// @Success 200 {object} MerchDTO
// @Failure 400 {object} responses.ErrorResponse400
// @Failure 500 {object} responses.ErrorResponse500
// @Param body body MerchDTO true "merch_uuid"
// @Success 200 {object} MerchDTO
// @Failure 400 {object} responses.ErrorResponse400
// @Failure 500 {object} responses.ErrorResponse500
// @Router /merch/{uuid} [put]
func (co *controller) updateMerch(c *gin.Context) {
var payload MerchDTO
@ -160,10 +160,10 @@ func (co *controller) updateMerch(c *gin.Context) {
// @Description Пометить мерч как удаленный по его uuid
// @Tags Merch
// @Security BearerAuth
// @Param uuid path string true "merch_uuid"
// @Success 200 {object} MerchDTO
// @Failure 400 {object} responses.ErrorResponse400
// @Failure 500 {object} responses.ErrorResponse500
// @Param uuid path string true "merch_uuid"
// @Success 200 {object} MerchDTO
// @Failure 400 {object} responses.ErrorResponse400
// @Failure 500 {object} responses.ErrorResponse500
// @Router /merch/{uuid} [delete]
func (co *controller) deleteMerch(c *gin.Context) {
merchUuid := c.Param("uuid")

6
internal/api/merch/dto.go
View file

@ -1,9 +1,9 @@
package merch
type merchBundle struct {
Merch Merch
Surugaya Surugaya
Mandarake Mandarake
Merch *Merch
Surugaya *Surugaya
Mandarake *Mandarake
}
type MerchDTO struct {
MerchUuid string `json:"merch_uuid"`

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

@ -28,15 +28,15 @@ type repository interface {
}
func (r *Repo) addMerch(bundle merchBundle) error {
if err := r.db.Create(bundle.Merch).Error; err != nil {
if err := r.db.Model(&Merch{}).Create(bundle.Merch).Error; err != nil {
return err
}
if err := r.db.Create(bundle.Surugaya).Error; err != nil {
if err := r.db.Model(&Surugaya{}).Create(bundle.Surugaya).Error; err != nil {
return err
}
if err := r.db.Create(bundle.Mandarake).Error; err != nil {
if err := r.db.Model(&Mandarake{}).Create(bundle.Mandarake).Error; err != nil {
return err
}
@ -44,7 +44,7 @@ func (r *Repo) addMerch(bundle merchBundle) error {
}
func (r *Repo) getSingleMerch(userUuid, merchUuid string) (merchBundle, error) {
var merch Merch
var merch *Merch
if err := r.db.
Where("user_uuid = ?", userUuid).
Where("merch_uuid = ?", merchUuid).
@ -53,14 +53,14 @@ func (r *Repo) getSingleMerch(userUuid, merchUuid string) (merchBundle, error) {
return merchBundle{}, err
}
var surugaya Surugaya
var surugaya *Surugaya
if err := r.db.
Where("merch_uuid = ?", merchUuid).
First(&surugaya).Error; err != nil {
return merchBundle{}, err
}
var mandarake Mandarake
var mandarake *Mandarake
if err := r.db.
Where("merch_uuid = ?", merchUuid).
First(&mandarake).Error; err != nil {

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

@ -21,7 +21,7 @@ func (s *service) addMerch(payload MerchDTO, userUuid string) error {
merchUuid := uuid.NewString()
bundle := merchBundle{
Merch{
&Merch{
CreatedAt: time.Time{},
UpdatedAt: sql.NullTime{Valid: false},
DeletedAt: sql.NullTime{Valid: false},
@ -30,14 +30,14 @@ func (s *service) addMerch(payload MerchDTO, userUuid string) error {
Name: payload.Name,
},
Surugaya{
&Surugaya{
DeletedAt: sql.NullTime{},
MerchUuid: merchUuid,
Link: payload.OriginSurugaya.Link,
CookieValues: payload.OriginSurugaya.CookieValues,
},
Mandarake{
&Mandarake{
DeletedAt: sql.NullTime{},
MerchUuid: merchUuid,
Link: payload.OriginMandarake.Link,