Compare commits
No commits in common. "main" and "v0.1.23" have entirely different histories.
15 changed files with 278 additions and 620 deletions
154
docs/docs.go
154
docs/docs.go
|
|
@ -15,6 +15,51 @@ const docTemplate = `{
|
||||||
"host": "{{.Host}}",
|
"host": "{{.Host}}",
|
||||||
"basePath": "{{.BasePath}}",
|
"basePath": "{{.BasePath}}",
|
||||||
"paths": {
|
"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/": {
|
"/merch/": {
|
||||||
"get": {
|
"get": {
|
||||||
"security": [
|
"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}": {
|
"/merch/images/{uuid}": {
|
||||||
|
|
@ -673,53 +675,6 @@ const docTemplate = `{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"/merch/zeroprices/period": {
|
|
||||||
"delete": {
|
|
||||||
"security": [
|
|
||||||
{
|
|
||||||
"BearerAuth": []
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"description": "Пометить нулевые цены как удаленные за указанный период",
|
|
||||||
"tags": [
|
|
||||||
"Merch zero prices"
|
|
||||||
],
|
|
||||||
"summary": "Пометить нулевые цены как удаленные за указанный период",
|
|
||||||
"parameters": [
|
|
||||||
{
|
|
||||||
"type": "string",
|
|
||||||
"description": "start",
|
|
||||||
"name": "start",
|
|
||||||
"in": "query",
|
|
||||||
"required": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "string",
|
|
||||||
"description": "end",
|
|
||||||
"name": "end",
|
|
||||||
"in": "query",
|
|
||||||
"required": true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"responses": {
|
|
||||||
"200": {
|
|
||||||
"description": "OK"
|
|
||||||
},
|
|
||||||
"400": {
|
|
||||||
"description": "Bad Request",
|
|
||||||
"schema": {
|
|
||||||
"$ref": "#/definitions/responses.ErrorResponse400"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"500": {
|
|
||||||
"description": "Internal Server Error",
|
|
||||||
"schema": {
|
|
||||||
"$ref": "#/definitions/responses.ErrorResponse500"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"/merch/{uuid}": {
|
"/merch/{uuid}": {
|
||||||
"get": {
|
"get": {
|
||||||
"security": [
|
"security": [
|
||||||
|
|
@ -1220,14 +1175,6 @@ const docTemplate = `{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"merch.AmiamiDTO": {
|
|
||||||
"type": "object",
|
|
||||||
"properties": {
|
|
||||||
"link": {
|
|
||||||
"type": "string"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"merch.DeleteZeroPrices": {
|
"merch.DeleteZeroPrices": {
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"properties": {
|
"properties": {
|
||||||
|
|
@ -1332,9 +1279,6 @@ const docTemplate = `{
|
||||||
"name": {
|
"name": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
"origin_amiami": {
|
|
||||||
"$ref": "#/definitions/merch.AmiamiDTO"
|
|
||||||
},
|
|
||||||
"origin_mandarake": {
|
"origin_mandarake": {
|
||||||
"$ref": "#/definitions/merch.MandarakeDTO"
|
"$ref": "#/definitions/merch.MandarakeDTO"
|
||||||
},
|
},
|
||||||
|
|
@ -1346,7 +1290,7 @@ const docTemplate = `{
|
||||||
"merch.OriginWithPrices": {
|
"merch.OriginWithPrices": {
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"properties": {
|
"properties": {
|
||||||
"origins": {
|
"origin": {
|
||||||
"type": "integer"
|
"type": "integer"
|
||||||
},
|
},
|
||||||
"prices": {
|
"prices": {
|
||||||
|
|
@ -1405,7 +1349,7 @@ const docTemplate = `{
|
||||||
"name": {
|
"name": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
"origins": {
|
"origin": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1425,8 +1369,8 @@ const docTemplate = `{
|
||||||
"name": {
|
"name": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
"origins": {
|
"origin": {
|
||||||
"type": "integer"
|
"type": "string"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,51 @@
|
||||||
},
|
},
|
||||||
"basePath": "/api/v2",
|
"basePath": "/api/v2",
|
||||||
"paths": {
|
"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/": {
|
"/merch/": {
|
||||||
"get": {
|
"get": {
|
||||||
"security": [
|
"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}": {
|
"/merch/images/{uuid}": {
|
||||||
|
|
@ -665,53 +667,6 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"/merch/zeroprices/period": {
|
|
||||||
"delete": {
|
|
||||||
"security": [
|
|
||||||
{
|
|
||||||
"BearerAuth": []
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"description": "Пометить нулевые цены как удаленные за указанный период",
|
|
||||||
"tags": [
|
|
||||||
"Merch zero prices"
|
|
||||||
],
|
|
||||||
"summary": "Пометить нулевые цены как удаленные за указанный период",
|
|
||||||
"parameters": [
|
|
||||||
{
|
|
||||||
"type": "string",
|
|
||||||
"description": "start",
|
|
||||||
"name": "start",
|
|
||||||
"in": "query",
|
|
||||||
"required": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "string",
|
|
||||||
"description": "end",
|
|
||||||
"name": "end",
|
|
||||||
"in": "query",
|
|
||||||
"required": true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"responses": {
|
|
||||||
"200": {
|
|
||||||
"description": "OK"
|
|
||||||
},
|
|
||||||
"400": {
|
|
||||||
"description": "Bad Request",
|
|
||||||
"schema": {
|
|
||||||
"$ref": "#/definitions/responses.ErrorResponse400"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"500": {
|
|
||||||
"description": "Internal Server Error",
|
|
||||||
"schema": {
|
|
||||||
"$ref": "#/definitions/responses.ErrorResponse500"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"/merch/{uuid}": {
|
"/merch/{uuid}": {
|
||||||
"get": {
|
"get": {
|
||||||
"security": [
|
"security": [
|
||||||
|
|
@ -1212,14 +1167,6 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"merch.AmiamiDTO": {
|
|
||||||
"type": "object",
|
|
||||||
"properties": {
|
|
||||||
"link": {
|
|
||||||
"type": "string"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"merch.DeleteZeroPrices": {
|
"merch.DeleteZeroPrices": {
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"properties": {
|
"properties": {
|
||||||
|
|
@ -1324,9 +1271,6 @@
|
||||||
"name": {
|
"name": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
"origin_amiami": {
|
|
||||||
"$ref": "#/definitions/merch.AmiamiDTO"
|
|
||||||
},
|
|
||||||
"origin_mandarake": {
|
"origin_mandarake": {
|
||||||
"$ref": "#/definitions/merch.MandarakeDTO"
|
"$ref": "#/definitions/merch.MandarakeDTO"
|
||||||
},
|
},
|
||||||
|
|
@ -1338,7 +1282,7 @@
|
||||||
"merch.OriginWithPrices": {
|
"merch.OriginWithPrices": {
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"properties": {
|
"properties": {
|
||||||
"origins": {
|
"origin": {
|
||||||
"type": "integer"
|
"type": "integer"
|
||||||
},
|
},
|
||||||
"prices": {
|
"prices": {
|
||||||
|
|
@ -1397,7 +1341,7 @@
|
||||||
"name": {
|
"name": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
"origins": {
|
"origin": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1417,8 +1361,8 @@
|
||||||
"name": {
|
"name": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
"origins": {
|
"origin": {
|
||||||
"type": "integer"
|
"type": "string"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -7,11 +7,6 @@ definitions:
|
||||||
thumbnail:
|
thumbnail:
|
||||||
type: string
|
type: string
|
||||||
type: object
|
type: object
|
||||||
merch.AmiamiDTO:
|
|
||||||
properties:
|
|
||||||
link:
|
|
||||||
type: string
|
|
||||||
type: object
|
|
||||||
merch.DeleteZeroPrices:
|
merch.DeleteZeroPrices:
|
||||||
properties:
|
properties:
|
||||||
id:
|
id:
|
||||||
|
|
@ -79,8 +74,6 @@ definitions:
|
||||||
type: string
|
type: string
|
||||||
name:
|
name:
|
||||||
type: string
|
type: string
|
||||||
origin_amiami:
|
|
||||||
$ref: '#/definitions/merch.AmiamiDTO'
|
|
||||||
origin_mandarake:
|
origin_mandarake:
|
||||||
$ref: '#/definitions/merch.MandarakeDTO'
|
$ref: '#/definitions/merch.MandarakeDTO'
|
||||||
origin_surugaya:
|
origin_surugaya:
|
||||||
|
|
@ -88,7 +81,7 @@ definitions:
|
||||||
type: object
|
type: object
|
||||||
merch.OriginWithPrices:
|
merch.OriginWithPrices:
|
||||||
properties:
|
properties:
|
||||||
origins:
|
origin:
|
||||||
type: integer
|
type: integer
|
||||||
prices:
|
prices:
|
||||||
items:
|
items:
|
||||||
|
|
@ -126,7 +119,7 @@ definitions:
|
||||||
type: string
|
type: string
|
||||||
name:
|
name:
|
||||||
type: string
|
type: string
|
||||||
origins:
|
origin:
|
||||||
type: string
|
type: string
|
||||||
type: object
|
type: object
|
||||||
merch.ZeroPrice:
|
merch.ZeroPrice:
|
||||||
|
|
@ -139,8 +132,8 @@ definitions:
|
||||||
type: string
|
type: string
|
||||||
name:
|
name:
|
||||||
type: string
|
type: string
|
||||||
origins:
|
origin:
|
||||||
type: integer
|
type: string
|
||||||
type: object
|
type: object
|
||||||
responses.ErrorResponse400:
|
responses.ErrorResponse400:
|
||||||
properties:
|
properties:
|
||||||
|
|
@ -209,31 +202,7 @@ info:
|
||||||
title: Merch Parser
|
title: Merch Parser
|
||||||
version: 2.0.0-alpha
|
version: 2.0.0-alpha
|
||||||
paths:
|
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:
|
post:
|
||||||
consumes:
|
consumes:
|
||||||
- application/json
|
- application/json
|
||||||
|
|
@ -261,6 +230,31 @@ paths:
|
||||||
summary: Добавить новый мерч
|
summary: Добавить новый мерч
|
||||||
tags:
|
tags:
|
||||||
- Merch
|
- 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:
|
put:
|
||||||
consumes:
|
consumes:
|
||||||
- application/json
|
- application/json
|
||||||
|
|
@ -680,36 +674,6 @@ paths:
|
||||||
summary: Получить нулевые цены
|
summary: Получить нулевые цены
|
||||||
tags:
|
tags:
|
||||||
- Merch zero prices
|
- Merch zero prices
|
||||||
/merch/zeroprices/period:
|
|
||||||
delete:
|
|
||||||
description: Пометить нулевые цены как удаленные за указанный период
|
|
||||||
parameters:
|
|
||||||
- description: start
|
|
||||||
in: query
|
|
||||||
name: start
|
|
||||||
required: true
|
|
||||||
type: string
|
|
||||||
- description: end
|
|
||||||
in: query
|
|
||||||
name: end
|
|
||||||
required: true
|
|
||||||
type: string
|
|
||||||
responses:
|
|
||||||
"200":
|
|
||||||
description: OK
|
|
||||||
"400":
|
|
||||||
description: Bad Request
|
|
||||||
schema:
|
|
||||||
$ref: '#/definitions/responses.ErrorResponse400'
|
|
||||||
"500":
|
|
||||||
description: Internal Server Error
|
|
||||||
schema:
|
|
||||||
$ref: '#/definitions/responses.ErrorResponse500'
|
|
||||||
security:
|
|
||||||
- BearerAuth: []
|
|
||||||
summary: Пометить нулевые цены как удаленные за указанный период
|
|
||||||
tags:
|
|
||||||
- Merch zero prices
|
|
||||||
/prices:
|
/prices:
|
||||||
get:
|
get:
|
||||||
description: Получить цены мерча за период
|
description: Получить цены мерча за период
|
||||||
|
|
|
||||||
|
|
@ -54,9 +54,6 @@ func (h *Handler) RegisterRoutes(r *gin.RouterGroup, authMW gin.HandlerFunc, ref
|
||||||
zeroPricesGroup := merchGroup.Group("/zeroprices", authMW)
|
zeroPricesGroup := merchGroup.Group("/zeroprices", authMW)
|
||||||
zeroPricesGroup.GET("", h.controller.getZeroPrices)
|
zeroPricesGroup.GET("", h.controller.getZeroPrices)
|
||||||
zeroPricesGroup.DELETE("", h.controller.deleteZeroPrices)
|
zeroPricesGroup.DELETE("", h.controller.deleteZeroPrices)
|
||||||
|
|
||||||
zeroPricesGroup.DELETE("/period", h.controller.deleteZeroPricesPeriod)
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// @Summary Добавить новый мерч
|
// @Summary Добавить новый мерч
|
||||||
|
|
@ -68,7 +65,7 @@ func (h *Handler) RegisterRoutes(r *gin.RouterGroup, authMW gin.HandlerFunc, ref
|
||||||
// @Success 200
|
// @Success 200
|
||||||
// @Failure 400 {object} responses.ErrorResponse400
|
// @Failure 400 {object} responses.ErrorResponse400
|
||||||
// @Failure 500 {object} responses.ErrorResponse500
|
// @Failure 500 {object} responses.ErrorResponse500
|
||||||
// @Router /merch/ [post]
|
// @Router /merch [post]
|
||||||
func (co *controller) addMerch(c *gin.Context) {
|
func (co *controller) addMerch(c *gin.Context) {
|
||||||
var payload MerchDTO
|
var payload MerchDTO
|
||||||
if err := c.ShouldBind(&payload); err != nil {
|
if err := c.ShouldBind(&payload); err != nil {
|
||||||
|
|
@ -231,6 +228,10 @@ func (co *controller) deleteMerch(c *gin.Context) {
|
||||||
// @Failure 400 {object} responses.ErrorResponse400
|
// @Failure 400 {object} responses.ErrorResponse400
|
||||||
// @Failure 500 {object} responses.ErrorResponse500
|
// @Failure 500 {object} responses.ErrorResponse500
|
||||||
// @Router /prices [get]
|
// @Router /prices [get]
|
||||||
|
//
|
||||||
|
// @Failure 400 {object} responses.ErrorResponse400
|
||||||
|
// @Failure 500 {object} responses.ErrorResponse500
|
||||||
|
// @Router /prices [get]
|
||||||
func (co *controller) getChartsPrices(c *gin.Context) {
|
func (co *controller) getChartsPrices(c *gin.Context) {
|
||||||
daysQuery := strings.ToLower(c.DefaultQuery("days", ""))
|
daysQuery := strings.ToLower(c.DefaultQuery("days", ""))
|
||||||
|
|
||||||
|
|
@ -748,45 +749,3 @@ func (co *controller) deleteZeroPrices(c *gin.Context) {
|
||||||
}
|
}
|
||||||
c.Status(http.StatusOK)
|
c.Status(http.StatusOK)
|
||||||
}
|
}
|
||||||
|
|
||||||
// @Summary Пометить нулевые цены как удаленные за указанный период
|
|
||||||
// @Description Пометить нулевые цены как удаленные за указанный период
|
|
||||||
// @Tags Merch zero prices
|
|
||||||
// @Security BearerAuth
|
|
||||||
// @Param start query string true "start"
|
|
||||||
// @Param end query string true "end"
|
|
||||||
// @Success 200
|
|
||||||
// @Failure 400 {object} responses.ErrorResponse400
|
|
||||||
// @Failure 500 {object} responses.ErrorResponse500
|
|
||||||
// @Router /merch/zeroprices/period [delete]
|
|
||||||
func (co *controller) deleteZeroPricesPeriod(c *gin.Context) {
|
|
||||||
const logMsg = "Merch | Delete zero prices period"
|
|
||||||
|
|
||||||
userUuid, err := co.utils.GetUserUuidFromContext(c)
|
|
||||||
if err != nil {
|
|
||||||
c.JSON(http.StatusInternalServerError, responses.ErrorResponse500{Error: err.Error()})
|
|
||||||
log.WithError(err).Error(logMsg)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
start, err := co.utils.ParseTime(c.Query("start"))
|
|
||||||
if err != nil {
|
|
||||||
c.JSON(http.StatusBadRequest, responses.ErrorResponse400{Error: err.Error()})
|
|
||||||
log.WithError(err).Error(logMsg)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
end, err := co.utils.ParseTime(c.Query("end"))
|
|
||||||
if err != nil {
|
|
||||||
c.JSON(http.StatusBadRequest, responses.ErrorResponse400{Error: err.Error()})
|
|
||||||
log.WithError(err).Error(logMsg)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if err = co.service.deleteZeroPricesPeriod(userUuid, start, end); err != nil {
|
|
||||||
c.JSON(http.StatusInternalServerError, responses.ErrorResponse500{Error: err.Error()})
|
|
||||||
log.WithError(err).Error(logMsg)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
c.Status(http.StatusOK)
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -1,46 +1,32 @@
|
||||||
package merch
|
package merch
|
||||||
|
|
||||||
import (
|
import "time"
|
||||||
"merch-parser-api/internal/api/merch/origins"
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
type merchBundle struct {
|
type merchBundle struct {
|
||||||
Merch *Merch
|
Merch *Merch
|
||||||
Surugaya *origins.OriginSurugaya
|
Surugaya *Surugaya
|
||||||
Mandarake *origins.OriginMandarake
|
Mandarake *Mandarake
|
||||||
Amiami *origins.OriginAmiami
|
|
||||||
}
|
}
|
||||||
type MerchDTO struct {
|
type MerchDTO struct {
|
||||||
MerchUuid string `json:"merch_uuid"`
|
MerchUuid string `json:"merch_uuid"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
OriginSurugaya SurugayaDTO `json:"origin_surugaya"`
|
OriginSurugaya SurugayaDTO `json:"origin_surugaya"`
|
||||||
OriginMandarake MandarakeDTO `json:"origin_mandarake"`
|
OriginMandarake MandarakeDTO `json:"origin_mandarake"`
|
||||||
OriginAmiami AmiamiDTO `json:"origin_amiami"`
|
|
||||||
Labels []string `json:"labels,omitempty" gorm:"-"`
|
Labels []string `json:"labels,omitempty" gorm:"-"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type OriginDTO struct {
|
|
||||||
Link string `json:"link"`
|
|
||||||
Name origins.Origin `json:"name,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type SurugayaDTO struct {
|
type SurugayaDTO struct {
|
||||||
OriginDTO
|
Link string `json:"link"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type MandarakeDTO struct {
|
type MandarakeDTO struct {
|
||||||
OriginDTO
|
Link string `json:"link"`
|
||||||
}
|
|
||||||
|
|
||||||
type AmiamiDTO struct {
|
|
||||||
OriginDTO
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type SingleMerchResponse struct {
|
type SingleMerchResponse struct {
|
||||||
MerchUuid string `json:"merch_uuid"`
|
MerchUuid string `json:"merch_uuid"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
Origins []OriginDTO `json:"origins"`
|
Origins []any `json:"origins"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type ListResponse struct {
|
type ListResponse struct {
|
||||||
|
|
@ -55,7 +41,7 @@ type PriceEntry struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
type OriginWithPrices struct {
|
type OriginWithPrices struct {
|
||||||
Origin origins.Origin `json:"origin"`
|
Origin Origin `json:"origin"`
|
||||||
Prices []PriceEntry
|
Prices []PriceEntry
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -100,7 +86,7 @@ type ZeroPrice struct {
|
||||||
CreatedAt time.Time `json:"created_at"`
|
CreatedAt time.Time `json:"created_at"`
|
||||||
MerchUuid string `json:"merch_uuid"`
|
MerchUuid string `json:"merch_uuid"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
Origin origins.Origin `json:"origin"`
|
Origin string `json:"origin"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type DeleteZeroPrices struct {
|
type DeleteZeroPrices struct {
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,6 @@ package merch
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"database/sql"
|
"database/sql"
|
||||||
"merch-parser-api/internal/api/merch/origins"
|
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -20,6 +19,28 @@ func (Merch) TableName() string {
|
||||||
return "merch"
|
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 {
|
type Price struct {
|
||||||
Id uint `json:"id" gorm:"primary_key"`
|
Id uint `json:"id" gorm:"primary_key"`
|
||||||
CreatedAt time.Time `json:"created_at" gorm:"column:created_at"`
|
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"`
|
DeletedAt sql.NullTime `json:"deleted_at,omitempty" gorm:"column:deleted_at"`
|
||||||
MerchUuid string `json:"merch_uuid" gorm:"column:merch_uuid"`
|
MerchUuid string `json:"merch_uuid" gorm:"column:merch_uuid"`
|
||||||
Price int `json:"price" gorm:"column:price"`
|
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 {
|
type Label struct {
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package origins
|
package merch
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"database/sql/driver"
|
"database/sql/driver"
|
||||||
|
|
@ -9,15 +9,13 @@ import (
|
||||||
type Origin int
|
type Origin int
|
||||||
|
|
||||||
const (
|
const (
|
||||||
Surugaya = (iota + 1) * 1000
|
surugaya = (iota + 1) * 1000
|
||||||
Mandarake
|
mandarake
|
||||||
Amiami
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var Origins = [...]string{
|
var Origins = [...]string{
|
||||||
"surugaya",
|
"surugaya",
|
||||||
"mandarake",
|
"mandarake",
|
||||||
"amiami",
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (o Origin) String() string {
|
func (o Origin) String() string {
|
||||||
|
|
@ -32,7 +30,7 @@ func (o Origin) MarshalJSON() ([]byte, error) {
|
||||||
return json.Marshal(o.String())
|
return json.Marshal(o.String())
|
||||||
}
|
}
|
||||||
|
|
||||||
func ParseOrigin(s string) (Origin, bool) {
|
func parseOrigin(s string) (Origin, bool) {
|
||||||
for i, name := range Origins {
|
for i, name := range Origins {
|
||||||
if name == strings.ToLower(s) {
|
if name == strings.ToLower(s) {
|
||||||
return Origin((i + 1) * 1000), true
|
return Origin((i + 1) * 1000), true
|
||||||
|
|
@ -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}}
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
@ -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"
|
|
||||||
}
|
|
||||||
|
|
@ -4,14 +4,13 @@ import (
|
||||||
"database/sql"
|
"database/sql"
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
"gorm.io/gorm"
|
"gorm.io/gorm"
|
||||||
"merch-parser-api/internal/api/merch/origins"
|
|
||||||
"merch-parser-api/internal/shared"
|
"merch-parser-api/internal/shared"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Link struct {
|
type Link struct {
|
||||||
Surugaya []origins.OriginSurugaya
|
Surugaya []Surugaya
|
||||||
Mandarake []origins.OriginMandarake
|
Mandarake []Mandarake
|
||||||
}
|
}
|
||||||
|
|
||||||
type TaskProvider struct {
|
type TaskProvider struct {
|
||||||
|
|
@ -85,7 +84,7 @@ func (p *TaskProvider) InsertPrices(prices []shared.TaskResult) error {
|
||||||
|
|
||||||
var insertPrices []Price
|
var insertPrices []Price
|
||||||
for _, item := range prices {
|
for _, item := range prices {
|
||||||
origin, ok := origins.ParseOrigin(item.Origin)
|
origin, ok := parseOrigin(item.Origin)
|
||||||
if !ok {
|
if !ok {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
@ -108,13 +107,13 @@ func (p *TaskProvider) InsertPrices(prices []shared.TaskResult) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *TaskRepo) getLinks() (*Link, 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
|
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
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,10 +3,8 @@ package merch
|
||||||
import (
|
import (
|
||||||
"database/sql"
|
"database/sql"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
|
||||||
"gorm.io/gorm"
|
"gorm.io/gorm"
|
||||||
"gorm.io/gorm/clause"
|
"gorm.io/gorm/clause"
|
||||||
"merch-parser-api/internal/api/merch/origins"
|
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -44,7 +42,6 @@ type prices interface {
|
||||||
|
|
||||||
getZeroPrices(userUuid string) ([]ZeroPrice, error)
|
getZeroPrices(userUuid string) ([]ZeroPrice, error)
|
||||||
deleteZeroPrices(list []DeleteZeroPrices) error
|
deleteZeroPrices(list []DeleteZeroPrices) error
|
||||||
deleteZeroPricesPeriod(userUuid string, start, end time.Time) error
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type labels interface {
|
type labels interface {
|
||||||
|
|
@ -63,15 +60,11 @@ func (r *Repo) addMerch(bundle merchBundle) error {
|
||||||
return err
|
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
|
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
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -118,7 +111,7 @@ func (r *Repo) getSingleMerch(userUuid, merchUuid string) (merchBundle, error) {
|
||||||
return merchBundle{}, err
|
return merchBundle{}, err
|
||||||
}
|
}
|
||||||
|
|
||||||
var surugaya origins.OriginSurugaya
|
var surugaya Surugaya
|
||||||
if err := r.db.
|
if err := r.db.
|
||||||
Where("merch_uuid = ?", merchUuid).
|
Where("merch_uuid = ?", merchUuid).
|
||||||
First(&surugaya).Error; err != nil {
|
First(&surugaya).Error; err != nil {
|
||||||
|
|
@ -127,7 +120,7 @@ func (r *Repo) getSingleMerch(userUuid, merchUuid string) (merchBundle, error) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var mandarake origins.OriginMandarake
|
var mandarake Mandarake
|
||||||
if err := r.db.
|
if err := r.db.
|
||||||
Where("merch_uuid = ?", merchUuid).
|
Where("merch_uuid = ?", merchUuid).
|
||||||
First(&mandarake).Error; err != nil {
|
First(&mandarake).Error; err != nil {
|
||||||
|
|
@ -136,20 +129,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{
|
return merchBundle{
|
||||||
Merch: &merch,
|
Merch: &merch,
|
||||||
Surugaya: &surugaya,
|
Surugaya: &surugaya,
|
||||||
Mandarake: &mandarake,
|
Mandarake: &mandarake,
|
||||||
Amiami: &amiami,
|
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -180,13 +163,22 @@ func (r *Repo) updateMerch(payload UpdateMerchDTO, userUuid string) error {
|
||||||
return err
|
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
|
return err
|
||||||
}
|
}
|
||||||
} else if payload.Origin != "" {
|
|
||||||
return fmt.Errorf("unsupported origin: %s", payload.Origin)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
|
@ -203,15 +195,18 @@ func (r *Repo) deleteMerch(userUuid, merchUuid string) error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
ors := origins.AllOriginModels()
|
|
||||||
|
|
||||||
for _, origin := range ors {
|
|
||||||
if err := r.db.
|
if err := r.db.
|
||||||
Model(origin).
|
Model(&Surugaya{}).
|
||||||
Where("merch_uuid = ?", merchUuid).
|
Where("merch_uuid = ?", merchUuid).
|
||||||
Update("deleted_at", now).Error; err != nil {
|
Update("deleted_at", now).Error; err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if err := r.db.
|
||||||
|
Model(&Mandarake{}).
|
||||||
|
Where("merch_uuid = ?", merchUuid).
|
||||||
|
Update("deleted_at", now).Error; err != nil {
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
|
@ -342,9 +337,9 @@ func (r *Repo) getZeroPrices(userUuid string) ([]ZeroPrice, error) {
|
||||||
if err := r.db.Raw(`
|
if err := r.db.Raw(`
|
||||||
WITH price_with_neighbors AS (
|
WITH price_with_neighbors AS (
|
||||||
SELECT
|
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
|
FROM prices AS p
|
||||||
JOIN merch as m ON m.merch_uuid = p.merch_uuid
|
JOIN merch as m ON m.merch_uuid = p.merch_uuid
|
||||||
WHERE p.deleted_at IS NULL
|
WHERE p.deleted_at IS NULL
|
||||||
|
|
@ -352,7 +347,7 @@ func (r *Repo) getZeroPrices(userUuid string) ([]ZeroPrice, error) {
|
||||||
AND m.user_uuid = ?)
|
AND m.user_uuid = ?)
|
||||||
|
|
||||||
SELECT
|
SELECT
|
||||||
id, created_at, merch_uuid, origins, name
|
id, created_at, merch_uuid, origin, name
|
||||||
FROM price_with_neighbors
|
FROM price_with_neighbors
|
||||||
WHERE
|
WHERE
|
||||||
price = 0
|
price = 0
|
||||||
|
|
@ -376,19 +371,3 @@ func (r *Repo) deleteZeroPrices(list []DeleteZeroPrices) error {
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Repo) deleteZeroPricesPeriod(userUuid string, start, end time.Time) error {
|
|
||||||
if err := r.db.Exec(`
|
|
||||||
UPDATE prices
|
|
||||||
SET deleted_at = ?
|
|
||||||
FROM merch
|
|
||||||
WHERE prices.merch_uuid = merch.merch_uuid
|
|
||||||
AND merch.user_uuid = ?
|
|
||||||
AND prices.price = 0
|
|
||||||
AND prices.deleted_at IS NULL
|
|
||||||
AND prices.created_at BETWEEN ? AND ?;
|
|
||||||
`, time.Now().UTC(), userUuid, start, end).Error; err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,6 @@ import (
|
||||||
"image"
|
"image"
|
||||||
"image/jpeg"
|
"image/jpeg"
|
||||||
"io"
|
"io"
|
||||||
"merch-parser-api/internal/api/merch/origins"
|
|
||||||
"merch-parser-api/internal/interfaces"
|
"merch-parser-api/internal/interfaces"
|
||||||
is "merch-parser-api/proto/imageStorage"
|
is "merch-parser-api/proto/imageStorage"
|
||||||
"mime/multipart"
|
"mime/multipart"
|
||||||
|
|
@ -59,7 +58,7 @@ func (s *service) addMerch(payload MerchDTO, userUuid string) error {
|
||||||
merchUuid := uuid.NewString()
|
merchUuid := uuid.NewString()
|
||||||
|
|
||||||
bundle := merchBundle{
|
bundle := merchBundle{
|
||||||
Merch: &Merch{
|
&Merch{
|
||||||
CreatedAt: time.Time{},
|
CreatedAt: time.Time{},
|
||||||
UpdatedAt: sql.NullTime{Valid: false},
|
UpdatedAt: sql.NullTime{Valid: false},
|
||||||
DeletedAt: 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,
|
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)
|
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)
|
bundle, err := s.repo.getSingleMerch(userUuid, merchUuid)
|
||||||
if err != nil {
|
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,
|
MerchUuid: bundle.Merch.MerchUuid,
|
||||||
Name: bundle.Merch.Name,
|
Name: bundle.Merch.Name,
|
||||||
Origins: originsSlice,
|
OriginSurugaya: SurugayaDTO{
|
||||||
|
Link: bundle.Surugaya.Link,
|
||||||
|
},
|
||||||
|
OriginMandarake: MandarakeDTO{
|
||||||
|
Link: bundle.Mandarake.Link,
|
||||||
|
},
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -142,7 +137,7 @@ func (s *service) updateMerch(payload UpdateMerchDTO, userUuid string) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
if payload.Origin == "" {
|
if payload.Origin == "" {
|
||||||
return errors.New("no origins provided")
|
return errors.New("no origin provided")
|
||||||
}
|
}
|
||||||
|
|
||||||
return s.repo.updateMerch(payload, userUuid)
|
return s.repo.updateMerch(payload, userUuid)
|
||||||
|
|
@ -183,10 +178,10 @@ func (s *service) getPrices(userUuid string, days string) ([]PricesResponse, err
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
pricesMap := make(map[string]map[origins.Origin][]PriceEntry)
|
pricesMap := make(map[string]map[Origin][]PriceEntry)
|
||||||
for _, item := range pricesList {
|
for _, item := range pricesList {
|
||||||
if _, ok := pricesMap[item.MerchUuid]; !ok {
|
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{
|
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 {
|
for i := range response {
|
||||||
originSurugaya := OriginWithPrices{
|
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)
|
response[i].Origins = append(response[i].Origins, originSurugaya)
|
||||||
|
|
||||||
originMandarake := OriginWithPrices{
|
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)
|
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
|
return response, nil
|
||||||
|
|
@ -229,37 +218,27 @@ func (s *service) getDistinctPrices(userUuid, merchUuid, days string) (PricesRes
|
||||||
}
|
}
|
||||||
|
|
||||||
originSurugaya := OriginWithPrices{
|
originSurugaya := OriginWithPrices{
|
||||||
Origin: origins.Surugaya,
|
Origin: surugaya,
|
||||||
Prices: []PriceEntry{},
|
Prices: []PriceEntry{},
|
||||||
}
|
}
|
||||||
|
|
||||||
originMandarake := OriginWithPrices{
|
originMandarake := OriginWithPrices{
|
||||||
Origin: origins.Mandarake,
|
Origin: mandarake,
|
||||||
Prices: []PriceEntry{},
|
|
||||||
}
|
|
||||||
|
|
||||||
originAmiami := OriginWithPrices{
|
|
||||||
Origin: origins.Amiami,
|
|
||||||
Prices: []PriceEntry{},
|
Prices: []PriceEntry{},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, item := range result {
|
for _, item := range result {
|
||||||
switch item.Origin {
|
switch item.Origin {
|
||||||
case origins.Surugaya:
|
case surugaya:
|
||||||
originSurugaya.Prices = append(originSurugaya.Prices, PriceEntry{
|
originSurugaya.Prices = append(originSurugaya.Prices, PriceEntry{
|
||||||
CreatedAt: item.CreatedAt.Unix(),
|
CreatedAt: item.CreatedAt.Unix(),
|
||||||
Value: item.Price,
|
Value: item.Price,
|
||||||
})
|
})
|
||||||
case origins.Mandarake:
|
case mandarake:
|
||||||
originMandarake.Prices = append(originMandarake.Prices, PriceEntry{
|
originMandarake.Prices = append(originMandarake.Prices, PriceEntry{
|
||||||
CreatedAt: item.CreatedAt.Unix(),
|
CreatedAt: item.CreatedAt.Unix(),
|
||||||
Value: item.Price,
|
Value: item.Price,
|
||||||
})
|
})
|
||||||
case origins.Amiami:
|
|
||||||
originAmiami.Prices = append(originAmiami.Prices, PriceEntry{
|
|
||||||
CreatedAt: item.CreatedAt.Unix(),
|
|
||||||
Value: item.Price,
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -683,7 +662,3 @@ func (s *service) deleteZeroPrices(userUuid string, list []DeleteZeroPrices) err
|
||||||
|
|
||||||
return s.repo.deleteZeroPrices(toDelete)
|
return s.repo.deleteZeroPrices(toDelete)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *service) deleteZeroPricesPeriod(userUuid string, start, end time.Time) error {
|
|
||||||
return s.repo.deleteZeroPricesPeriod(userUuid, start, end)
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,6 @@
|
||||||
package interfaces
|
package interfaces
|
||||||
|
|
||||||
import (
|
import "github.com/gin-gonic/gin"
|
||||||
"github.com/gin-gonic/gin"
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
type Utils interface {
|
type Utils interface {
|
||||||
IsEmail(email string) bool
|
IsEmail(email string) bool
|
||||||
|
|
@ -11,5 +8,4 @@ type Utils interface {
|
||||||
GetRefreshUuidFromContext(c *gin.Context) (string, error)
|
GetRefreshUuidFromContext(c *gin.Context) (string, error)
|
||||||
HashPassword(password string) (string, error)
|
HashPassword(password string) (string, error)
|
||||||
ComparePasswords(hashedPassword string, plainPassword string) error
|
ComparePasswords(hashedPassword string, plainPassword string) error
|
||||||
ParseTime(t string) (time.Time, error)
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -46,13 +46,6 @@ CREATE TABLE origin_mandarake(
|
||||||
link TEXT
|
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(
|
CREATE TABLE prices(
|
||||||
id BIGSERIAL PRIMARY KEY,
|
id BIGSERIAL PRIMARY KEY,
|
||||||
|
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
package utils
|
|
||||||
|
|
||||||
import "time"
|
|
||||||
|
|
||||||
func (u *Utils) ParseTime(t string) (time.Time, error) {
|
|
||||||
timeStr, err := time.Parse(time.RFC3339, t)
|
|
||||||
if err != nil {
|
|
||||||
return time.Time{}, err
|
|
||||||
}
|
|
||||||
return timeStr, nil
|
|
||||||
}
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue