docs/docs.go

@@ -15,6 +15,51 @@ const docTemplate = `{
     "host": "{{.Host}}",
     "basePath": "{{.BasePath}}",
     "paths": {
+        "/merch": {
+            "post": {
+                "security": [
+                    {
+                        "BearerAuth": []
+                    }
+                ],
+                "description": "Добавить новый мерч",
+                "consumes": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Merch"
+                ],
+                "summary": "Добавить новый мерч",
+                "parameters": [
+                    {
+                        "description": "новый мерч",
+                        "name": "body",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/merch.MerchDTO"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK"
+                    },
+                    "400": {
+                        "description": "Bad Request",
+                        "schema": {
+                            "$ref": "#/definitions/responses.ErrorResponse400"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/responses.ErrorResponse500"
+                        }
+                    }
+                }
+            }
+        },
         "/merch/": {
             "get": {
                 "security": [
@@ -96,49 +141,6 @@ const docTemplate = `{
                         }
                     }
                 }
-            },
-            "post": {
-                "security": [
-                    {
-                        "BearerAuth": []
-                    }
-                ],
-                "description": "Добавить новый мерч",
-                "consumes": [
-                    "application/json"
-                ],
-                "tags": [
-                    "Merch"
-                ],
-                "summary": "Добавить новый мерч",
-                "parameters": [
-                    {
-                        "description": "новый мерч",
-                        "name": "body",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/merch.MerchDTO"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    },
-                    "400": {
-                        "description": "Bad Request",
-                        "schema": {
-                            "$ref": "#/definitions/responses.ErrorResponse400"
-                        }
-                    },
-                    "500": {
-                        "description": "Internal Server Error",
-                        "schema": {
-                            "$ref": "#/definitions/responses.ErrorResponse500"
-                        }
-                    }
-                }
             }
         },
         "/merch/images/{uuid}": {
@@ -1220,14 +1222,6 @@ const docTemplate = `{
                 }
             }
         },
-        "merch.AmiamiDTO": {
-            "type": "object",
-            "properties": {
-                "link": {
-                    "type": "string"
-                }
-            }
-        },
         "merch.DeleteZeroPrices": {
             "type": "object",
             "properties": {
@@ -1332,9 +1326,6 @@ const docTemplate = `{
                 "name": {
                     "type": "string"
                 },
-                "origin_amiami": {
-                    "$ref": "#/definitions/merch.AmiamiDTO"
-                },
                 "origin_mandarake": {
                     "$ref": "#/definitions/merch.MandarakeDTO"
                 },
@@ -1346,7 +1337,7 @@ const docTemplate = `{
         "merch.OriginWithPrices": {
             "type": "object",
             "properties": {
-                "origins": {
+                "origin": {
                     "type": "integer"
                 },
                 "prices": {
@@ -1405,7 +1396,7 @@ const docTemplate = `{
                 "name": {
                     "type": "string"
                 },
-                "origins": {
+                "origin": {
                     "type": "string"
                 }
             }
@@ -1425,8 +1416,8 @@ const docTemplate = `{
                 "name": {
                     "type": "string"
                 },
-                "origins": {
+                "origin": {
-                    "type": "integer"
+                    "type": "string"
                 }
             }
         },

docs/swagger.json

@@ -7,6 +7,51 @@
     },
     "basePath": "/api/v2",
     "paths": {
+        "/merch": {
+            "post": {
+                "security": [
+                    {
+                        "BearerAuth": []
+                    }
+                ],
+                "description": "Добавить новый мерч",
+                "consumes": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Merch"
+                ],
+                "summary": "Добавить новый мерч",
+                "parameters": [
+                    {
+                        "description": "новый мерч",
+                        "name": "body",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/merch.MerchDTO"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK"
+                    },
+                    "400": {
+                        "description": "Bad Request",
+                        "schema": {
+                            "$ref": "#/definitions/responses.ErrorResponse400"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/responses.ErrorResponse500"
+                        }
+                    }
+                }
+            }
+        },
         "/merch/": {
             "get": {
                 "security": [
@@ -88,49 +133,6 @@
                         }
                     }
                 }
-            },
-            "post": {
-                "security": [
-                    {
-                        "BearerAuth": []
-                    }
-                ],
-                "description": "Добавить новый мерч",
-                "consumes": [
-                    "application/json"
-                ],
-                "tags": [
-                    "Merch"
-                ],
-                "summary": "Добавить новый мерч",
-                "parameters": [
-                    {
-                        "description": "новый мерч",
-                        "name": "body",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/merch.MerchDTO"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    },
-                    "400": {
-                        "description": "Bad Request",
-                        "schema": {
-                            "$ref": "#/definitions/responses.ErrorResponse400"
-                        }
-                    },
-                    "500": {
-                        "description": "Internal Server Error",
-                        "schema": {
-                            "$ref": "#/definitions/responses.ErrorResponse500"
-                        }
-                    }
-                }
             }
         },
         "/merch/images/{uuid}": {
@@ -1212,14 +1214,6 @@
                 }
             }
         },
-        "merch.AmiamiDTO": {
-            "type": "object",
-            "properties": {
-                "link": {
-                    "type": "string"
-                }
-            }
-        },
         "merch.DeleteZeroPrices": {
             "type": "object",
             "properties": {
@@ -1324,9 +1318,6 @@
                 "name": {
                     "type": "string"
                 },
-                "origin_amiami": {
-                    "$ref": "#/definitions/merch.AmiamiDTO"
-                },
                 "origin_mandarake": {
                     "$ref": "#/definitions/merch.MandarakeDTO"
                 },
@@ -1338,7 +1329,7 @@
         "merch.OriginWithPrices": {
             "type": "object",
             "properties": {
-                "origins": {
+                "origin": {
                     "type": "integer"
                 },
                 "prices": {
@@ -1397,7 +1388,7 @@
                 "name": {
                     "type": "string"
                 },
-                "origins": {
+                "origin": {
                     "type": "string"
                 }
             }
@@ -1417,8 +1408,8 @@
                 "name": {
                     "type": "string"
                 },
-                "origins": {
+                "origin": {
-                    "type": "integer"
+                    "type": "string"
                 }
             }
         },

docs/swagger.yaml

@@ -7,11 +7,6 @@ definitions:
       thumbnail:
         type: string
     type: object
-  merch.AmiamiDTO:
-    properties:
-      link:
-        type: string
-    type: object
   merch.DeleteZeroPrices:
     properties:
       id:
@@ -79,8 +74,6 @@ definitions:
         type: string
       name:
         type: string
-      origin_amiami:
-        $ref: '#/definitions/merch.AmiamiDTO'
       origin_mandarake:
         $ref: '#/definitions/merch.MandarakeDTO'
       origin_surugaya:
@@ -88,7 +81,7 @@ definitions:
     type: object
   merch.OriginWithPrices:
     properties:
-      origins:
+      origin:
         type: integer
       prices:
         items:
@@ -126,7 +119,7 @@ definitions:
         type: string
       name:
         type: string
-      origins:
+      origin:
         type: string
     type: object
   merch.ZeroPrice:
@@ -139,8 +132,8 @@ definitions:
         type: string
       name:
         type: string
-      origins:
+      origin:
-        type: integer
+        type: string
     type: object
   responses.ErrorResponse400:
     properties:
@@ -209,31 +202,7 @@ info:
   title: Merch Parser
   version: 2.0.0-alpha
 paths:
-  /merch/:
+  /merch:
-    get:
-      description: Получить все записи мерча
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            items:
-              $ref: '#/definitions/merch.ListResponse'
-            type: array
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/responses.ErrorResponse400'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/responses.ErrorResponse500'
-      security:
-      - BearerAuth: []
-      summary: Получить все записи мерча
-      tags:
-      - Merch
     post:
       consumes:
       - application/json
@@ -261,6 +230,31 @@ paths:
       summary: Добавить новый мерч
       tags:
       - Merch
+  /merch/:
+    get:
+      description: Получить все записи мерча
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            items:
+              $ref: '#/definitions/merch.ListResponse'
+            type: array
+        "400":
+          description: Bad Request
+          schema:
+            $ref: '#/definitions/responses.ErrorResponse400'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/responses.ErrorResponse500'
+      security:
+      - BearerAuth: []
+      summary: Получить все записи мерча
+      tags:
+      - Merch
     put:
       consumes:
       - application/json

internal/api/merch/controller.go

@@ -68,7 +68,7 @@ func (h *Handler) RegisterRoutes(r *gin.RouterGroup, authMW gin.HandlerFunc, ref
 // @Success		200
 // @Failure		400		{object}	responses.ErrorResponse400
 // @Failure		500		{object}	responses.ErrorResponse500
-// @Router			/merch/	[post]
+// @Router			/merch	[post]
 func (co *controller) addMerch(c *gin.Context) {
 	var payload MerchDTO
 	if err := c.ShouldBind(&payload); err != nil {
@@ -231,6 +231,10 @@ func (co *controller) deleteMerch(c *gin.Context) {
 // @Failure		400		{object}	responses.ErrorResponse400
 // @Failure		500		{object}	responses.ErrorResponse500
 // @Router			/prices	[get]
+//
+// @Failure		400		{object}	responses.ErrorResponse400
+// @Failure		500		{object}	responses.ErrorResponse500
+// @Router			/prices	[get]
 func (co *controller) getChartsPrices(c *gin.Context) {
 	daysQuery := strings.ToLower(c.DefaultQuery("days", ""))
 

internal/api/merch/dto.go

@@ -1,46 +1,32 @@
 package merch
 
-import (
+import "time"
-	"merch-parser-api/internal/api/merch/origins"
-	"time"
-)
 
 type merchBundle struct {
 	Merch     *Merch
-	Surugaya  *origins.OriginSurugaya
+	Surugaya  *Surugaya
-	Mandarake *origins.OriginMandarake
+	Mandarake *Mandarake
-	Amiami    *origins.OriginAmiami
 }
 type MerchDTO struct {
 	MerchUuid       string       `json:"merch_uuid"`
 	Name            string       `json:"name"`
 	OriginSurugaya  SurugayaDTO  `json:"origin_surugaya"`
 	OriginMandarake MandarakeDTO `json:"origin_mandarake"`
-	OriginAmiami    AmiamiDTO    `json:"origin_amiami"`
 	Labels          []string     `json:"labels,omitempty" gorm:"-"`
 }
 
-type OriginDTO struct {
-	Link string         `json:"link"`
-	Name origins.Origin `json:"name,omitempty"`
-}
-
 type SurugayaDTO struct {
-	OriginDTO
+	Link string `json:"link"`
 }
 
 type MandarakeDTO struct {
-	OriginDTO
+	Link string `json:"link"`
-}
-
-type AmiamiDTO struct {
-	OriginDTO
 }
 
 type SingleMerchResponse struct {
 	MerchUuid string `json:"merch_uuid"`
 	Name      string `json:"name"`
-	Origins   []OriginDTO `json:"origins"`
+	Origins   []any  `json:"origins"`
 }
 
 type ListResponse struct {
@@ -55,7 +41,7 @@ type PriceEntry struct {
 }
 
 type OriginWithPrices struct {
-	Origin origins.Origin `json:"origin"`
+	Origin Origin `json:"origin"`
 	Prices []PriceEntry
 }
 
@@ -100,7 +86,7 @@ type ZeroPrice struct {
 	CreatedAt time.Time `json:"created_at"`
 	MerchUuid string    `json:"merch_uuid"`
 	Name      string    `json:"name"`
-	Origin    origins.Origin `json:"origin"`
+	Origin    Origin    `json:"origin"`
 }
 
 type DeleteZeroPrices struct {

internal/api/merch/model.go

@@ -2,7 +2,6 @@ package merch
 
 import (
 	"database/sql"
-	"merch-parser-api/internal/api/merch/origins"
 	"time"
 )
 
@@ -20,6 +19,28 @@ func (Merch) TableName() string {
 	return "merch"
 }
 
+type Surugaya struct {
+	Id        uint         `gorm:"primary_key" json:"-"`
+	DeletedAt sql.NullTime `json:"-"`
+	MerchUuid string       `json:"-"`
+	Link      string       `json:"link"`
+}
+
+func (Surugaya) TableName() string {
+	return "origin_surugaya"
+}
+
+type Mandarake struct {
+	Id        uint         `gorm:"primary_key" json:"-"`
+	DeletedAt sql.NullTime `json:"-"`
+	MerchUuid string       `json:"-"`
+	Link      string       `json:"link"`
+}
+
+func (Mandarake) TableName() string {
+	return "origin_mandarake"
+}
+
 type Price struct {
 	Id        uint         `json:"id" gorm:"primary_key"`
 	CreatedAt time.Time    `json:"created_at" gorm:"column:created_at"`
@@ -27,7 +48,7 @@ type Price struct {
 	DeletedAt sql.NullTime `json:"deleted_at,omitempty" gorm:"column:deleted_at"`
 	MerchUuid string       `json:"merch_uuid" gorm:"column:merch_uuid"`
 	Price     int          `json:"price" gorm:"column:price"`
-	Origin    origins.Origin `json:"origin" gorm:"column:origin;type:integer"`
+	Origin    Origin       `json:"origin" gorm:"column:origin;type:integer"`
 }
 
 type Label struct {

internal/api/merch/origins.go

@@ -1,4 +1,4 @@
-package origins
+package merch
 
 import (
 	"database/sql/driver"
@@ -9,15 +9,13 @@ import (
 type Origin int
 
 const (
-	Surugaya = (iota + 1) * 1000
+	surugaya = (iota + 1) * 1000
-	Mandarake
+	mandarake
-	Amiami
 )
 
 var Origins = [...]string{
 	"surugaya",
 	"mandarake",
-	"amiami",
 }
 
 func (o Origin) String() string {
@@ -32,7 +30,7 @@ func (o Origin) MarshalJSON() ([]byte, error) {
 	return json.Marshal(o.String())
 }
 
-func ParseOrigin(s string) (Origin, bool) {
+func parseOrigin(s string) (Origin, bool) {
 	for i, name := range Origins {
 		if name == strings.ToLower(s) {
 			return Origin((i + 1) * 1000), true

internal/api/merch/origins/constructor.go

@@ -1,55 +0,0 @@
-package origins
-
-import "database/sql"
-
-func AllOriginModels() []interface{} {
-	return []interface{}{
-		&OriginSurugaya{},
-		&OriginMandarake{},
-		&OriginAmiami{},
-	}
-}
-
-func NewSurugaya(merchUuid, link string) *OriginSurugaya {
-	return &OriginSurugaya{
-		BaseOrigin{
-			DeletedAt: sql.NullTime{},
-			MerchUuid: merchUuid,
-			Link:      link,
-		},
-	}
-}
-
-func NewMandarake(merchUuid, link string) *OriginMandarake {
-	return &OriginMandarake{
-		BaseOrigin{
-			DeletedAt: sql.NullTime{},
-			MerchUuid: merchUuid,
-			Link:      link,
-		},
-	}
-}
-
-func NewAmiami(merchUuid, link string) *OriginAmiami {
-	return &OriginAmiami{
-		BaseOrigin{
-			DeletedAt: sql.NullTime{},
-			MerchUuid: merchUuid,
-			Link:      link,
-		},
-	}
-}
-
-type OriginFactory func(merchUuid, link string) interface{}
-
-var OriginFactories = map[string]OriginFactory{
-	"surugaya": func(merchUuid, link string) interface{} {
-		return &OriginSurugaya{BaseOrigin: BaseOrigin{MerchUuid: merchUuid, Link: link}}
-	},
-	"mandarake": func(merchUuid, link string) interface{} {
-		return &OriginMandarake{BaseOrigin: BaseOrigin{MerchUuid: merchUuid, Link: link}}
-	},
-	"amiami": func(merchUuid, link string) interface{} {
-		return &OriginAmiami{BaseOrigin: BaseOrigin{MerchUuid: merchUuid, Link: link}}
-	},
-}

internal/api/merch/origins/model.go

@@ -1,34 +0,0 @@
-package origins
-
-import "database/sql"
-
-type BaseOrigin struct {
-	Id        uint         `gorm:"primary_key" json:"-"`
-	DeletedAt sql.NullTime `json:"-"`
-	MerchUuid string       `json:"-"`
-	Link      string       `json:"link"`
-}
-
-type OriginSurugaya struct {
-	BaseOrigin
-}
-
-func (OriginSurugaya) TableName() string {
-	return "origin_surugaya"
-}
-
-type OriginMandarake struct {
-	BaseOrigin
-}
-
-func (OriginMandarake) TableName() string {
-	return "origin_mandarake"
-}
-
-type OriginAmiami struct {
-	BaseOrigin
-}
-
-func (OriginAmiami) TableName() string {
-	return "origin_amiami"
-}

internal/api/merch/provider.go

@@ -4,14 +4,13 @@ import (
 	"database/sql"
 	log "github.com/sirupsen/logrus"
 	"gorm.io/gorm"
-	"merch-parser-api/internal/api/merch/origins"
 	"merch-parser-api/internal/shared"
 	"time"
 )
 
 type Link struct {
-	Surugaya  []origins.OriginSurugaya
+	Surugaya  []Surugaya
-	Mandarake []origins.OriginMandarake
+	Mandarake []Mandarake
 }
 
 type TaskProvider struct {
@@ -85,7 +84,7 @@ func (p *TaskProvider) InsertPrices(prices []shared.TaskResult) error {
 
 	var insertPrices []Price
 	for _, item := range prices {
-		origin, ok := origins.ParseOrigin(item.Origin)
+		origin, ok := parseOrigin(item.Origin)
 		if !ok {
 			continue
 		}
@@ -108,13 +107,13 @@ func (p *TaskProvider) InsertPrices(prices []shared.TaskResult) error {
 }
 
 func (r *TaskRepo) getLinks() (*Link, error) {
-	var surugayaList []origins.OriginSurugaya
+	var surugayaList []Surugaya
-	if err := r.db.Model(&origins.OriginSurugaya{}).Where("deleted_at IS NULL").Find(&surugayaList).Error; err != nil {
+	if err := r.db.Model(&Surugaya{}).Where("deleted_at IS NULL").Find(&surugayaList).Error; err != nil {
 		return nil, err
 	}
 
-	var mandarakeList []origins.OriginMandarake
+	var mandarakeList []Mandarake
-	if err := r.db.Model(&origins.OriginMandarake{}).Where("deleted_at IS NULL").Find(&mandarakeList).Error; err != nil {
+	if err := r.db.Model(&Mandarake{}).Where("deleted_at IS NULL").Find(&mandarakeList).Error; err != nil {
 		return nil, err
 	}
 

internal/api/merch/repository.go

@@ -3,10 +3,8 @@ package merch
 import (
 	"database/sql"
 	"errors"
-	"fmt"
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
-	"merch-parser-api/internal/api/merch/origins"
 	"time"
 )
 
@@ -63,15 +61,11 @@ func (r *Repo) addMerch(bundle merchBundle) error {
 		return err
 	}
 
-	if err := r.db.Model(&origins.OriginSurugaya{}).Create(bundle.Surugaya).Error; err != nil {
+	if err := r.db.Model(&Surugaya{}).Create(bundle.Surugaya).Error; err != nil {
 		return err
 	}
 
-	if err := r.db.Model(&origins.OriginMandarake{}).Create(bundle.Mandarake).Error; err != nil {
+	if err := r.db.Model(&Mandarake{}).Create(bundle.Mandarake).Error; err != nil {
-		return err
-	}
-
-	if err := r.db.Model(&origins.OriginAmiami{}).Create(bundle.Amiami).Error; err != nil {
 		return err
 	}
 
@@ -118,7 +112,7 @@ func (r *Repo) getSingleMerch(userUuid, merchUuid string) (merchBundle, error) {
 		return merchBundle{}, err
 	}
 
-	var surugaya origins.OriginSurugaya
+	var surugaya Surugaya
 	if err := r.db.
 		Where("merch_uuid = ?", merchUuid).
 		First(&surugaya).Error; err != nil {
@@ -127,7 +121,7 @@ func (r *Repo) getSingleMerch(userUuid, merchUuid string) (merchBundle, error) {
 		}
 	}
 
-	var mandarake origins.OriginMandarake
+	var mandarake Mandarake
 	if err := r.db.
 		Where("merch_uuid = ?", merchUuid).
 		First(&mandarake).Error; err != nil {
@@ -136,20 +130,10 @@ func (r *Repo) getSingleMerch(userUuid, merchUuid string) (merchBundle, error) {
 		}
 	}
 
-	var amiami origins.OriginAmiami
-	if err := r.db.
-		Where("merch_uuid = ?", merchUuid).
-		First(&amiami).Error; err != nil {
-		if !errors.Is(err, gorm.ErrRecordNotFound) {
-			return merchBundle{}, err
-		}
-	}
-
 	return merchBundle{
 		Merch:     &merch,
 		Surugaya:  &surugaya,
 		Mandarake: &mandarake,
-		Amiami:    &amiami,
 	}, nil
 }
 
@@ -180,13 +164,22 @@ func (r *Repo) updateMerch(payload UpdateMerchDTO, userUuid string) error {
 		return err
 	}
 
-	if factory, ok := origins.OriginFactories[payload.Origin]; ok {
+	switch payload.Origin {
-		model := factory(payload.MerchUuid, payload.Link)
+	case "surugaya":
-		if err := r.upsertOrigin(model); err != nil {
+		if err := r.upsertOrigin(&Surugaya{
+			MerchUuid: payload.MerchUuid,
+			Link:      payload.Link,
+		}); err != nil {
+			return err
+		}
+
+	case "mandarake":
+		if err := r.upsertOrigin(&Mandarake{
+			MerchUuid: payload.MerchUuid,
+			Link:      payload.Link,
+		}); err != nil {
 			return err
 		}
-	} else if payload.Origin != "" {
-		return fmt.Errorf("unsupported origin: %s", payload.Origin)
 	}
 
 	return nil
@@ -203,15 +196,18 @@ func (r *Repo) deleteMerch(userUuid, merchUuid string) error {
 		return err
 	}
 
-	ors := origins.AllOriginModels()
-
-	for _, origin := range ors {
 	if err := r.db.
-			Model(origin).
+		Model(&Surugaya{}).
 		Where("merch_uuid = ?", merchUuid).
 		Update("deleted_at", now).Error; err != nil {
 		return err
 	}
+
+	if err := r.db.
+		Model(&Mandarake{}).
+		Where("merch_uuid = ?", merchUuid).
+		Update("deleted_at", now).Error; err != nil {
+		return err
 	}
 
 	return nil
@@ -342,9 +338,9 @@ func (r *Repo) getZeroPrices(userUuid string) ([]ZeroPrice, error) {
 	if err := r.db.Raw(`
         WITH price_with_neighbors AS (
             SELECT
-				p.id, p.created_at, p.merch_uuid, p.price, p.origins, m.name,
+				p.id, p.created_at, p.merch_uuid, p.price, p.origin, m.name,
-				LAG(price) OVER (PARTITION BY p.merch_uuid, p.origins ORDER BY p.created_at, p.id) AS prev_price,
+				LAG(price) OVER (PARTITION BY p.merch_uuid ORDER BY p.created_at, p.id) AS prev_price,
-				LEAD(price) OVER (PARTITION BY p.merch_uuid, p.origins ORDER BY p.created_at, p.id) AS next_price
+				LEAD(price) OVER (PARTITION BY p.merch_uuid ORDER BY p.created_at, p.id) AS next_price
 			FROM prices AS p
 			JOIN merch as m ON m.merch_uuid = p.merch_uuid
 			WHERE p.deleted_at IS NULL
@@ -352,7 +348,7 @@ func (r *Repo) getZeroPrices(userUuid string) ([]ZeroPrice, error) {
 			AND m.user_uuid = ?)
 
 		SELECT
-			id, created_at, merch_uuid, origins, name
+			id, created_at, merch_uuid, origin, name
 		FROM price_with_neighbors
 		WHERE
 			price = 0

internal/api/merch/service.go

@@ -12,7 +12,6 @@ import (
 	"image"
 	"image/jpeg"
 	"io"
-	"merch-parser-api/internal/api/merch/origins"
 	"merch-parser-api/internal/interfaces"
 	is "merch-parser-api/proto/imageStorage"
 	"mime/multipart"
@@ -59,7 +58,7 @@ func (s *service) addMerch(payload MerchDTO, userUuid string) error {
 	merchUuid := uuid.NewString()
 
 	bundle := merchBundle{
-		Merch: &Merch{
+		&Merch{
 			CreatedAt: time.Time{},
 			UpdatedAt: sql.NullTime{Valid: false},
 			DeletedAt: sql.NullTime{Valid: false},
@@ -68,40 +67,36 @@ func (s *service) addMerch(payload MerchDTO, userUuid string) error {
 			Name:      payload.Name,
 		},
 
-		Surugaya:  origins.NewSurugaya(merchUuid, payload.OriginSurugaya.Link),
+		&Surugaya{
-		Mandarake: origins.NewMandarake(merchUuid, payload.OriginMandarake.Link),
+			DeletedAt: sql.NullTime{},
-		Amiami:    origins.NewAmiami(merchUuid, payload.OriginAmiami.Link),
+			MerchUuid: merchUuid,
+			Link:      payload.OriginSurugaya.Link,
+		},
+
+		&Mandarake{
+			DeletedAt: sql.NullTime{},
+			MerchUuid: merchUuid,
+			Link:      payload.OriginMandarake.Link,
+		},
 	}
 	return s.repo.addMerch(bundle)
 }
 
-func (s *service) getSingleMerch(userUuid, merchUuid string) (SingleMerchResponse, error) {
+func (s *service) getSingleMerch(userUuid, merchUuid string) (MerchDTO, error) {
 	bundle, err := s.repo.getSingleMerch(userUuid, merchUuid)
 	if err != nil {
-		return SingleMerchResponse{}, err
+		return MerchDTO{}, err
 	}
 
-	var originsSlice []OriginDTO
+	return MerchDTO{
-
-	originsSlice = append(originsSlice, OriginDTO{
-		Link: bundle.Surugaya.Link,
-		Name: origins.Surugaya,
-	})
-
-	originsSlice = append(originsSlice, OriginDTO{
-		Link: bundle.Mandarake.Link,
-		Name: origins.Mandarake,
-	})
-
-	originsSlice = append(originsSlice, OriginDTO{
-		Link: bundle.Amiami.Link,
-		Name: origins.Amiami,
-	})
-
-	return SingleMerchResponse{
 		MerchUuid: bundle.Merch.MerchUuid,
 		Name:      bundle.Merch.Name,
-		Origins:   originsSlice,
+		OriginSurugaya: SurugayaDTO{
+			Link: bundle.Surugaya.Link,
+		},
+		OriginMandarake: MandarakeDTO{
+			Link: bundle.Mandarake.Link,
+		},
 	}, nil
 }
 
@@ -142,7 +137,7 @@ func (s *service) updateMerch(payload UpdateMerchDTO, userUuid string) error {
 	}
 
 	if payload.Origin == "" {
-		return errors.New("no origins provided")
+		return errors.New("no origin provided")
 	}
 
 	return s.repo.updateMerch(payload, userUuid)
@@ -183,10 +178,10 @@ func (s *service) getPrices(userUuid string, days string) ([]PricesResponse, err
 		return nil, err
 	}
 
-	pricesMap := make(map[string]map[origins.Origin][]PriceEntry)
+	pricesMap := make(map[string]map[Origin][]PriceEntry)
 	for _, item := range pricesList {
 		if _, ok := pricesMap[item.MerchUuid]; !ok {
-			pricesMap[item.MerchUuid] = make(map[origins.Origin][]PriceEntry)
+			pricesMap[item.MerchUuid] = make(map[Origin][]PriceEntry)
 		}
 
 		pricesMap[item.MerchUuid][item.Origin] = append(pricesMap[item.MerchUuid][item.Origin], PriceEntry{
@@ -197,22 +192,16 @@ func (s *service) getPrices(userUuid string, days string) ([]PricesResponse, err
 
 	for i := range response {
 		originSurugaya := OriginWithPrices{
-			Origin: origins.Surugaya,
+			Origin: surugaya,
-			Prices: pricesMap[response[i].MerchUuid][origins.Surugaya],
+			Prices: pricesMap[response[i].MerchUuid][surugaya],
 		}
 		response[i].Origins = append(response[i].Origins, originSurugaya)
 
 		originMandarake := OriginWithPrices{
-			Origin: origins.Mandarake,
+			Origin: mandarake,
-			Prices: pricesMap[response[i].MerchUuid][origins.Mandarake],
+			Prices: pricesMap[response[i].MerchUuid][mandarake],
 		}
 		response[i].Origins = append(response[i].Origins, originMandarake)
-
-		originAmiami := OriginWithPrices{
-			Origin: origins.Amiami,
-			Prices: pricesMap[response[i].MerchUuid][origins.Amiami],
-		}
-		response[i].Origins = append(response[i].Origins, originAmiami)
 	}
 
 	return response, nil
@@ -229,37 +218,27 @@ func (s *service) getDistinctPrices(userUuid, merchUuid, days string) (PricesRes
 	}
 
 	originSurugaya := OriginWithPrices{
-		Origin: origins.Surugaya,
+		Origin: surugaya,
 		Prices: []PriceEntry{},
 	}
 
 	originMandarake := OriginWithPrices{
-		Origin: origins.Mandarake,
+		Origin: mandarake,
-		Prices: []PriceEntry{},
-	}
-
-	originAmiami := OriginWithPrices{
-		Origin: origins.Amiami,
 		Prices: []PriceEntry{},
 	}
 
 	for _, item := range result {
 		switch item.Origin {
-		case origins.Surugaya:
+		case surugaya:
 			originSurugaya.Prices = append(originSurugaya.Prices, PriceEntry{
 				CreatedAt: item.CreatedAt.Unix(),
 				Value:     item.Price,
 			})
-		case origins.Mandarake:
+		case mandarake:
 			originMandarake.Prices = append(originMandarake.Prices, PriceEntry{
 				CreatedAt: item.CreatedAt.Unix(),
 				Value:     item.Price,
 			})
-		case origins.Amiami:
-			originAmiami.Prices = append(originAmiami.Prices, PriceEntry{
-				CreatedAt: item.CreatedAt.Unix(),
-				Value:     item.Price,
-			})
 		}
 	}
 

migrations.sql

@@ -46,13 +46,6 @@ CREATE TABLE origin_mandarake(
     link TEXT
 );
 
-CREATE TABLE origin_amiami(
-    id BIGSERIAL PRIMARY KEY,
-    deleted_at TIMESTAMP WITH TIME ZONE NULL,
-    merch_uuid VARCHAR(36) NOT NULL UNIQUE,
-    link TEXT
-);
-
 
 CREATE TABLE prices(
     id BIGSERIAL PRIMARY KEY,