From bd865c709e238be430b73bc602b42d8a7bd05347 Mon Sep 17 00:00:00 2001 From: Iron_Felix Date: Thu, 9 Oct 2025 03:18:17 +0300 Subject: [PATCH 01/80] feat: added openapi spec --- api/openapi.yaml | 552 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 552 insertions(+) create mode 100644 api/openapi.yaml diff --git a/api/openapi.yaml b/api/openapi.yaml new file mode 100644 index 0000000..5a35e20 --- /dev/null +++ b/api/openapi.yaml @@ -0,0 +1,552 @@ +openapi: 3.1.1 +info: + title: Titles, Users, Reviews, Tags, and Media API + version: 1.0.0 +servers: + - url: https://api.example.com +paths: + /title: + get: + summary: Get titles + parameters: + - in: query + name: query + schema: + type: string + - in: query + name: limit + schema: + type: integer + default: 10 + - in: query + name: offset + schema: + type: integer + default: 0 + - in: query + name: fields + schema: + type: string + default: all + responses: + '200': + description: List of titles + content: + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/Title' + '204': + description: No titles found + + /title/{title_id}: + get: + summary: Get title description + parameters: + - in: path + name: title_id + required: true + schema: + type: string + - in: query + name: fields + schema: + type: string + default: all + responses: + '200': + description: Title description + content: + application/json: + schema: + $ref: '#/components/schemas/Title' + '404': + description: Title not found + + patch: + summary: Update title info + parameters: + - in: path + name: title_id + required: true + schema: + type: string + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/Title' + responses: + '200': + description: Update result + content: + application/json: + schema: + type: object + properties: + success: + type: boolean + error: + type: string + user_json: + $ref: '#/components/schemas/User' + + /title/{title_id}/reviews: + get: + summary: Get title reviews + parameters: + - in: path + name: title_id + required: true + schema: + type: string + - in: query + name: limit + schema: + type: integer + default: 10 + - in: query + name: offset + schema: + type: integer + default: 0 + responses: + '200': + description: List of reviews + content: + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/Review' + '204': + description: No reviews found + + /users/{user_id}: + get: + summary: Get user info + parameters: + - in: path + name: user_id + required: true + schema: + type: string + - in: query + name: fields + schema: + type: string + default: all + responses: + '200': + description: User info + content: + application/json: + schema: + $ref: '#/components/schemas/User' + '404': + description: User not found + + patch: + summary: Update user + parameters: + - in: path + name: user_id + required: true + schema: + type: string + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/User' + responses: + '200': + description: Update result + content: + application/json: + schema: + type: object + properties: + success: + type: boolean + error: + type: string + + delete: + summary: Delete user + parameters: + - in: path + name: user_id + required: true + schema: + type: string + responses: + '200': + description: Delete result + content: + application/json: + schema: + type: object + properties: + success: + type: boolean + error: + type: string + + /users: + get: + summary: Search user + parameters: + - in: query + name: query + schema: + type: string + - in: query + name: fields + schema: + type: string + responses: + '200': + description: List of users + content: + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/User' + + post: + summary: Add new user + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/User' + responses: + '200': + description: Add result + content: + application/json: + schema: + type: object + properties: + success: + type: boolean + error: + type: string + user_json: + $ref: '#/components/schemas/User' + + /users/{user_id}/titles: + get: + summary: Get user titles + parameters: + - in: path + name: user_id + required: true + schema: + type: string + - in: query + name: query + schema: + type: string + - in: query + name: limit + schema: + type: integer + default: 10 + - in: query + name: offset + schema: + type: integer + default: 0 + - in: query + name: fields + schema: + type: string + default: all + responses: + '200': + description: List of user titles + content: + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/UserTitle' + '204': + description: No titles found + + post: + summary: Add user title + parameters: + - in: path + name: user_id + required: true + schema: + type: string + requestBody: + required: true + content: + application/json: + schema: + type: object + properties: + title_id: + type: string + status: + type: string + responses: + '200': + description: Add result + content: + application/json: + schema: + type: object + properties: + success: + type: boolean + error: + type: string + + patch: + summary: Update user title + parameters: + - in: path + name: user_id + required: true + schema: + type: string + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/UserTitle' + responses: + '200': + description: Update result + content: + application/json: + schema: + type: object + properties: + success: + type: boolean + error: + type: string + + delete: + summary: Delete user title + parameters: + - in: path + name: user_id + required: true + schema: + type: string + - in: query + name: title_id + schema: + type: string + responses: + '200': + description: Delete result + content: + application/json: + schema: + type: object + properties: + success: + type: boolean + error: + type: string + + /users/{user_id}/reviews: + get: + summary: Get user reviews + parameters: + - in: path + name: user_id + required: true + schema: + type: string + - in: query + name: limit + schema: + type: integer + default: 10 + - in: query + name: offset + schema: + type: integer + default: 0 + responses: + '200': + description: List of reviews + content: + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/Review' + + /reviews: + post: + summary: Add review + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/Review' + responses: + '200': + description: Add result + content: + application/json: + schema: + type: object + properties: + success: + type: boolean + error: + type: string + + /reviews/{review_id}: + patch: + summary: Update review + parameters: + - in: path + name: review_id + required: true + schema: + type: string + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/Review' + responses: + '200': + description: Update result + content: + application/json: + schema: + type: object + properties: + success: + type: boolean + error: + type: string + delete: + summary: Delete review + parameters: + - in: path + name: review_id + required: true + schema: + type: string + responses: + '200': + description: Delete result + content: + application/json: + schema: + type: object + properties: + success: + type: boolean + error: + type: string + + /tags: + get: + summary: Get tags + parameters: + - in: query + name: limit + schema: + type: integer + default: 10 + - in: query + name: offset + schema: + type: integer + default: 0 + - in: query + name: fields + schema: + type: string + responses: + '200': + description: List of tags + content: + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/Tag' + + /media: + post: + summary: Upload image + responses: + '200': + description: Upload result + content: + application/json: + schema: + type: object + properties: + success: + type: boolean + error: + type: string + image_id: + type: string + + get: + summary: Get image path + parameters: + - in: query + name: image_id + required: true + schema: + type: string + responses: + '200': + description: Image path + content: + application/json: + schema: + type: object + properties: + success: + type: boolean + error: + type: string + image_path: + type: string + +components: + schemas: + Title: + type: object + additionalProperties: true + User: + type: object + additionalProperties: true + UserTitle: + type: object + additionalProperties: true + Review: + type: object + additionalProperties: true + Tag: + type: object + additionalProperties: true From f4a96db9423d326f1a217ad9edd8d889c10bd535 Mon Sep 17 00:00:00 2001 From: nihonium Date: Thu, 9 Oct 2025 14:45:41 +0300 Subject: [PATCH 02/80] refact: renamed server to backend --- Dockerfiles/Dockerfile_backend | 13 ++++++++++++ Dockerfiles/Dockerfile_server | 20 ------------------ modules/{server => backend}/config.toml | 0 modules/{server => backend}/go.mod | 7 ++++--- modules/{server => backend}/go.sum | 8 +++++++ modules/{server => backend}/helpers.go | 0 modules/{server => backend}/main.go | 21 +++++++++++++++++++ .../{server => backend}/templates/index.html | 0 modules/backend/types.go | 12 +++++++++++ modules/server/types.go | 6 ------ 10 files changed, 58 insertions(+), 29 deletions(-) create mode 100644 Dockerfiles/Dockerfile_backend delete mode 100644 Dockerfiles/Dockerfile_server rename modules/{server => backend}/config.toml (100%) rename modules/{server => backend}/go.mod (86%) rename modules/{server => backend}/go.sum (90%) rename modules/{server => backend}/helpers.go (100%) rename modules/{server => backend}/main.go (65%) rename modules/{server => backend}/templates/index.html (100%) create mode 100644 modules/backend/types.go delete mode 100644 modules/server/types.go diff --git a/Dockerfiles/Dockerfile_backend b/Dockerfiles/Dockerfile_backend new file mode 100644 index 0000000..1e170fc --- /dev/null +++ b/Dockerfiles/Dockerfile_backend @@ -0,0 +1,13 @@ +FROM ubuntu:22.04 + +WORKDIR /app +COPY --chmod=755 modules/server/nyanimedb /app +COPY modules/server/templates /app/templates +EXPOSE 8080 +ENTRYPOINT ["/app/nyanimedb"] + + +# FROM debian:buster-slim +# COPY --from=builder /go/src/app/main /go/bin/main +# ENV PATH="/go/bin:${PATH}" +# CMD ["main"] \ No newline at end of file diff --git a/Dockerfiles/Dockerfile_server b/Dockerfiles/Dockerfile_server deleted file mode 100644 index 87014ce..0000000 --- a/Dockerfiles/Dockerfile_server +++ /dev/null @@ -1,20 +0,0 @@ -FROM ubuntu:22.04 - -WORKDIR /app -COPY --chmod=755 nyanimedb /app -COPY templates /app/templates -EXPOSE 8080 -ENTRYPOINT ["/app/nyanimedb"] - -# FROM golang:1.25 AS builder - -# ARG VERSION=dev - -# WORKDIR /go/src/app -# COPY main.go . -# RUN go build -o main -ldflags=-X=main.version=${VERSION} main.go - -# FROM debian:buster-slim -# COPY --from=builder /go/src/app/main /go/bin/main -# ENV PATH="/go/bin:${PATH}" -# CMD ["main"] \ No newline at end of file diff --git a/modules/server/config.toml b/modules/backend/config.toml similarity index 100% rename from modules/server/config.toml rename to modules/backend/config.toml diff --git a/modules/server/go.mod b/modules/backend/go.mod similarity index 86% rename from modules/server/go.mod rename to modules/backend/go.mod index cbdfb8b..9c9e8fc 100644 --- a/modules/server/go.mod +++ b/modules/backend/go.mod @@ -6,19 +6,20 @@ require ( github.com/bytedance/sonic v1.14.0 // indirect github.com/bytedance/sonic/loader v0.3.0 // indirect github.com/cloudwego/base64x v0.1.6 // indirect - github.com/gabriel-vasile/mimetype v1.4.8 // indirect + github.com/gabriel-vasile/mimetype v1.4.9 // indirect + github.com/gin-contrib/cors v1.7.6 // indirect github.com/gin-contrib/sse v1.1.0 // indirect github.com/gin-gonic/gin v1.11.0 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-playground/validator/v10 v10.27.0 // indirect - github.com/goccy/go-json v0.10.2 // indirect + github.com/goccy/go-json v0.10.5 // indirect github.com/goccy/go-yaml v1.18.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/cpuid/v2 v2.3.0 // indirect github.com/leodido/go-urn v1.4.0 // indirect github.com/mattn/go-isatty v0.0.20 // indirect - github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.2.4 // indirect github.com/quic-go/qpack v0.5.1 // indirect diff --git a/modules/server/go.sum b/modules/backend/go.sum similarity index 90% rename from modules/server/go.sum rename to modules/backend/go.sum index cb0d745..5cc008d 100644 --- a/modules/server/go.sum +++ b/modules/backend/go.sum @@ -8,6 +8,10 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM= github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8= +github.com/gabriel-vasile/mimetype v1.4.9 h1:5k+WDwEsD9eTLL8Tz3L0VnmVh9QxGjRmjBvAG7U/oYY= +github.com/gabriel-vasile/mimetype v1.4.9/go.mod h1:WnSQhFKJuBlRyLiKohA/2DtIlPFAbguNaG7QCHcyGok= +github.com/gin-contrib/cors v1.7.6 h1:3gQ8GMzs1Ylpf70y8bMw4fVpycXIeX1ZemuSQIsnQQY= +github.com/gin-contrib/cors v1.7.6/go.mod h1:Ulcl+xN4jel9t1Ry8vqph23a60FwH9xVLd+3ykmTjOk= github.com/gin-contrib/sse v1.1.0 h1:n0w2GMuUpWDVp7qSpvze6fAu9iRxJY4Hmj6AmBOU05w= github.com/gin-contrib/sse v1.1.0/go.mod h1:hxRZ5gVpWMT7Z0B0gSNYqqsSCNIJMjzvm6fqCz9vjwM= github.com/gin-gonic/gin v1.11.0 h1:OW/6PLjyusp2PPXtyxKHU0RbX6I/l28FTdDlae5ueWk= @@ -20,6 +24,8 @@ github.com/go-playground/validator/v10 v10.27.0 h1:w8+XrWVMhGkxOaaowyKH35gFydVHO github.com/go-playground/validator/v10 v10.27.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4= +github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw= github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -33,6 +39,8 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4= diff --git a/modules/server/helpers.go b/modules/backend/helpers.go similarity index 100% rename from modules/server/helpers.go rename to modules/backend/helpers.go diff --git a/modules/server/main.go b/modules/backend/main.go similarity index 65% rename from modules/server/main.go rename to modules/backend/main.go index 775540b..651d9cc 100644 --- a/modules/server/main.go +++ b/modules/backend/main.go @@ -5,7 +5,9 @@ import ( "net/http" "os" "reflect" + "time" + "github.com/gin-contrib/cors" "github.com/gin-gonic/gin" "github.com/pelletier/go-toml/v2" log "github.com/sirupsen/logrus" @@ -29,6 +31,15 @@ func main() { r.LoadHTMLGlob("templates/*") + r.Use(cors.New(cors.Config{ + AllowOrigins: []string{"*"}, // allow all origins, change to specific domains in production + AllowMethods: []string{"GET", "POST", "PUT", "DELETE"}, + AllowHeaders: []string{"Origin", "Content-Type", "Accept"}, + ExposeHeaders: []string{"Content-Length"}, + AllowCredentials: true, + MaxAge: 12 * time.Hour, + })) + r.GET("/", func(c *gin.Context) { c.HTML(http.StatusOK, "index.html", gin.H{ "title": "Welcome Page", @@ -36,6 +47,16 @@ func main() { }) }) + r.GET("/api", func(c *gin.Context) { + items := []Item{ + {ID: 1, Title: "First Item", Description: "This is the description of the first item."}, + {ID: 2, Title: "Second Item", Description: "This is the description of the second item."}, + {ID: 3, Title: "Third Item", Description: "This is the description of the third item."}, + } + + c.JSON(http.StatusOK, items) + }) + r.Run(":8080") } diff --git a/modules/server/templates/index.html b/modules/backend/templates/index.html similarity index 100% rename from modules/server/templates/index.html rename to modules/backend/templates/index.html diff --git a/modules/backend/types.go b/modules/backend/types.go new file mode 100644 index 0000000..20d3158 --- /dev/null +++ b/modules/backend/types.go @@ -0,0 +1,12 @@ +package main + +type Config struct { + Mode string + LogLevel string `toml:"LogLevel" env:"LOG_LEVEL"` +} + +type Item struct { + ID int `json:"id"` + Title string `json:"title"` + Description string `json:"description"` +} diff --git a/modules/server/types.go b/modules/server/types.go deleted file mode 100644 index 539babf..0000000 --- a/modules/server/types.go +++ /dev/null @@ -1,6 +0,0 @@ -package main - -type Config struct { - Mode string - LogLevel string `toml:"LogLevel" env:"LOG_LEVEL"` -} From e2a9bcbc9364f6067477c8bc069f6e2db741c66e Mon Sep 17 00:00:00 2001 From: nihonium Date: Thu, 9 Oct 2025 14:46:16 +0300 Subject: [PATCH 03/80] feat: added backend/frontend to buildx --- deploy/buildx.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/deploy/buildx.sh b/deploy/buildx.sh index 96e0fe4..8c19bc9 100644 --- a/deploy/buildx.sh +++ b/deploy/buildx.sh @@ -1,2 +1,7 @@ -#!/bin/bash -docker buildx build --platform linux/amd64 -t meowgit.nekoea.red/nihonium/forgejo-runner:latest -f ./Dockerfiles/Dockerfile_forgejo-runner . --push \ No newline at end of file +#!/usr/bin/env bash + +export BACKEND_API_BASE_URL="http://127.0.0.1:8080" + +docker buildx build --platform linux/amd64 -t meowgit.nekoea.red/nihonium/forgejo-runner:latest -f ./Dockerfiles/Dockerfile_forgejo-runner . --push +docker buildx build --build-arg VITE_BACKEND_API_BASE_URL=${BACKEND_API_BASE_URL} --platform linux/amd64 -t meowgit.nekoea.red/nihonium/nyanimedb-frontend:latest -f .\Dockerfiles\Dockerfile_frontend . --push +docker buildx build --platform linux/amd64 -t meowgit.nekoea.red/nihonium/nyanimedb-backend:latest -f .\Dockerfiles\Dockerfile_backend . --push \ No newline at end of file From f680e16be5f625a84a1d08b16531ae0f044d4026 Mon Sep 17 00:00:00 2001 From: nihonium Date: Thu, 9 Oct 2025 15:16:19 +0300 Subject: [PATCH 04/80] feat: modified dockerfiles for cicd build --- Dockerfiles/Dockerfile_backend | 8 +------- Dockerfiles/Dockerfile_frontend | 11 +---------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/Dockerfiles/Dockerfile_backend b/Dockerfiles/Dockerfile_backend index 1e170fc..0161a77 100644 --- a/Dockerfiles/Dockerfile_backend +++ b/Dockerfiles/Dockerfile_backend @@ -4,10 +4,4 @@ WORKDIR /app COPY --chmod=755 modules/server/nyanimedb /app COPY modules/server/templates /app/templates EXPOSE 8080 -ENTRYPOINT ["/app/nyanimedb"] - - -# FROM debian:buster-slim -# COPY --from=builder /go/src/app/main /go/bin/main -# ENV PATH="/go/bin:${PATH}" -# CMD ["main"] \ No newline at end of file +ENTRYPOINT ["/app/nyanimedb"] \ No newline at end of file diff --git a/Dockerfiles/Dockerfile_frontend b/Dockerfiles/Dockerfile_frontend index 9f0752e..a7ec893 100644 --- a/Dockerfiles/Dockerfile_frontend +++ b/Dockerfiles/Dockerfile_frontend @@ -1,13 +1,4 @@ -FROM node:20-alpine AS builder -ARG VITE_BACKEND_API_BASE_URL -ENV VITE_BACKEND_API_BASE_URL=$VITE_BACKEND_API_BASE_URL -WORKDIR /app -COPY modules/frontend/ ./ -RUN echo "VITE_BACKEND_API_BASE_URL=$VITE_BACKEND_API_BASE_URL" -RUN npm install -RUN npm run build - FROM nginx:alpine -COPY --from=builder /app/dist /usr/share/nginx/html +COPY modules/frontend/dist /usr/share/nginx/html EXPOSE 80 CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file From 951db38e4ce669bf97eabd69fef548fb7f6921bb Mon Sep 17 00:00:00 2001 From: nihonium Date: Thu, 9 Oct 2025 15:16:48 +0300 Subject: [PATCH 05/80] feat: build frontend via cicd --- .forgejo/workflows/build-and-deploy.yml | 69 ++++++++++++++++++------- 1 file changed, 49 insertions(+), 20 deletions(-) diff --git a/.forgejo/workflows/build-and-deploy.yml b/.forgejo/workflows/build-and-deploy.yml index 87a8b34..5e11166 100644 --- a/.forgejo/workflows/build-and-deploy.yml +++ b/.forgejo/workflows/build-and-deploy.yml @@ -9,34 +9,55 @@ on: jobs: build: runs-on: ubuntu-latest + env: + BACKEND_API_BASE_URL: ${{ vars.BACKEND_API_BASE_URL }} steps: - name: Checkout code uses: actions/checkout@v4 - + + # Build backend - uses: actions/setup-go@v6 with: go-version: '^1.25' check-latest: false cache-dependency-path: | - modules/server/go.sum + modules/backend/go.sum + + - name: Build Go app + run: | + cd modules/backend + go build -o nyanimedb . + tar -czvf nyanimedb-backend.tar.gz nyanimedb templates/ + - name: Upload built backend to artifactory + uses: actions/upload-artifact@v3 + with: + name: nyanimedb-backend.tar.gz + path: modules/backend/nyanimedb-backend.tar.gz + + # Build frontend + - uses: actions/setup-node@v5 + with: + node-version-file: 'modules/frontend/package.json' + cache: 'npm' + cache-dependency-path: modules/frontend/package-lock.json + + - name: Build frontend + run: | + cd modules/frontend + npm run build + tar -czvf nyanimedb-frontend.tar.gz dist/ + + - name: Upload built frontend to artifactory + uses: actions/upload-artifact@v3 + with: + name: nyanimedb-frontend.tar.gz + path: modules/frontend/nyanimedb-frontend.tar.gz + + # Build Docker images - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - # Build application - - name: Build Go app - run: | - cd modules/server - go mod tidy - go build -o nyanimedb . - - - name: Upload built application to artifactory - uses: actions/upload-artifact@v3 - with: - name: nyanimedb - path: modules/server/nyanimedb - - # Build Docker image - name: Login to Docker Hub uses: docker/login-action@v3 with: @@ -44,13 +65,21 @@ jobs: username: ${{ secrets.REGISTRY_USERNAME }} password: ${{ secrets.REGISTRY_TOKEN }} - - name: Build and push + - name: Build and push backend image uses: docker/build-push-action@v6 with: - context: ./modules/server - file: Dockerfiles/Dockerfile_server + file: Dockerfiles/Dockerfile_backend push: true - tags: meowgit.nekoea.red/nihonium/nyanimedb:latest + tags: meowgit.nekoea.red/nihonium/nyanimedb-backend:latest + + - name: Build and push frontend image + uses: docker/build-push-action@v6 + with: + build-args: + --build-arg VITE_BACKEND_API_BASE_URL=${BACKEND_API_BASE_URL} + file: Dockerfiles/Dockerfile_frontend + push: true + tags: meowgit.nekoea.red/nihonium/nyanimedb-frontend:latest deploy: runs-on: self-hosted From cfc753bf845e235afa21cec21d7ff8b196a04c39 Mon Sep 17 00:00:00 2001 From: nihonium Date: Thu, 9 Oct 2025 15:28:25 +0300 Subject: [PATCH 06/80] fix: frontend build --- .forgejo/workflows/build-and-deploy.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/build-and-deploy.yml b/.forgejo/workflows/build-and-deploy.yml index 5e11166..99fd894 100644 --- a/.forgejo/workflows/build-and-deploy.yml +++ b/.forgejo/workflows/build-and-deploy.yml @@ -26,6 +26,7 @@ jobs: - name: Build Go app run: | cd modules/backend + go mod tidy go build -o nyanimedb . tar -czvf nyanimedb-backend.tar.gz nyanimedb templates/ @@ -38,13 +39,14 @@ jobs: # Build frontend - uses: actions/setup-node@v5 with: - node-version-file: 'modules/frontend/package.json' - cache: 'npm' + node-version-file: modules/frontend/package.json + cache: npm cache-dependency-path: modules/frontend/package-lock.json - name: Build frontend run: | cd modules/frontend + npm install npm run build tar -czvf nyanimedb-frontend.tar.gz dist/ From ed965e9c21c9513a27a8fdab65dde59036c5ce4c Mon Sep 17 00:00:00 2001 From: nihonium Date: Thu, 9 Oct 2025 15:33:49 +0300 Subject: [PATCH 07/80] fix: backend Dockerfile paths --- Dockerfiles/Dockerfile_backend | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfiles/Dockerfile_backend b/Dockerfiles/Dockerfile_backend index 0161a77..27c9212 100644 --- a/Dockerfiles/Dockerfile_backend +++ b/Dockerfiles/Dockerfile_backend @@ -1,7 +1,7 @@ FROM ubuntu:22.04 WORKDIR /app -COPY --chmod=755 modules/server/nyanimedb /app -COPY modules/server/templates /app/templates +COPY --chmod=755 modules/backend/nyanimedb /app +COPY modules/backend/templates /app/templates EXPOSE 8080 ENTRYPOINT ["/app/nyanimedb"] \ No newline at end of file From a7e99b222db793f5fb84f5cb6c11af9b135ee7eb Mon Sep 17 00:00:00 2001 From: nihonium Date: Thu, 9 Oct 2025 15:40:17 +0300 Subject: [PATCH 08/80] fix: docker build context --- .forgejo/workflows/build-and-deploy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.forgejo/workflows/build-and-deploy.yml b/.forgejo/workflows/build-and-deploy.yml index 99fd894..2b986b8 100644 --- a/.forgejo/workflows/build-and-deploy.yml +++ b/.forgejo/workflows/build-and-deploy.yml @@ -70,6 +70,7 @@ jobs: - name: Build and push backend image uses: docker/build-push-action@v6 with: + context: . file: Dockerfiles/Dockerfile_backend push: true tags: meowgit.nekoea.red/nihonium/nyanimedb-backend:latest @@ -77,6 +78,7 @@ jobs: - name: Build and push frontend image uses: docker/build-push-action@v6 with: + context: . build-args: --build-arg VITE_BACKEND_API_BASE_URL=${BACKEND_API_BASE_URL} file: Dockerfiles/Dockerfile_frontend From 6a352803d4a77035f64ef9e7f311c9ca2ea645c4 Mon Sep 17 00:00:00 2001 From: nihonium Date: Thu, 9 Oct 2025 15:52:10 +0300 Subject: [PATCH 09/80] fix: frontend build args --- .forgejo/workflows/build-and-deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/build-and-deploy.yml b/.forgejo/workflows/build-and-deploy.yml index 2b986b8..b641123 100644 --- a/.forgejo/workflows/build-and-deploy.yml +++ b/.forgejo/workflows/build-and-deploy.yml @@ -79,8 +79,8 @@ jobs: uses: docker/build-push-action@v6 with: context: . - build-args: - --build-arg VITE_BACKEND_API_BASE_URL=${BACKEND_API_BASE_URL} + build-args: | + VITE_BACKEND_API_BASE_URL=${{ env.BACKEND_API_BASE_URL }} file: Dockerfiles/Dockerfile_frontend push: true tags: meowgit.nekoea.red/nihonium/nyanimedb-frontend:latest From 17217cfa6c00462985e79b0b1142cd3172ba2f76 Mon Sep 17 00:00:00 2001 From: nihonium Date: Thu, 9 Oct 2025 15:55:11 +0300 Subject: [PATCH 10/80] fix: removed frontend build args --- .forgejo/workflows/build-and-deploy.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.forgejo/workflows/build-and-deploy.yml b/.forgejo/workflows/build-and-deploy.yml index b641123..c4a09c2 100644 --- a/.forgejo/workflows/build-and-deploy.yml +++ b/.forgejo/workflows/build-and-deploy.yml @@ -10,7 +10,7 @@ jobs: build: runs-on: ubuntu-latest env: - BACKEND_API_BASE_URL: ${{ vars.BACKEND_API_BASE_URL }} + VITE_BACKEND_API_BASE_URL: ${{ vars.BACKEND_API_BASE_URL }} steps: - name: Checkout code uses: actions/checkout@v4 @@ -79,8 +79,6 @@ jobs: uses: docker/build-push-action@v6 with: context: . - build-args: | - VITE_BACKEND_API_BASE_URL=${{ env.BACKEND_API_BASE_URL }} file: Dockerfiles/Dockerfile_frontend push: true tags: meowgit.nekoea.red/nihonium/nyanimedb-frontend:latest From a2c6074b3d4369e3f045dc193eced710d1add30b Mon Sep 17 00:00:00 2001 From: nihonium Date: Thu, 9 Oct 2025 16:10:47 +0300 Subject: [PATCH 11/80] fix: moved env to container for build job --- .forgejo/workflows/build-and-deploy.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/build-and-deploy.yml b/.forgejo/workflows/build-and-deploy.yml index c4a09c2..119822a 100644 --- a/.forgejo/workflows/build-and-deploy.yml +++ b/.forgejo/workflows/build-and-deploy.yml @@ -9,8 +9,9 @@ on: jobs: build: runs-on: ubuntu-latest - env: - VITE_BACKEND_API_BASE_URL: ${{ vars.BACKEND_API_BASE_URL }} + container: + env: + VITE_BACKEND_API_BASE_URL: ${{ vars.BACKEND_API_BASE_URL }} steps: - name: Checkout code uses: actions/checkout@v4 From 78680c6425f489fb2da39ab0626762cb2336232f Mon Sep 17 00:00:00 2001 From: nihonium Date: Thu, 9 Oct 2025 16:20:25 +0300 Subject: [PATCH 12/80] fix: moved env to task for build job --- .forgejo/workflows/build-and-deploy.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/build-and-deploy.yml b/.forgejo/workflows/build-and-deploy.yml index 119822a..adc8808 100644 --- a/.forgejo/workflows/build-and-deploy.yml +++ b/.forgejo/workflows/build-and-deploy.yml @@ -9,9 +9,6 @@ on: jobs: build: runs-on: ubuntu-latest - container: - env: - VITE_BACKEND_API_BASE_URL: ${{ vars.BACKEND_API_BASE_URL }} steps: - name: Checkout code uses: actions/checkout@v4 @@ -45,6 +42,8 @@ jobs: cache-dependency-path: modules/frontend/package-lock.json - name: Build frontend + env: + VITE_BACKEND_API_BASE_URL: ${{ vars.BACKEND_API_BASE_URL }} run: | cd modules/frontend npm install From 1e834ba69cf1beed1f6fc8aaae915b1a2a8f7dd4 Mon Sep 17 00:00:00 2001 From: nihonium Date: Thu, 9 Oct 2025 16:28:27 +0300 Subject: [PATCH 13/80] tmp: add echo env var --- .forgejo/workflows/build-and-deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.forgejo/workflows/build-and-deploy.yml b/.forgejo/workflows/build-and-deploy.yml index adc8808..744e50a 100644 --- a/.forgejo/workflows/build-and-deploy.yml +++ b/.forgejo/workflows/build-and-deploy.yml @@ -45,6 +45,7 @@ jobs: env: VITE_BACKEND_API_BASE_URL: ${{ vars.BACKEND_API_BASE_URL }} run: | + echo "VITE_BACKEND_API_BASE_URL: $VITE_BACKEND_API_BASE_URL" cd modules/frontend npm install npm run build From 35fa8dd0051c6ce1f3bd4fa28c73fcf9925df5f9 Mon Sep 17 00:00:00 2001 From: nihonium Date: Thu, 9 Oct 2025 17:13:45 +0300 Subject: [PATCH 14/80] fix: use .env for vite build --- .forgejo/workflows/build-and-deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/build-and-deploy.yml b/.forgejo/workflows/build-and-deploy.yml index 744e50a..05e65e2 100644 --- a/.forgejo/workflows/build-and-deploy.yml +++ b/.forgejo/workflows/build-and-deploy.yml @@ -42,10 +42,10 @@ jobs: cache-dependency-path: modules/frontend/package-lock.json - name: Build frontend - env: - VITE_BACKEND_API_BASE_URL: ${{ vars.BACKEND_API_BASE_URL }} + # env: + # VITE_BACKEND_API_BASE_URL: ${{ vars.BACKEND_API_BASE_URL }} run: | - echo "VITE_BACKEND_API_BASE_URL: $VITE_BACKEND_API_BASE_URL" + echo "VITE_BACKEND_API_BASE_URL=${{ vars.BACKEND_API_BASE_URL }}" > .env cd modules/frontend npm install npm run build From 9091d11810e2730e97a4ea6ffe815319e61b6874 Mon Sep 17 00:00:00 2001 From: nihonium Date: Thu, 9 Oct 2025 17:23:33 +0300 Subject: [PATCH 15/80] fix: writing env var to .env --- .forgejo/workflows/build-and-deploy.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.forgejo/workflows/build-and-deploy.yml b/.forgejo/workflows/build-and-deploy.yml index 05e65e2..ecf0ea0 100644 --- a/.forgejo/workflows/build-and-deploy.yml +++ b/.forgejo/workflows/build-and-deploy.yml @@ -42,11 +42,9 @@ jobs: cache-dependency-path: modules/frontend/package-lock.json - name: Build frontend - # env: - # VITE_BACKEND_API_BASE_URL: ${{ vars.BACKEND_API_BASE_URL }} run: | - echo "VITE_BACKEND_API_BASE_URL=${{ vars.BACKEND_API_BASE_URL }}" > .env cd modules/frontend + echo "VITE_BACKEND_API_BASE_URL=${{ vars.BACKEND_API_BASE_URL }}" > .env npm install npm run build tar -czvf nyanimedb-frontend.tar.gz dist/ From c1e8d52aea347a6159b1fff3a34362a48967cd5b Mon Sep 17 00:00:00 2001 From: nihonium Date: Thu, 9 Oct 2025 17:31:40 +0300 Subject: [PATCH 16/80] fix: repull docker images before deploying --- .forgejo/workflows/build-and-deploy.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/build-and-deploy.yml b/.forgejo/workflows/build-and-deploy.yml index ecf0ea0..d48789c 100644 --- a/.forgejo/workflows/build-and-deploy.yml +++ b/.forgejo/workflows/build-and-deploy.yml @@ -42,9 +42,10 @@ jobs: cache-dependency-path: modules/frontend/package-lock.json - name: Build frontend + env: + VITE_BACKEND_API_BASE_URL: ${{ vars.BACKEND_API_BASE_URL }} run: | cd modules/frontend - echo "VITE_BACKEND_API_BASE_URL=${{ vars.BACKEND_API_BASE_URL }}" > .env npm install npm run build tar -czvf nyanimedb-frontend.tar.gz dist/ @@ -101,4 +102,5 @@ jobs: run: | cd deploy docker compose down || true + docker-compose pull || true docker compose up -d From 11d073f2754070b7642079a8b05b6b23f584e7e1 Mon Sep 17 00:00:00 2001 From: nihonium Date: Thu, 9 Oct 2025 17:37:10 +0300 Subject: [PATCH 17/80] fix: docker-compose -> docker compose --- .forgejo/workflows/build-and-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build-and-deploy.yml b/.forgejo/workflows/build-and-deploy.yml index d48789c..84c69c3 100644 --- a/.forgejo/workflows/build-and-deploy.yml +++ b/.forgejo/workflows/build-and-deploy.yml @@ -102,5 +102,5 @@ jobs: run: | cd deploy docker compose down || true - docker-compose pull || true + docker compose pull || true docker compose up -d From cbbb135a72039360ea9b1abb1ee05b7af6249fa4 Mon Sep 17 00:00:00 2001 From: Iron_Felix Date: Thu, 9 Oct 2025 22:27:54 +0300 Subject: [PATCH 18/80] feat: first sql-scheme added --- modules/sql/scheme.sql | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 modules/sql/scheme.sql diff --git a/modules/sql/scheme.sql b/modules/sql/scheme.sql new file mode 100644 index 0000000..8e10425 --- /dev/null +++ b/modules/sql/scheme.sql @@ -0,0 +1,10 @@ +CREATE TYPE anime_status AS ENUM ('finished', 'planned', 'dropped', 'in-progress'); + +CREATE TABLE usertitles ( + usertitle_id serial PRIMARY KEY, + user_id int NOT NULL, + title_id int NOT NULL, + status anime_status NOT NULL, + rate int CHECK (rate BETWEEN 0 AND 10), + review_id int, +); From 8b317ae6550be44b373aabb990d5257953b2684c Mon Sep 17 00:00:00 2001 From: Iron_Felix Date: Fri, 10 Oct 2025 01:12:35 +0300 Subject: [PATCH 19/80] feat: added all table to sql scheme --- modules/sql/scheme.sql | 99 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 92 insertions(+), 7 deletions(-) diff --git a/modules/sql/scheme.sql b/modules/sql/scheme.sql index 8e10425..7ae4ca1 100644 --- a/modules/sql/scheme.sql +++ b/modules/sql/scheme.sql @@ -1,10 +1,95 @@ -CREATE TYPE anime_status AS ENUM ('finished', 'planned', 'dropped', 'in-progress'); +-- TODO: +-- title table triggers +-- maybe jsonb constraints +-- actions (delete) +BEGIN; + +CREATE TYPE usertitle_status_t AS ENUM ('finished', 'planned', 'dropped', 'in-progress'); +CREATE TYPE storage_type_t AS ENUM ('local', 's3'); +CREATE TYPE title_status_t AS ENUM ('finished', 'ongoing', 'planned'); +CREATE TYPE release_season_t AS ENUM ('winter', 'spring', 'summer', 'fall'); CREATE TABLE usertitles ( - usertitle_id serial PRIMARY KEY, - user_id int NOT NULL, - title_id int NOT NULL, - status anime_status NOT NULL, - rate int CHECK (rate BETWEEN 0 AND 10), - review_id int, + usertitle_id serial PRIMARY KEY, + user_id int NOT NULL REFERENCES users, + title_id int NOT NULL REFERENCES titles, + status usertitle_status_t NOT NULL, + rate int CHECK (rate > 0 AND rate <= 10), + review_id int REFERENCES reviews ); + +CREATE TABLE users ( + user_id serial PRIMARY KEY, + avatar_id int REFERENCES images (image_id), + nickname varchar(16) NOT NULL CHECK (nickname ~ '^[a-zA-Z0-9_-]+$'), + disp_name varchar(32), + user_desc varchar(512), + creation_date timestamp NOT NULL +); + +CREATE TABLE images ( + image_id serial PRIMARY KEY, + storage_type storage_type_t NOT NULL, + image_path varchar(256) UNIQUE NOT NULL +); + +CREATE TABLE reviews ( + review_id serial PRIMARY KEY, + user_id int NOT NULL REFERENCES users, + title_id int NOT NULL REFERENCES titles, + image_ids int[], + review_text text NOT NULL, + creation_date timestamp NOT NULL +); + +CREATE TABLE tags ( + tag_id serial PRIMARY KEY, + tag_names jsonb NOT NULL --mb constraints +); + +CREATE TABLE titles ( + title_id serial PRIMARY KEY, + title_names jsonb NOT NULL, + studio_id int NOT NULL REFERENCES studios, + poster_id int REFERENCES images (image_id), + signal_ids int[] NOT NULL, + title_status title_status_t NOT NULL, + rating float CHECK (rating > 0 AND rating <= 10), --by trigger + rating_count int CHECK (rating_count >= 0), --by trigger + release_year int CHECK (release_year >= 1900), + release_season release_season_t, + season int CHECK (season >= 0), + episodes_aired int CHECK (episodes_aired >= 0), + episodes_all int CHECK (episodes_all >= 0), + episodes_len jsonb, + CHECK ((episodes_aired IS NULL AND episodes_all IS NULL) + OR (episodes_aired IS NOT NULL AND episodes_all IS NOT NULL + AND episodes_aired <= episodes_all)) +); + +CREATE TABLE title_tags ( + PRIMARY KEY (title_id, tag_id), + title_id int NOT NULL REFERENCES titles, + tag_id int NOT NULL REFERENCES tags +); + +CREATE TABLE studios ( + studio_id serial PRIMARY KEY, + studio_name varchar(64) UNIQUE, + illust_id int REFERENCES images (image_id), + studio_desc text +); + +CREATE TABLE signals ( + signal_id serial PRIMARY KEY, + raw_data jsonb NOT NULL, + provider_id int NOT NULL REFERENCES providers, + dirty bool NOT NULL +); + +CREATE TABLE providers ( + provider_id serial PRIMARY KEY, + provider_name varchar(64) NOT NULL +); + +COMMIT; \ No newline at end of file From 18722db340368f9999d4aba769c4f854ff9725f7 Mon Sep 17 00:00:00 2001 From: Iron_Felix Date: Fri, 10 Oct 2025 01:23:09 +0300 Subject: [PATCH 20/80] fix: topology sort for tables (references) --- modules/sql/scheme.sql | 74 +++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/modules/sql/scheme.sql b/modules/sql/scheme.sql index 7ae4ca1..bf946a5 100644 --- a/modules/sql/scheme.sql +++ b/modules/sql/scheme.sql @@ -9,13 +9,20 @@ CREATE TYPE storage_type_t AS ENUM ('local', 's3'); CREATE TYPE title_status_t AS ENUM ('finished', 'ongoing', 'planned'); CREATE TYPE release_season_t AS ENUM ('winter', 'spring', 'summer', 'fall'); -CREATE TABLE usertitles ( - usertitle_id serial PRIMARY KEY, - user_id int NOT NULL REFERENCES users, - title_id int NOT NULL REFERENCES titles, - status usertitle_status_t NOT NULL, - rate int CHECK (rate > 0 AND rate <= 10), - review_id int REFERENCES reviews +CREATE TABLE providers ( + provider_id serial PRIMARY KEY, + provider_name varchar(64) NOT NULL +); + +CREATE TABLE tags ( + tag_id serial PRIMARY KEY, + tag_names jsonb NOT NULL --mb constraints +); + +CREATE TABLE images ( + image_id serial PRIMARY KEY, + storage_type storage_type_t NOT NULL, + image_path varchar(256) UNIQUE NOT NULL ); CREATE TABLE users ( @@ -27,24 +34,11 @@ CREATE TABLE users ( creation_date timestamp NOT NULL ); -CREATE TABLE images ( - image_id serial PRIMARY KEY, - storage_type storage_type_t NOT NULL, - image_path varchar(256) UNIQUE NOT NULL -); - -CREATE TABLE reviews ( - review_id serial PRIMARY KEY, - user_id int NOT NULL REFERENCES users, - title_id int NOT NULL REFERENCES titles, - image_ids int[], - review_text text NOT NULL, - creation_date timestamp NOT NULL -); - -CREATE TABLE tags ( - tag_id serial PRIMARY KEY, - tag_names jsonb NOT NULL --mb constraints +CREATE TABLE studios ( + studio_id serial PRIMARY KEY, + studio_name varchar(64) UNIQUE, + illust_id int REFERENCES images (image_id), + studio_desc text ); CREATE TABLE titles ( @@ -67,19 +61,30 @@ CREATE TABLE titles ( AND episodes_aired <= episodes_all)) ); +CREATE TABLE reviews ( + review_id serial PRIMARY KEY, + user_id int NOT NULL REFERENCES users, + title_id int NOT NULL REFERENCES titles, + image_ids int[], + review_text text NOT NULL, + creation_date timestamp NOT NULL +); + +CREATE TABLE usertitles ( + usertitle_id serial PRIMARY KEY, + user_id int NOT NULL REFERENCES users, + title_id int NOT NULL REFERENCES titles, + status usertitle_status_t NOT NULL, + rate int CHECK (rate > 0 AND rate <= 10), + review_id int REFERENCES reviews +); + CREATE TABLE title_tags ( PRIMARY KEY (title_id, tag_id), title_id int NOT NULL REFERENCES titles, tag_id int NOT NULL REFERENCES tags ); -CREATE TABLE studios ( - studio_id serial PRIMARY KEY, - studio_name varchar(64) UNIQUE, - illust_id int REFERENCES images (image_id), - studio_desc text -); - CREATE TABLE signals ( signal_id serial PRIMARY KEY, raw_data jsonb NOT NULL, @@ -87,9 +92,4 @@ CREATE TABLE signals ( dirty bool NOT NULL ); -CREATE TABLE providers ( - provider_id serial PRIMARY KEY, - provider_name varchar(64) NOT NULL -); - COMMIT; \ No newline at end of file From de1479c995ce3e3e12bed50dee8e568b1105afbd Mon Sep 17 00:00:00 2001 From: nihonium Date: Fri, 10 Oct 2025 13:51:40 +0300 Subject: [PATCH 21/80] feat: run cicd on dev branch push --- .forgejo/workflows/build-and-deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.forgejo/workflows/build-and-deploy.yml b/.forgejo/workflows/build-and-deploy.yml index 84c69c3..2bc0106 100644 --- a/.forgejo/workflows/build-and-deploy.yml +++ b/.forgejo/workflows/build-and-deploy.yml @@ -5,6 +5,7 @@ on: branches: - master - cicd + - dev jobs: build: From 29c034bd1aed7e8a36541f809f1e77bdc2798c60 Mon Sep 17 00:00:00 2001 From: Iron_Felix Date: Fri, 10 Oct 2025 21:36:53 +0300 Subject: [PATCH 22/80] feat: passhash field added to users table --- modules/sql/scheme.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/sql/scheme.sql b/modules/sql/scheme.sql index bf946a5..a3e4e5c 100644 --- a/modules/sql/scheme.sql +++ b/modules/sql/scheme.sql @@ -28,6 +28,7 @@ CREATE TABLE images ( CREATE TABLE users ( user_id serial PRIMARY KEY, avatar_id int REFERENCES images (image_id), + passhash text NOT NULL, nickname varchar(16) NOT NULL CHECK (nickname ~ '^[a-zA-Z0-9_-]+$'), disp_name varchar(32), user_desc varchar(512), From 2d2d97ec277319527fe1f5b4749f9ea7f82e220b Mon Sep 17 00:00:00 2001 From: Iron_Felix Date: Fri, 10 Oct 2025 22:03:10 +0300 Subject: [PATCH 23/80] feat: field mail added in user table --- modules/sql/scheme.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/sql/scheme.sql b/modules/sql/scheme.sql index a3e4e5c..4712075 100644 --- a/modules/sql/scheme.sql +++ b/modules/sql/scheme.sql @@ -29,6 +29,7 @@ CREATE TABLE users ( user_id serial PRIMARY KEY, avatar_id int REFERENCES images (image_id), passhash text NOT NULL, + mail varchar(64) CHECK ((mail ~ '[a-zA-Z0-9._-]+@[a-zA-Z0-9._-]+\.[a-zA-Z0-9_-]+'), nickname varchar(16) NOT NULL CHECK (nickname ~ '^[a-zA-Z0-9_-]+$'), disp_name varchar(32), user_desc varchar(512), From 31a09037cb1e8a53766deeef924b6e9e91358f43 Mon Sep 17 00:00:00 2001 From: Iron_Felix Date: Sat, 11 Oct 2025 02:11:06 +0300 Subject: [PATCH 24/80] feat: sql queries were written and used to generate queries.go --- modules/sql/go.mod | 3 + modules/sql/query.sql | 142 +++++++ modules/sql/scheme.sql | 2 +- modules/sql/sqlc-generate.yaml | 13 + modules/sql/sqlc.yaml | 14 + modules/sql/sqlc/db.go | 32 ++ modules/sql/sqlc/models.go | 266 ++++++++++++ modules/sql/sqlc/query.sql.go | 712 +++++++++++++++++++++++++++++++++ 8 files changed, 1183 insertions(+), 1 deletion(-) create mode 100644 modules/sql/go.mod create mode 100644 modules/sql/query.sql create mode 100644 modules/sql/sqlc-generate.yaml create mode 100644 modules/sql/sqlc.yaml create mode 100644 modules/sql/sqlc/db.go create mode 100644 modules/sql/sqlc/models.go create mode 100644 modules/sql/sqlc/query.sql.go diff --git a/modules/sql/go.mod b/modules/sql/go.mod new file mode 100644 index 0000000..9508b28 --- /dev/null +++ b/modules/sql/go.mod @@ -0,0 +1,3 @@ +module tutorial.sqlc.dev/app + +go 1.25.2 diff --git a/modules/sql/query.sql b/modules/sql/query.sql new file mode 100644 index 0000000..4b85e7e --- /dev/null +++ b/modules/sql/query.sql @@ -0,0 +1,142 @@ +-- name: GetImageByID :one +SELECT image_id, storage_type, image_path +FROM images +WHERE image_id = $1; + +-- name: CreateImage :one +INSERT INTO images (storage_type, image_path) +VALUES ($1, $2) +RETURNING image_id, storage_type, image_path; + +-- name: GetUserByID :one +SELECT user_id, avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date +FROM users +WHERE user_id = $1; + +-- name: ListUsers :many +SELECT user_id, avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date +FROM users +ORDER BY user_id +LIMIT $1 OFFSET $2; + +-- name: CreateUser :one +INSERT INTO users (avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date) +VALUES ($1, $2, $3, $4, $5, $6, $7) +RETURNING user_id, avatar_id, nickname, disp_name, user_desc, creation_date; + +-- name: UpdateUser :one +UPDATE users +SET + avatar_id = COALESCE(sqlc.narg('avatar_id'), avatar_id), + disp_name = COALESCE(sqlc.narg('disp_name'), disp_name), + user_desc = COALESCE(sqlc.narg('user_desc'), user_desc), + passhash = COALESCE(sqlc.narg('passhash'), passhash), +WHERE user_id = sqlc.arg('user_id') +RETURNING user_id, avatar_id, nickname, disp_name, user_desc, creation_date; + +-- name: DeleteUser :exec +DELETE FROM users +WHERE user_id = $1; + +-- name: GetTitleByID :one +SELECT title_id, title_names, studio_id, poster_id, signal_ids, + title_status, rating, rating_count, release_year, release_season, + season, episodes_aired, episodes_all, episodes_len +FROM titles +WHERE title_id = $1; + +-- name: ListTitles :many +SELECT title_id, title_names, studio_id, poster_id, signal_ids, + title_status, rating, rating_count, release_year, release_season, + season, episodes_aired, episodes_all, episodes_len +FROM titles +ORDER BY title_id +LIMIT $1 OFFSET $2; + +-- name: UpdateTitle :one +UPDATE titles +SET + title_names = COALESCE(sqlc.narg('title_names'), title_names), + studio_id = COALESCE(sqlc.narg('studio_id'), studio_id), + poster_id = COALESCE(sqlc.narg('poster_id'), poster_id), + signal_ids = COALESCE(sqlc.narg('signal_ids'), signal_ids), + title_status = COALESCE(sqlc.narg('title_status'), title_status), + release_year = COALESCE(sqlc.narg('release_year'), release_year), + release_season = COALESCE(sqlc.narg('release_season'), release_season), + episodes_aired = COALESCE(sqlc.narg('episodes_aired'), episodes_aired), + episodes_all = COALESCE(sqlc.narg('episodes_all'), episodes_all), + episodes_len = COALESCE(sqlc.narg('episodes_len'), episodes_len) +WHERE title_id = sqlc.arg('title_id') +RETURNING *; + +-- name: GetReviewByID :one +SELECT review_id, user_id, title_id, image_ids, review_text, creation_date +FROM reviews +WHERE review_id = $1; + +-- name: CreateReview :one +INSERT INTO reviews (user_id, title_id, image_ids, review_text, creation_date) +VALUES ($1, $2, $3, $4, $5) +RETURNING review_id, user_id, title_id, image_ids, review_text, creation_date; + +-- name: UpdateReview :one +UPDATE reviews +SET + image_ids = COALESCE(sqlc.narg('image_ids'), image_ids), + review_text = COALESCE(sqlc.narg('review_text'), review_text) +WHERE review_id = sqlc.arg('review_id') +RETURNING *; + +-- name: DeleteReview :exec +DELETE FROM reviews +WHERE review_id = $1; + +-- name: ListReviewsByTitle :many +SELECT review_id, user_id, title_id, image_ids, review_text, creation_date +FROM reviews +WHERE title_id = $1 +ORDER BY creation_date DESC +LIMIT $2 OFFSET $3; + +-- name: ListReviewsByUser :many +SELECT review_id, user_id, title_id, image_ids, review_text, creation_date +FROM reviews +WHERE user_id = $1 +ORDER BY creation_date DESC +LIMIT $2 OFFSET $3; + +-- name: GetUserTitle :one +SELECT usertitle_id, user_id, title_id, status, rate, review_id +FROM usertitles +WHERE user_id = $1 AND title_id = $2; + +-- name: ListUserTitles :many +SELECT usertitle_id, user_id, title_id, status, rate, review_id +FROM usertitles +WHERE user_id = $1 +ORDER BY usertitle_id +LIMIT $2 OFFSET $3; + +-- name: CreateUserTitle :one +INSERT INTO usertitles (user_id, title_id, status, rate, review_id) +VALUES ($1, $2, $3, $4, $5) +RETURNING usertitle_id, user_id, title_id, status, rate, review_id; + +-- name: UpdateUserTitle :one +UPDATE usertitles +SET + status = COALESCE(sqlc.narg('status'), status), + rate = COALESCE(sqlc.narg('rate'), rate), + review_id = COALESCE(sqlc.narg('review_id'), review_id) +WHERE user_id = $1 AND title_id = $2 +RETURNING *; + +-- name: DeleteUserTitle :exec +DELETE FROM usertitles +WHERE user_id = $1 AND ($2::int IS NULL OR title_id = $2); + +-- name: ListTags :many +SELECT tag_id, tag_names +FROM tags +ORDER BY tag_id +LIMIT $1 OFFSET $2; \ No newline at end of file diff --git a/modules/sql/scheme.sql b/modules/sql/scheme.sql index 4712075..df84550 100644 --- a/modules/sql/scheme.sql +++ b/modules/sql/scheme.sql @@ -29,7 +29,7 @@ CREATE TABLE users ( user_id serial PRIMARY KEY, avatar_id int REFERENCES images (image_id), passhash text NOT NULL, - mail varchar(64) CHECK ((mail ~ '[a-zA-Z0-9._-]+@[a-zA-Z0-9._-]+\.[a-zA-Z0-9_-]+'), + mail varchar(64) CHECK (mail ~ '[a-zA-Z0-9._-]+@[a-zA-Z0-9._-]+\.[a-zA-Z0-9_-]+'), nickname varchar(16) NOT NULL CHECK (nickname ~ '^[a-zA-Z0-9_-]+$'), disp_name varchar(32), user_desc varchar(512), diff --git a/modules/sql/sqlc-generate.yaml b/modules/sql/sqlc-generate.yaml new file mode 100644 index 0000000..8a625de --- /dev/null +++ b/modules/sql/sqlc-generate.yaml @@ -0,0 +1,13 @@ +version: "2" +sql: + - engine: "postgresql" + queries: "query.sql" + schema: "scheme.sql" + gen: + go: + package: "nyanimedb.backend" + out: "sqlc" + sql_package: "pgx/v5" + sql_driver: "github.com/lib/pq" + emit_db_tags: true + emit_exact_table_names: true \ No newline at end of file diff --git a/modules/sql/sqlc.yaml b/modules/sql/sqlc.yaml new file mode 100644 index 0000000..079626a --- /dev/null +++ b/modules/sql/sqlc.yaml @@ -0,0 +1,14 @@ +version: "2" +sql: + - engine: "postgresql" + queries: "query.sql" + schema: "scheme.sql" + gen: + go: + package: "nyanimedb_backend" + out: "sqlc" + sql_package: "pgx/v5" + sql_driver: "github.com/lib/pq" + emit_db_tags: true + emit_exact_table_names: true + emit_json_tags: true \ No newline at end of file diff --git a/modules/sql/sqlc/db.go b/modules/sql/sqlc/db.go new file mode 100644 index 0000000..cdbc865 --- /dev/null +++ b/modules/sql/sqlc/db.go @@ -0,0 +1,32 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.30.0 + +package nyanimedb_backend + +import ( + "context" + + "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/pgconn" +) + +type DBTX interface { + Exec(context.Context, string, ...interface{}) (pgconn.CommandTag, error) + Query(context.Context, string, ...interface{}) (pgx.Rows, error) + QueryRow(context.Context, string, ...interface{}) pgx.Row +} + +func New(db DBTX) *Queries { + return &Queries{db: db} +} + +type Queries struct { + db DBTX +} + +func (q *Queries) WithTx(tx pgx.Tx) *Queries { + return &Queries{ + db: tx, + } +} diff --git a/modules/sql/sqlc/models.go b/modules/sql/sqlc/models.go new file mode 100644 index 0000000..e7aeb3c --- /dev/null +++ b/modules/sql/sqlc/models.go @@ -0,0 +1,266 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.30.0 + +package nyanimedb_backend + +import ( + "database/sql/driver" + "fmt" + + "github.com/jackc/pgx/v5/pgtype" +) + +type ReleaseSeasonT string + +const ( + ReleaseSeasonTWinter ReleaseSeasonT = "winter" + ReleaseSeasonTSpring ReleaseSeasonT = "spring" + ReleaseSeasonTSummer ReleaseSeasonT = "summer" + ReleaseSeasonTFall ReleaseSeasonT = "fall" +) + +func (e *ReleaseSeasonT) Scan(src interface{}) error { + switch s := src.(type) { + case []byte: + *e = ReleaseSeasonT(s) + case string: + *e = ReleaseSeasonT(s) + default: + return fmt.Errorf("unsupported scan type for ReleaseSeasonT: %T", src) + } + return nil +} + +type NullReleaseSeasonT struct { + ReleaseSeasonT ReleaseSeasonT `json:"release_season_t"` + Valid bool `json:"valid"` // Valid is true if ReleaseSeasonT is not NULL +} + +// Scan implements the Scanner interface. +func (ns *NullReleaseSeasonT) Scan(value interface{}) error { + if value == nil { + ns.ReleaseSeasonT, ns.Valid = "", false + return nil + } + ns.Valid = true + return ns.ReleaseSeasonT.Scan(value) +} + +// Value implements the driver Valuer interface. +func (ns NullReleaseSeasonT) Value() (driver.Value, error) { + if !ns.Valid { + return nil, nil + } + return string(ns.ReleaseSeasonT), nil +} + +type StorageTypeT string + +const ( + StorageTypeTLocal StorageTypeT = "local" + StorageTypeTS3 StorageTypeT = "s3" +) + +func (e *StorageTypeT) Scan(src interface{}) error { + switch s := src.(type) { + case []byte: + *e = StorageTypeT(s) + case string: + *e = StorageTypeT(s) + default: + return fmt.Errorf("unsupported scan type for StorageTypeT: %T", src) + } + return nil +} + +type NullStorageTypeT struct { + StorageTypeT StorageTypeT `json:"storage_type_t"` + Valid bool `json:"valid"` // Valid is true if StorageTypeT is not NULL +} + +// Scan implements the Scanner interface. +func (ns *NullStorageTypeT) Scan(value interface{}) error { + if value == nil { + ns.StorageTypeT, ns.Valid = "", false + return nil + } + ns.Valid = true + return ns.StorageTypeT.Scan(value) +} + +// Value implements the driver Valuer interface. +func (ns NullStorageTypeT) Value() (driver.Value, error) { + if !ns.Valid { + return nil, nil + } + return string(ns.StorageTypeT), nil +} + +type TitleStatusT string + +const ( + TitleStatusTFinished TitleStatusT = "finished" + TitleStatusTOngoing TitleStatusT = "ongoing" + TitleStatusTPlanned TitleStatusT = "planned" +) + +func (e *TitleStatusT) Scan(src interface{}) error { + switch s := src.(type) { + case []byte: + *e = TitleStatusT(s) + case string: + *e = TitleStatusT(s) + default: + return fmt.Errorf("unsupported scan type for TitleStatusT: %T", src) + } + return nil +} + +type NullTitleStatusT struct { + TitleStatusT TitleStatusT `json:"title_status_t"` + Valid bool `json:"valid"` // Valid is true if TitleStatusT is not NULL +} + +// Scan implements the Scanner interface. +func (ns *NullTitleStatusT) Scan(value interface{}) error { + if value == nil { + ns.TitleStatusT, ns.Valid = "", false + return nil + } + ns.Valid = true + return ns.TitleStatusT.Scan(value) +} + +// Value implements the driver Valuer interface. +func (ns NullTitleStatusT) Value() (driver.Value, error) { + if !ns.Valid { + return nil, nil + } + return string(ns.TitleStatusT), nil +} + +type UsertitleStatusT string + +const ( + UsertitleStatusTFinished UsertitleStatusT = "finished" + UsertitleStatusTPlanned UsertitleStatusT = "planned" + UsertitleStatusTDropped UsertitleStatusT = "dropped" + UsertitleStatusTInProgress UsertitleStatusT = "in-progress" +) + +func (e *UsertitleStatusT) Scan(src interface{}) error { + switch s := src.(type) { + case []byte: + *e = UsertitleStatusT(s) + case string: + *e = UsertitleStatusT(s) + default: + return fmt.Errorf("unsupported scan type for UsertitleStatusT: %T", src) + } + return nil +} + +type NullUsertitleStatusT struct { + UsertitleStatusT UsertitleStatusT `json:"usertitle_status_t"` + Valid bool `json:"valid"` // Valid is true if UsertitleStatusT is not NULL +} + +// Scan implements the Scanner interface. +func (ns *NullUsertitleStatusT) Scan(value interface{}) error { + if value == nil { + ns.UsertitleStatusT, ns.Valid = "", false + return nil + } + ns.Valid = true + return ns.UsertitleStatusT.Scan(value) +} + +// Value implements the driver Valuer interface. +func (ns NullUsertitleStatusT) Value() (driver.Value, error) { + if !ns.Valid { + return nil, nil + } + return string(ns.UsertitleStatusT), nil +} + +type Images struct { + ImageID int32 `db:"image_id" json:"image_id"` + StorageType StorageTypeT `db:"storage_type" json:"storage_type"` + ImagePath string `db:"image_path" json:"image_path"` +} + +type Providers struct { + ProviderID int32 `db:"provider_id" json:"provider_id"` + ProviderName string `db:"provider_name" json:"provider_name"` +} + +type Reviews struct { + ReviewID int32 `db:"review_id" json:"review_id"` + UserID int32 `db:"user_id" json:"user_id"` + TitleID int32 `db:"title_id" json:"title_id"` + ImageIds []int32 `db:"image_ids" json:"image_ids"` + ReviewText string `db:"review_text" json:"review_text"` + CreationDate pgtype.Timestamp `db:"creation_date" json:"creation_date"` +} + +type Signals struct { + SignalID int32 `db:"signal_id" json:"signal_id"` + RawData []byte `db:"raw_data" json:"raw_data"` + ProviderID int32 `db:"provider_id" json:"provider_id"` + Dirty bool `db:"dirty" json:"dirty"` +} + +type Studios struct { + StudioID int32 `db:"studio_id" json:"studio_id"` + StudioName pgtype.Text `db:"studio_name" json:"studio_name"` + IllustID pgtype.Int4 `db:"illust_id" json:"illust_id"` + StudioDesc pgtype.Text `db:"studio_desc" json:"studio_desc"` +} + +type Tags struct { + TagID int32 `db:"tag_id" json:"tag_id"` + TagNames []byte `db:"tag_names" json:"tag_names"` +} + +type TitleTags struct { + TitleID int32 `db:"title_id" json:"title_id"` + TagID int32 `db:"tag_id" json:"tag_id"` +} + +type Titles struct { + TitleID int32 `db:"title_id" json:"title_id"` + TitleNames []byte `db:"title_names" json:"title_names"` + StudioID int32 `db:"studio_id" json:"studio_id"` + PosterID pgtype.Int4 `db:"poster_id" json:"poster_id"` + SignalIds []int32 `db:"signal_ids" json:"signal_ids"` + TitleStatus TitleStatusT `db:"title_status" json:"title_status"` + Rating pgtype.Float8 `db:"rating" json:"rating"` + RatingCount pgtype.Int4 `db:"rating_count" json:"rating_count"` + ReleaseYear pgtype.Int4 `db:"release_year" json:"release_year"` + ReleaseSeason NullReleaseSeasonT `db:"release_season" json:"release_season"` + Season pgtype.Int4 `db:"season" json:"season"` + EpisodesAired pgtype.Int4 `db:"episodes_aired" json:"episodes_aired"` + EpisodesAll pgtype.Int4 `db:"episodes_all" json:"episodes_all"` + EpisodesLen []byte `db:"episodes_len" json:"episodes_len"` +} + +type Users struct { + UserID int32 `db:"user_id" json:"user_id"` + AvatarID pgtype.Int4 `db:"avatar_id" json:"avatar_id"` + Passhash string `db:"passhash" json:"passhash"` + Mail pgtype.Text `db:"mail" json:"mail"` + Nickname string `db:"nickname" json:"nickname"` + DispName pgtype.Text `db:"disp_name" json:"disp_name"` + UserDesc pgtype.Text `db:"user_desc" json:"user_desc"` + CreationDate pgtype.Timestamp `db:"creation_date" json:"creation_date"` +} + +type Usertitles struct { + UsertitleID int32 `db:"usertitle_id" json:"usertitle_id"` + UserID int32 `db:"user_id" json:"user_id"` + TitleID int32 `db:"title_id" json:"title_id"` + Status UsertitleStatusT `db:"status" json:"status"` + Rate pgtype.Int4 `db:"rate" json:"rate"` + ReviewID pgtype.Int4 `db:"review_id" json:"review_id"` +} diff --git a/modules/sql/sqlc/query.sql.go b/modules/sql/sqlc/query.sql.go new file mode 100644 index 0000000..1fc06ac --- /dev/null +++ b/modules/sql/sqlc/query.sql.go @@ -0,0 +1,712 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.30.0 +// source: query.sql + +package db + +import ( + "context" + + "github.com/jackc/pgx/v5/pgtype" +) + +const createImage = `-- name: CreateImage :one +INSERT INTO images (storage_type, image_path) +VALUES ($1, $2) +RETURNING image_id, storage_type, image_path +` + +type CreateImageParams struct { + StorageType StorageTypeT `db:"storage_type" json:"storage_type"` + ImagePath string `db:"image_path" json:"image_path"` +} + +func (q *Queries) CreateImage(ctx context.Context, arg CreateImageParams) (Images, error) { + row := q.db.QueryRow(ctx, createImage, arg.StorageType, arg.ImagePath) + var i Images + err := row.Scan(&i.ImageID, &i.StorageType, &i.ImagePath) + return i, err +} + +const createReview = `-- name: CreateReview :one +INSERT INTO reviews (user_id, title_id, image_ids, review_text, creation_date) +VALUES ($1, $2, $3, $4, $5) +RETURNING review_id, user_id, title_id, image_ids, review_text, creation_date +` + +type CreateReviewParams struct { + UserID int32 `db:"user_id" json:"user_id"` + TitleID int32 `db:"title_id" json:"title_id"` + ImageIds []int32 `db:"image_ids" json:"image_ids"` + ReviewText string `db:"review_text" json:"review_text"` + CreationDate pgtype.Timestamp `db:"creation_date" json:"creation_date"` +} + +func (q *Queries) CreateReview(ctx context.Context, arg CreateReviewParams) (Reviews, error) { + row := q.db.QueryRow(ctx, createReview, + arg.UserID, + arg.TitleID, + arg.ImageIds, + arg.ReviewText, + arg.CreationDate, + ) + var i Reviews + err := row.Scan( + &i.ReviewID, + &i.UserID, + &i.TitleID, + &i.ImageIds, + &i.ReviewText, + &i.CreationDate, + ) + return i, err +} + +const createUser = `-- name: CreateUser :one +INSERT INTO users (avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date) +VALUES ($1, $2, $3, $4, $5, $6, $7) +RETURNING user_id, avatar_id, nickname, disp_name, user_desc, creation_date +` + +type CreateUserParams struct { + AvatarID pgtype.Int4 `db:"avatar_id" json:"avatar_id"` + Passhash string `db:"passhash" json:"passhash"` + Mail pgtype.Text `db:"mail" json:"mail"` + Nickname string `db:"nickname" json:"nickname"` + DispName pgtype.Text `db:"disp_name" json:"disp_name"` + UserDesc pgtype.Text `db:"user_desc" json:"user_desc"` + CreationDate pgtype.Timestamp `db:"creation_date" json:"creation_date"` +} + +type CreateUserRow struct { + UserID int32 `db:"user_id" json:"user_id"` + AvatarID pgtype.Int4 `db:"avatar_id" json:"avatar_id"` + Nickname string `db:"nickname" json:"nickname"` + DispName pgtype.Text `db:"disp_name" json:"disp_name"` + UserDesc pgtype.Text `db:"user_desc" json:"user_desc"` + CreationDate pgtype.Timestamp `db:"creation_date" json:"creation_date"` +} + +func (q *Queries) CreateUser(ctx context.Context, arg CreateUserParams) (CreateUserRow, error) { + row := q.db.QueryRow(ctx, createUser, + arg.AvatarID, + arg.Passhash, + arg.Mail, + arg.Nickname, + arg.DispName, + arg.UserDesc, + arg.CreationDate, + ) + var i CreateUserRow + err := row.Scan( + &i.UserID, + &i.AvatarID, + &i.Nickname, + &i.DispName, + &i.UserDesc, + &i.CreationDate, + ) + return i, err +} + +const createUserTitle = `-- name: CreateUserTitle :one +INSERT INTO usertitles (user_id, title_id, status, rate, review_id) +VALUES ($1, $2, $3, $4, $5) +RETURNING usertitle_id, user_id, title_id, status, rate, review_id +` + +type CreateUserTitleParams struct { + UserID int32 `db:"user_id" json:"user_id"` + TitleID int32 `db:"title_id" json:"title_id"` + Status UsertitleStatusT `db:"status" json:"status"` + Rate pgtype.Int4 `db:"rate" json:"rate"` + ReviewID pgtype.Int4 `db:"review_id" json:"review_id"` +} + +func (q *Queries) CreateUserTitle(ctx context.Context, arg CreateUserTitleParams) (Usertitles, error) { + row := q.db.QueryRow(ctx, createUserTitle, + arg.UserID, + arg.TitleID, + arg.Status, + arg.Rate, + arg.ReviewID, + ) + var i Usertitles + err := row.Scan( + &i.UsertitleID, + &i.UserID, + &i.TitleID, + &i.Status, + &i.Rate, + &i.ReviewID, + ) + return i, err +} + +const deleteReview = `-- name: DeleteReview :exec +DELETE FROM reviews +WHERE review_id = $1 +` + +func (q *Queries) DeleteReview(ctx context.Context, reviewID int32) error { + _, err := q.db.Exec(ctx, deleteReview, reviewID) + return err +} + +const deleteUser = `-- name: DeleteUser :exec +DELETE FROM users +WHERE user_id = $1 +` + +func (q *Queries) DeleteUser(ctx context.Context, userID int32) error { + _, err := q.db.Exec(ctx, deleteUser, userID) + return err +} + +const deleteUserTitle = `-- name: DeleteUserTitle :exec +DELETE FROM usertitles +WHERE user_id = $1 AND ($2::int IS NULL OR title_id = $2) +` + +type DeleteUserTitleParams struct { + UserID int32 `db:"user_id" json:"user_id"` + Column2 int32 `db:"column_2" json:"column_2"` +} + +func (q *Queries) DeleteUserTitle(ctx context.Context, arg DeleteUserTitleParams) error { + _, err := q.db.Exec(ctx, deleteUserTitle, arg.UserID, arg.Column2) + return err +} + +const getImageByID = `-- name: GetImageByID :one +SELECT image_id, storage_type, image_path +FROM images +WHERE image_id = $1 +` + +func (q *Queries) GetImageByID(ctx context.Context, imageID int32) (Images, error) { + row := q.db.QueryRow(ctx, getImageByID, imageID) + var i Images + err := row.Scan(&i.ImageID, &i.StorageType, &i.ImagePath) + return i, err +} + +const getReviewByID = `-- name: GetReviewByID :one +SELECT review_id, user_id, title_id, image_ids, review_text, creation_date +FROM reviews +WHERE review_id = $1 +` + +func (q *Queries) GetReviewByID(ctx context.Context, reviewID int32) (Reviews, error) { + row := q.db.QueryRow(ctx, getReviewByID, reviewID) + var i Reviews + err := row.Scan( + &i.ReviewID, + &i.UserID, + &i.TitleID, + &i.ImageIds, + &i.ReviewText, + &i.CreationDate, + ) + return i, err +} + +const getTitleByID = `-- name: GetTitleByID :one +SELECT title_id, title_names, studio_id, poster_id, signal_ids, + title_status, rating, rating_count, release_year, release_season, + season, episodes_aired, episodes_all, episodes_len +FROM titles +WHERE title_id = $1 +` + +func (q *Queries) GetTitleByID(ctx context.Context, titleID int32) (Titles, error) { + row := q.db.QueryRow(ctx, getTitleByID, titleID) + var i Titles + err := row.Scan( + &i.TitleID, + &i.TitleNames, + &i.StudioID, + &i.PosterID, + &i.SignalIds, + &i.TitleStatus, + &i.Rating, + &i.RatingCount, + &i.ReleaseYear, + &i.ReleaseSeason, + &i.Season, + &i.EpisodesAired, + &i.EpisodesAll, + &i.EpisodesLen, + ) + return i, err +} + +const getUserByID = `-- name: GetUserByID :one +SELECT user_id, avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date +FROM users +WHERE user_id = $1 +` + +func (q *Queries) GetUserByID(ctx context.Context, userID int32) (Users, error) { + row := q.db.QueryRow(ctx, getUserByID, userID) + var i Users + err := row.Scan( + &i.UserID, + &i.AvatarID, + &i.Passhash, + &i.Mail, + &i.Nickname, + &i.DispName, + &i.UserDesc, + &i.CreationDate, + ) + return i, err +} + +const getUserTitle = `-- name: GetUserTitle :one +SELECT usertitle_id, user_id, title_id, status, rate, review_id +FROM usertitles +WHERE user_id = $1 AND title_id = $2 +` + +type GetUserTitleParams struct { + UserID int32 `db:"user_id" json:"user_id"` + TitleID int32 `db:"title_id" json:"title_id"` +} + +func (q *Queries) GetUserTitle(ctx context.Context, arg GetUserTitleParams) (Usertitles, error) { + row := q.db.QueryRow(ctx, getUserTitle, arg.UserID, arg.TitleID) + var i Usertitles + err := row.Scan( + &i.UsertitleID, + &i.UserID, + &i.TitleID, + &i.Status, + &i.Rate, + &i.ReviewID, + ) + return i, err +} + +const listReviewsByTitle = `-- name: ListReviewsByTitle :many +SELECT review_id, user_id, title_id, image_ids, review_text, creation_date +FROM reviews +WHERE title_id = $1 +ORDER BY creation_date DESC +LIMIT $2 OFFSET $3 +` + +type ListReviewsByTitleParams struct { + TitleID int32 `db:"title_id" json:"title_id"` + Limit int32 `db:"limit" json:"limit"` + Offset int32 `db:"offset" json:"offset"` +} + +func (q *Queries) ListReviewsByTitle(ctx context.Context, arg ListReviewsByTitleParams) ([]Reviews, error) { + rows, err := q.db.Query(ctx, listReviewsByTitle, arg.TitleID, arg.Limit, arg.Offset) + if err != nil { + return nil, err + } + defer rows.Close() + var items []Reviews + for rows.Next() { + var i Reviews + if err := rows.Scan( + &i.ReviewID, + &i.UserID, + &i.TitleID, + &i.ImageIds, + &i.ReviewText, + &i.CreationDate, + ); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const listReviewsByUser = `-- name: ListReviewsByUser :many +SELECT review_id, user_id, title_id, image_ids, review_text, creation_date +FROM reviews +WHERE user_id = $1 +ORDER BY creation_date DESC +LIMIT $2 OFFSET $3 +` + +type ListReviewsByUserParams struct { + UserID int32 `db:"user_id" json:"user_id"` + Limit int32 `db:"limit" json:"limit"` + Offset int32 `db:"offset" json:"offset"` +} + +func (q *Queries) ListReviewsByUser(ctx context.Context, arg ListReviewsByUserParams) ([]Reviews, error) { + rows, err := q.db.Query(ctx, listReviewsByUser, arg.UserID, arg.Limit, arg.Offset) + if err != nil { + return nil, err + } + defer rows.Close() + var items []Reviews + for rows.Next() { + var i Reviews + if err := rows.Scan( + &i.ReviewID, + &i.UserID, + &i.TitleID, + &i.ImageIds, + &i.ReviewText, + &i.CreationDate, + ); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const listTags = `-- name: ListTags :many +SELECT tag_id, tag_names +FROM tags +ORDER BY tag_id +LIMIT $1 OFFSET $2 +` + +type ListTagsParams struct { + Limit int32 `db:"limit" json:"limit"` + Offset int32 `db:"offset" json:"offset"` +} + +func (q *Queries) ListTags(ctx context.Context, arg ListTagsParams) ([]Tags, error) { + rows, err := q.db.Query(ctx, listTags, arg.Limit, arg.Offset) + if err != nil { + return nil, err + } + defer rows.Close() + var items []Tags + for rows.Next() { + var i Tags + if err := rows.Scan(&i.TagID, &i.TagNames); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const listTitles = `-- name: ListTitles :many +SELECT title_id, title_names, studio_id, poster_id, signal_ids, + title_status, rating, rating_count, release_year, release_season, + season, episodes_aired, episodes_all, episodes_len +FROM titles +ORDER BY title_id +LIMIT $1 OFFSET $2 +` + +type ListTitlesParams struct { + Limit int32 `db:"limit" json:"limit"` + Offset int32 `db:"offset" json:"offset"` +} + +func (q *Queries) ListTitles(ctx context.Context, arg ListTitlesParams) ([]Titles, error) { + rows, err := q.db.Query(ctx, listTitles, arg.Limit, arg.Offset) + if err != nil { + return nil, err + } + defer rows.Close() + var items []Titles + for rows.Next() { + var i Titles + if err := rows.Scan( + &i.TitleID, + &i.TitleNames, + &i.StudioID, + &i.PosterID, + &i.SignalIds, + &i.TitleStatus, + &i.Rating, + &i.RatingCount, + &i.ReleaseYear, + &i.ReleaseSeason, + &i.Season, + &i.EpisodesAired, + &i.EpisodesAll, + &i.EpisodesLen, + ); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const listUserTitles = `-- name: ListUserTitles :many +SELECT usertitle_id, user_id, title_id, status, rate, review_id +FROM usertitles +WHERE user_id = $1 +ORDER BY usertitle_id +LIMIT $2 OFFSET $3 +` + +type ListUserTitlesParams struct { + UserID int32 `db:"user_id" json:"user_id"` + Limit int32 `db:"limit" json:"limit"` + Offset int32 `db:"offset" json:"offset"` +} + +func (q *Queries) ListUserTitles(ctx context.Context, arg ListUserTitlesParams) ([]Usertitles, error) { + rows, err := q.db.Query(ctx, listUserTitles, arg.UserID, arg.Limit, arg.Offset) + if err != nil { + return nil, err + } + defer rows.Close() + var items []Usertitles + for rows.Next() { + var i Usertitles + if err := rows.Scan( + &i.UsertitleID, + &i.UserID, + &i.TitleID, + &i.Status, + &i.Rate, + &i.ReviewID, + ); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const listUsers = `-- name: ListUsers :many +SELECT user_id, avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date +FROM users +ORDER BY user_id +LIMIT $1 OFFSET $2 +` + +type ListUsersParams struct { + Limit int32 `db:"limit" json:"limit"` + Offset int32 `db:"offset" json:"offset"` +} + +func (q *Queries) ListUsers(ctx context.Context, arg ListUsersParams) ([]Users, error) { + rows, err := q.db.Query(ctx, listUsers, arg.Limit, arg.Offset) + if err != nil { + return nil, err + } + defer rows.Close() + var items []Users + for rows.Next() { + var i Users + if err := rows.Scan( + &i.UserID, + &i.AvatarID, + &i.Passhash, + &i.Mail, + &i.Nickname, + &i.DispName, + &i.UserDesc, + &i.CreationDate, + ); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const updateReview = `-- name: UpdateReview :one +UPDATE reviews +SET + image_ids = COALESCE($1, image_ids), + review_text = COALESCE($2, review_text) +WHERE review_id = $3 +RETURNING review_id, user_id, title_id, image_ids, review_text, creation_date +` + +type UpdateReviewParams struct { + ImageIds []int32 `db:"image_ids" json:"image_ids"` + ReviewText pgtype.Text `db:"review_text" json:"review_text"` + ReviewID int32 `db:"review_id" json:"review_id"` +} + +func (q *Queries) UpdateReview(ctx context.Context, arg UpdateReviewParams) (Reviews, error) { + row := q.db.QueryRow(ctx, updateReview, arg.ImageIds, arg.ReviewText, arg.ReviewID) + var i Reviews + err := row.Scan( + &i.ReviewID, + &i.UserID, + &i.TitleID, + &i.ImageIds, + &i.ReviewText, + &i.CreationDate, + ) + return i, err +} + +const updateTitle = `-- name: UpdateTitle :one +UPDATE titles +SET + title_names = COALESCE($1, title_names), + studio_id = COALESCE($2, studio_id), + poster_id = COALESCE($3, poster_id), + signal_ids = COALESCE($4, signal_ids), + title_status = COALESCE($5, title_status), + release_year = COALESCE($6, release_year), + release_season = COALESCE($7, release_season), + episodes_aired = COALESCE($8, episodes_aired), + episodes_all = COALESCE($9, episodes_all), + episodes_len = COALESCE($10, episodes_len) +WHERE title_id = $11 +RETURNING title_id, title_names, studio_id, poster_id, signal_ids, title_status, rating, rating_count, release_year, release_season, season, episodes_aired, episodes_all, episodes_len +` + +type UpdateTitleParams struct { + TitleNames []byte `db:"title_names" json:"title_names"` + StudioID pgtype.Int4 `db:"studio_id" json:"studio_id"` + PosterID pgtype.Int4 `db:"poster_id" json:"poster_id"` + SignalIds []int32 `db:"signal_ids" json:"signal_ids"` + TitleStatus NullTitleStatusT `db:"title_status" json:"title_status"` + ReleaseYear pgtype.Int4 `db:"release_year" json:"release_year"` + ReleaseSeason NullReleaseSeasonT `db:"release_season" json:"release_season"` + EpisodesAired pgtype.Int4 `db:"episodes_aired" json:"episodes_aired"` + EpisodesAll pgtype.Int4 `db:"episodes_all" json:"episodes_all"` + EpisodesLen []byte `db:"episodes_len" json:"episodes_len"` + TitleID int32 `db:"title_id" json:"title_id"` +} + +func (q *Queries) UpdateTitle(ctx context.Context, arg UpdateTitleParams) (Titles, error) { + row := q.db.QueryRow(ctx, updateTitle, + arg.TitleNames, + arg.StudioID, + arg.PosterID, + arg.SignalIds, + arg.TitleStatus, + arg.ReleaseYear, + arg.ReleaseSeason, + arg.EpisodesAired, + arg.EpisodesAll, + arg.EpisodesLen, + arg.TitleID, + ) + var i Titles + err := row.Scan( + &i.TitleID, + &i.TitleNames, + &i.StudioID, + &i.PosterID, + &i.SignalIds, + &i.TitleStatus, + &i.Rating, + &i.RatingCount, + &i.ReleaseYear, + &i.ReleaseSeason, + &i.Season, + &i.EpisodesAired, + &i.EpisodesAll, + &i.EpisodesLen, + ) + return i, err +} + +const updateUser = `-- name: UpdateUser :one +UPDATE users +SET + avatar_id = COALESCE($1, avatar_id), + disp_name = COALESCE($2, disp_name), + user_desc = COALESCE($3, user_desc) +WHERE user_id = $4 +RETURNING user_id, avatar_id, nickname, disp_name, user_desc, creation_date +` + +type UpdateUserParams struct { + AvatarID pgtype.Int4 `db:"avatar_id" json:"avatar_id"` + DispName pgtype.Text `db:"disp_name" json:"disp_name"` + UserDesc pgtype.Text `db:"user_desc" json:"user_desc"` + UserID int32 `db:"user_id" json:"user_id"` +} + +type UpdateUserRow struct { + UserID int32 `db:"user_id" json:"user_id"` + AvatarID pgtype.Int4 `db:"avatar_id" json:"avatar_id"` + Nickname string `db:"nickname" json:"nickname"` + DispName pgtype.Text `db:"disp_name" json:"disp_name"` + UserDesc pgtype.Text `db:"user_desc" json:"user_desc"` + CreationDate pgtype.Timestamp `db:"creation_date" json:"creation_date"` +} + +func (q *Queries) UpdateUser(ctx context.Context, arg UpdateUserParams) (UpdateUserRow, error) { + row := q.db.QueryRow(ctx, updateUser, + arg.AvatarID, + arg.DispName, + arg.UserDesc, + arg.UserID, + ) + var i UpdateUserRow + err := row.Scan( + &i.UserID, + &i.AvatarID, + &i.Nickname, + &i.DispName, + &i.UserDesc, + &i.CreationDate, + ) + return i, err +} + +const updateUserTitle = `-- name: UpdateUserTitle :one +UPDATE usertitles +SET + status = COALESCE($3, status), + rate = COALESCE($4, rate), + review_id = COALESCE($5, review_id) +WHERE user_id = $1 AND title_id = $2 +RETURNING usertitle_id, user_id, title_id, status, rate, review_id +` + +type UpdateUserTitleParams struct { + UserID int32 `db:"user_id" json:"user_id"` + TitleID int32 `db:"title_id" json:"title_id"` + Status NullUsertitleStatusT `db:"status" json:"status"` + Rate pgtype.Int4 `db:"rate" json:"rate"` + ReviewID pgtype.Int4 `db:"review_id" json:"review_id"` +} + +func (q *Queries) UpdateUserTitle(ctx context.Context, arg UpdateUserTitleParams) (Usertitles, error) { + row := q.db.QueryRow(ctx, updateUserTitle, + arg.UserID, + arg.TitleID, + arg.Status, + arg.Rate, + arg.ReviewID, + ) + var i Usertitles + err := row.Scan( + &i.UsertitleID, + &i.UserID, + &i.TitleID, + &i.Status, + &i.Rate, + &i.ReviewID, + ) + return i, err +} From 80285ba7da1102c27daf4bcc9ebd99097ac266c2 Mon Sep 17 00:00:00 2001 From: Iron_Felix Date: Sat, 11 Oct 2025 02:13:08 +0300 Subject: [PATCH 25/80] feat: implementation for handlers were written --- modules/backend/api/gen.go | 1958 +++++++++++++++++++++++++++++++++++ modules/backend/api/impl.go | 718 +++++++++++++ 2 files changed, 2676 insertions(+) create mode 100644 modules/backend/api/gen.go create mode 100644 modules/backend/api/impl.go diff --git a/modules/backend/api/gen.go b/modules/backend/api/gen.go new file mode 100644 index 0000000..2dcb886 --- /dev/null +++ b/modules/backend/api/gen.go @@ -0,0 +1,1958 @@ +// Package api provides primitives to interact with the openapi HTTP API. +// +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.5.0 DO NOT EDIT. +package api + +import ( + "context" + "encoding/json" + "fmt" + "net/http" + + "github.com/gin-gonic/gin" + "github.com/oapi-codegen/runtime" + strictgin "github.com/oapi-codegen/runtime/strictmiddleware/gin" +) + +// Review defines model for Review. +type Review map[string]interface{} + +// Tag defines model for Tag. +type Tag map[string]interface{} + +// Title defines model for Title. +type Title map[string]interface{} + +// User defines model for User. +type User map[string]interface{} + +// UserTitle defines model for UserTitle. +type UserTitle map[string]interface{} + +// GetMediaParams defines parameters for GetMedia. +type GetMediaParams struct { + ImageId string `form:"image_id" json:"image_id"` +} + +// GetTagsParams defines parameters for GetTags. +type GetTagsParams struct { + Limit *int `form:"limit,omitempty" json:"limit,omitempty"` + Offset *int `form:"offset,omitempty" json:"offset,omitempty"` + Fields *string `form:"fields,omitempty" json:"fields,omitempty"` +} + +// GetTitleParams defines parameters for GetTitle. +type GetTitleParams struct { + Query *string `form:"query,omitempty" json:"query,omitempty"` + Limit *int `form:"limit,omitempty" json:"limit,omitempty"` + Offset *int `form:"offset,omitempty" json:"offset,omitempty"` + Fields *string `form:"fields,omitempty" json:"fields,omitempty"` +} + +// GetTitleTitleIdParams defines parameters for GetTitleTitleId. +type GetTitleTitleIdParams struct { + Fields *string `form:"fields,omitempty" json:"fields,omitempty"` +} + +// GetTitleTitleIdReviewsParams defines parameters for GetTitleTitleIdReviews. +type GetTitleTitleIdReviewsParams struct { + Limit *int `form:"limit,omitempty" json:"limit,omitempty"` + Offset *int `form:"offset,omitempty" json:"offset,omitempty"` +} + +// GetUsersParams defines parameters for GetUsers. +type GetUsersParams struct { + Query *string `form:"query,omitempty" json:"query,omitempty"` + Fields *string `form:"fields,omitempty" json:"fields,omitempty"` +} + +// GetUsersUserIdParams defines parameters for GetUsersUserId. +type GetUsersUserIdParams struct { + Fields *string `form:"fields,omitempty" json:"fields,omitempty"` +} + +// GetUsersUserIdReviewsParams defines parameters for GetUsersUserIdReviews. +type GetUsersUserIdReviewsParams struct { + Limit *int `form:"limit,omitempty" json:"limit,omitempty"` + Offset *int `form:"offset,omitempty" json:"offset,omitempty"` +} + +// DeleteUsersUserIdTitlesParams defines parameters for DeleteUsersUserIdTitles. +type DeleteUsersUserIdTitlesParams struct { + TitleId *string `form:"title_id,omitempty" json:"title_id,omitempty"` +} + +// GetUsersUserIdTitlesParams defines parameters for GetUsersUserIdTitles. +type GetUsersUserIdTitlesParams struct { + Query *string `form:"query,omitempty" json:"query,omitempty"` + Limit *int `form:"limit,omitempty" json:"limit,omitempty"` + Offset *int `form:"offset,omitempty" json:"offset,omitempty"` + Fields *string `form:"fields,omitempty" json:"fields,omitempty"` +} + +// PostUsersUserIdTitlesJSONBody defines parameters for PostUsersUserIdTitles. +type PostUsersUserIdTitlesJSONBody struct { + Status *string `json:"status,omitempty"` + TitleId *string `json:"title_id,omitempty"` +} + +// PostReviewsJSONRequestBody defines body for PostReviews for application/json ContentType. +type PostReviewsJSONRequestBody = Review + +// PatchReviewsReviewIdJSONRequestBody defines body for PatchReviewsReviewId for application/json ContentType. +type PatchReviewsReviewIdJSONRequestBody = Review + +// PatchTitleTitleIdJSONRequestBody defines body for PatchTitleTitleId for application/json ContentType. +type PatchTitleTitleIdJSONRequestBody = Title + +// PostUsersJSONRequestBody defines body for PostUsers for application/json ContentType. +type PostUsersJSONRequestBody = User + +// PatchUsersUserIdJSONRequestBody defines body for PatchUsersUserId for application/json ContentType. +type PatchUsersUserIdJSONRequestBody = User + +// PatchUsersUserIdTitlesJSONRequestBody defines body for PatchUsersUserIdTitles for application/json ContentType. +type PatchUsersUserIdTitlesJSONRequestBody = UserTitle + +// PostUsersUserIdTitlesJSONRequestBody defines body for PostUsersUserIdTitles for application/json ContentType. +type PostUsersUserIdTitlesJSONRequestBody PostUsersUserIdTitlesJSONBody + +// ServerInterface represents all server handlers. +type ServerInterface interface { + // Get image path + // (GET /media) + GetMedia(c *gin.Context, params GetMediaParams) + // Upload image + // (POST /media) + PostMedia(c *gin.Context) + // Add review + // (POST /reviews) + PostReviews(c *gin.Context) + // Delete review + // (DELETE /reviews/{review_id}) + DeleteReviewsReviewId(c *gin.Context, reviewId string) + // Update review + // (PATCH /reviews/{review_id}) + PatchReviewsReviewId(c *gin.Context, reviewId string) + // Get tags + // (GET /tags) + GetTags(c *gin.Context, params GetTagsParams) + // Get titles + // (GET /title) + GetTitle(c *gin.Context, params GetTitleParams) + // Get title description + // (GET /title/{title_id}) + GetTitleTitleId(c *gin.Context, titleId string, params GetTitleTitleIdParams) + // Update title info + // (PATCH /title/{title_id}) + PatchTitleTitleId(c *gin.Context, titleId string) + // Get title reviews + // (GET /title/{title_id}/reviews) + GetTitleTitleIdReviews(c *gin.Context, titleId string, params GetTitleTitleIdReviewsParams) + // Search user + // (GET /users) + GetUsers(c *gin.Context, params GetUsersParams) + // Add new user + // (POST /users) + PostUsers(c *gin.Context) + // Delete user + // (DELETE /users/{user_id}) + DeleteUsersUserId(c *gin.Context, userId string) + // Get user info + // (GET /users/{user_id}) + GetUsersUserId(c *gin.Context, userId string, params GetUsersUserIdParams) + // Update user + // (PATCH /users/{user_id}) + PatchUsersUserId(c *gin.Context, userId string) + // Get user reviews + // (GET /users/{user_id}/reviews) + GetUsersUserIdReviews(c *gin.Context, userId string, params GetUsersUserIdReviewsParams) + // Delete user title + // (DELETE /users/{user_id}/titles) + DeleteUsersUserIdTitles(c *gin.Context, userId string, params DeleteUsersUserIdTitlesParams) + // Get user titles + // (GET /users/{user_id}/titles) + GetUsersUserIdTitles(c *gin.Context, userId string, params GetUsersUserIdTitlesParams) + // Update user title + // (PATCH /users/{user_id}/titles) + PatchUsersUserIdTitles(c *gin.Context, userId string) + // Add user title + // (POST /users/{user_id}/titles) + PostUsersUserIdTitles(c *gin.Context, userId string) +} + +// ServerInterfaceWrapper converts contexts to parameters. +type ServerInterfaceWrapper struct { + Handler ServerInterface + HandlerMiddlewares []MiddlewareFunc + ErrorHandler func(*gin.Context, error, int) +} + +type MiddlewareFunc func(c *gin.Context) + +// GetMedia operation middleware +func (siw *ServerInterfaceWrapper) GetMedia(c *gin.Context) { + + var err error + + // Parameter object where we will unmarshal all parameters from the context + var params GetMediaParams + + // ------------- Required query parameter "image_id" ------------- + + if paramValue := c.Query("image_id"); paramValue != "" { + + } else { + siw.ErrorHandler(c, fmt.Errorf("Query argument image_id is required, but not found"), http.StatusBadRequest) + return + } + + err = runtime.BindQueryParameter("form", true, true, "image_id", c.Request.URL.Query(), ¶ms.ImageId) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter image_id: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.GetMedia(c, params) +} + +// PostMedia operation middleware +func (siw *ServerInterfaceWrapper) PostMedia(c *gin.Context) { + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.PostMedia(c) +} + +// PostReviews operation middleware +func (siw *ServerInterfaceWrapper) PostReviews(c *gin.Context) { + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.PostReviews(c) +} + +// DeleteReviewsReviewId operation middleware +func (siw *ServerInterfaceWrapper) DeleteReviewsReviewId(c *gin.Context) { + + var err error + + // ------------- Path parameter "review_id" ------------- + var reviewId string + + err = runtime.BindStyledParameterWithOptions("simple", "review_id", c.Param("review_id"), &reviewId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter review_id: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.DeleteReviewsReviewId(c, reviewId) +} + +// PatchReviewsReviewId operation middleware +func (siw *ServerInterfaceWrapper) PatchReviewsReviewId(c *gin.Context) { + + var err error + + // ------------- Path parameter "review_id" ------------- + var reviewId string + + err = runtime.BindStyledParameterWithOptions("simple", "review_id", c.Param("review_id"), &reviewId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter review_id: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.PatchReviewsReviewId(c, reviewId) +} + +// GetTags operation middleware +func (siw *ServerInterfaceWrapper) GetTags(c *gin.Context) { + + var err error + + // Parameter object where we will unmarshal all parameters from the context + var params GetTagsParams + + // ------------- Optional query parameter "limit" ------------- + + err = runtime.BindQueryParameter("form", true, false, "limit", c.Request.URL.Query(), ¶ms.Limit) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter limit: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "offset" ------------- + + err = runtime.BindQueryParameter("form", true, false, "offset", c.Request.URL.Query(), ¶ms.Offset) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter offset: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "fields" ------------- + + err = runtime.BindQueryParameter("form", true, false, "fields", c.Request.URL.Query(), ¶ms.Fields) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter fields: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.GetTags(c, params) +} + +// GetTitle operation middleware +func (siw *ServerInterfaceWrapper) GetTitle(c *gin.Context) { + + var err error + + // Parameter object where we will unmarshal all parameters from the context + var params GetTitleParams + + // ------------- Optional query parameter "query" ------------- + + err = runtime.BindQueryParameter("form", true, false, "query", c.Request.URL.Query(), ¶ms.Query) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter query: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "limit" ------------- + + err = runtime.BindQueryParameter("form", true, false, "limit", c.Request.URL.Query(), ¶ms.Limit) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter limit: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "offset" ------------- + + err = runtime.BindQueryParameter("form", true, false, "offset", c.Request.URL.Query(), ¶ms.Offset) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter offset: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "fields" ------------- + + err = runtime.BindQueryParameter("form", true, false, "fields", c.Request.URL.Query(), ¶ms.Fields) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter fields: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.GetTitle(c, params) +} + +// GetTitleTitleId operation middleware +func (siw *ServerInterfaceWrapper) GetTitleTitleId(c *gin.Context) { + + var err error + + // ------------- Path parameter "title_id" ------------- + var titleId string + + err = runtime.BindStyledParameterWithOptions("simple", "title_id", c.Param("title_id"), &titleId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter title_id: %w", err), http.StatusBadRequest) + return + } + + // Parameter object where we will unmarshal all parameters from the context + var params GetTitleTitleIdParams + + // ------------- Optional query parameter "fields" ------------- + + err = runtime.BindQueryParameter("form", true, false, "fields", c.Request.URL.Query(), ¶ms.Fields) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter fields: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.GetTitleTitleId(c, titleId, params) +} + +// PatchTitleTitleId operation middleware +func (siw *ServerInterfaceWrapper) PatchTitleTitleId(c *gin.Context) { + + var err error + + // ------------- Path parameter "title_id" ------------- + var titleId string + + err = runtime.BindStyledParameterWithOptions("simple", "title_id", c.Param("title_id"), &titleId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter title_id: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.PatchTitleTitleId(c, titleId) +} + +// GetTitleTitleIdReviews operation middleware +func (siw *ServerInterfaceWrapper) GetTitleTitleIdReviews(c *gin.Context) { + + var err error + + // ------------- Path parameter "title_id" ------------- + var titleId string + + err = runtime.BindStyledParameterWithOptions("simple", "title_id", c.Param("title_id"), &titleId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter title_id: %w", err), http.StatusBadRequest) + return + } + + // Parameter object where we will unmarshal all parameters from the context + var params GetTitleTitleIdReviewsParams + + // ------------- Optional query parameter "limit" ------------- + + err = runtime.BindQueryParameter("form", true, false, "limit", c.Request.URL.Query(), ¶ms.Limit) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter limit: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "offset" ------------- + + err = runtime.BindQueryParameter("form", true, false, "offset", c.Request.URL.Query(), ¶ms.Offset) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter offset: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.GetTitleTitleIdReviews(c, titleId, params) +} + +// GetUsers operation middleware +func (siw *ServerInterfaceWrapper) GetUsers(c *gin.Context) { + + var err error + + // Parameter object where we will unmarshal all parameters from the context + var params GetUsersParams + + // ------------- Optional query parameter "query" ------------- + + err = runtime.BindQueryParameter("form", true, false, "query", c.Request.URL.Query(), ¶ms.Query) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter query: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "fields" ------------- + + err = runtime.BindQueryParameter("form", true, false, "fields", c.Request.URL.Query(), ¶ms.Fields) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter fields: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.GetUsers(c, params) +} + +// PostUsers operation middleware +func (siw *ServerInterfaceWrapper) PostUsers(c *gin.Context) { + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.PostUsers(c) +} + +// DeleteUsersUserId operation middleware +func (siw *ServerInterfaceWrapper) DeleteUsersUserId(c *gin.Context) { + + var err error + + // ------------- Path parameter "user_id" ------------- + var userId string + + err = runtime.BindStyledParameterWithOptions("simple", "user_id", c.Param("user_id"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter user_id: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.DeleteUsersUserId(c, userId) +} + +// GetUsersUserId operation middleware +func (siw *ServerInterfaceWrapper) GetUsersUserId(c *gin.Context) { + + var err error + + // ------------- Path parameter "user_id" ------------- + var userId string + + err = runtime.BindStyledParameterWithOptions("simple", "user_id", c.Param("user_id"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter user_id: %w", err), http.StatusBadRequest) + return + } + + // Parameter object where we will unmarshal all parameters from the context + var params GetUsersUserIdParams + + // ------------- Optional query parameter "fields" ------------- + + err = runtime.BindQueryParameter("form", true, false, "fields", c.Request.URL.Query(), ¶ms.Fields) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter fields: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.GetUsersUserId(c, userId, params) +} + +// PatchUsersUserId operation middleware +func (siw *ServerInterfaceWrapper) PatchUsersUserId(c *gin.Context) { + + var err error + + // ------------- Path parameter "user_id" ------------- + var userId string + + err = runtime.BindStyledParameterWithOptions("simple", "user_id", c.Param("user_id"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter user_id: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.PatchUsersUserId(c, userId) +} + +// GetUsersUserIdReviews operation middleware +func (siw *ServerInterfaceWrapper) GetUsersUserIdReviews(c *gin.Context) { + + var err error + + // ------------- Path parameter "user_id" ------------- + var userId string + + err = runtime.BindStyledParameterWithOptions("simple", "user_id", c.Param("user_id"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter user_id: %w", err), http.StatusBadRequest) + return + } + + // Parameter object where we will unmarshal all parameters from the context + var params GetUsersUserIdReviewsParams + + // ------------- Optional query parameter "limit" ------------- + + err = runtime.BindQueryParameter("form", true, false, "limit", c.Request.URL.Query(), ¶ms.Limit) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter limit: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "offset" ------------- + + err = runtime.BindQueryParameter("form", true, false, "offset", c.Request.URL.Query(), ¶ms.Offset) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter offset: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.GetUsersUserIdReviews(c, userId, params) +} + +// DeleteUsersUserIdTitles operation middleware +func (siw *ServerInterfaceWrapper) DeleteUsersUserIdTitles(c *gin.Context) { + + var err error + + // ------------- Path parameter "user_id" ------------- + var userId string + + err = runtime.BindStyledParameterWithOptions("simple", "user_id", c.Param("user_id"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter user_id: %w", err), http.StatusBadRequest) + return + } + + // Parameter object where we will unmarshal all parameters from the context + var params DeleteUsersUserIdTitlesParams + + // ------------- Optional query parameter "title_id" ------------- + + err = runtime.BindQueryParameter("form", true, false, "title_id", c.Request.URL.Query(), ¶ms.TitleId) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter title_id: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.DeleteUsersUserIdTitles(c, userId, params) +} + +// GetUsersUserIdTitles operation middleware +func (siw *ServerInterfaceWrapper) GetUsersUserIdTitles(c *gin.Context) { + + var err error + + // ------------- Path parameter "user_id" ------------- + var userId string + + err = runtime.BindStyledParameterWithOptions("simple", "user_id", c.Param("user_id"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter user_id: %w", err), http.StatusBadRequest) + return + } + + // Parameter object where we will unmarshal all parameters from the context + var params GetUsersUserIdTitlesParams + + // ------------- Optional query parameter "query" ------------- + + err = runtime.BindQueryParameter("form", true, false, "query", c.Request.URL.Query(), ¶ms.Query) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter query: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "limit" ------------- + + err = runtime.BindQueryParameter("form", true, false, "limit", c.Request.URL.Query(), ¶ms.Limit) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter limit: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "offset" ------------- + + err = runtime.BindQueryParameter("form", true, false, "offset", c.Request.URL.Query(), ¶ms.Offset) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter offset: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "fields" ------------- + + err = runtime.BindQueryParameter("form", true, false, "fields", c.Request.URL.Query(), ¶ms.Fields) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter fields: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.GetUsersUserIdTitles(c, userId, params) +} + +// PatchUsersUserIdTitles operation middleware +func (siw *ServerInterfaceWrapper) PatchUsersUserIdTitles(c *gin.Context) { + + var err error + + // ------------- Path parameter "user_id" ------------- + var userId string + + err = runtime.BindStyledParameterWithOptions("simple", "user_id", c.Param("user_id"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter user_id: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.PatchUsersUserIdTitles(c, userId) +} + +// PostUsersUserIdTitles operation middleware +func (siw *ServerInterfaceWrapper) PostUsersUserIdTitles(c *gin.Context) { + + var err error + + // ------------- Path parameter "user_id" ------------- + var userId string + + err = runtime.BindStyledParameterWithOptions("simple", "user_id", c.Param("user_id"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter user_id: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.PostUsersUserIdTitles(c, userId) +} + +// GinServerOptions provides options for the Gin server. +type GinServerOptions struct { + BaseURL string + Middlewares []MiddlewareFunc + ErrorHandler func(*gin.Context, error, int) +} + +// RegisterHandlers creates http.Handler with routing matching OpenAPI spec. +func RegisterHandlers(router gin.IRouter, si ServerInterface) { + RegisterHandlersWithOptions(router, si, GinServerOptions{}) +} + +// RegisterHandlersWithOptions creates http.Handler with additional options +func RegisterHandlersWithOptions(router gin.IRouter, si ServerInterface, options GinServerOptions) { + errorHandler := options.ErrorHandler + if errorHandler == nil { + errorHandler = func(c *gin.Context, err error, statusCode int) { + c.JSON(statusCode, gin.H{"msg": err.Error()}) + } + } + + wrapper := ServerInterfaceWrapper{ + Handler: si, + HandlerMiddlewares: options.Middlewares, + ErrorHandler: errorHandler, + } + + router.GET(options.BaseURL+"/media", wrapper.GetMedia) + router.POST(options.BaseURL+"/media", wrapper.PostMedia) + router.POST(options.BaseURL+"/reviews", wrapper.PostReviews) + router.DELETE(options.BaseURL+"/reviews/:review_id", wrapper.DeleteReviewsReviewId) + router.PATCH(options.BaseURL+"/reviews/:review_id", wrapper.PatchReviewsReviewId) + router.GET(options.BaseURL+"/tags", wrapper.GetTags) + router.GET(options.BaseURL+"/title", wrapper.GetTitle) + router.GET(options.BaseURL+"/title/:title_id", wrapper.GetTitleTitleId) + router.PATCH(options.BaseURL+"/title/:title_id", wrapper.PatchTitleTitleId) + router.GET(options.BaseURL+"/title/:title_id/reviews", wrapper.GetTitleTitleIdReviews) + router.GET(options.BaseURL+"/users", wrapper.GetUsers) + router.POST(options.BaseURL+"/users", wrapper.PostUsers) + router.DELETE(options.BaseURL+"/users/:user_id", wrapper.DeleteUsersUserId) + router.GET(options.BaseURL+"/users/:user_id", wrapper.GetUsersUserId) + router.PATCH(options.BaseURL+"/users/:user_id", wrapper.PatchUsersUserId) + router.GET(options.BaseURL+"/users/:user_id/reviews", wrapper.GetUsersUserIdReviews) + router.DELETE(options.BaseURL+"/users/:user_id/titles", wrapper.DeleteUsersUserIdTitles) + router.GET(options.BaseURL+"/users/:user_id/titles", wrapper.GetUsersUserIdTitles) + router.PATCH(options.BaseURL+"/users/:user_id/titles", wrapper.PatchUsersUserIdTitles) + router.POST(options.BaseURL+"/users/:user_id/titles", wrapper.PostUsersUserIdTitles) +} + +type GetMediaRequestObject struct { + Params GetMediaParams +} + +type GetMediaResponseObject interface { + VisitGetMediaResponse(w http.ResponseWriter) error +} + +type GetMedia200JSONResponse struct { + Error *string `json:"error,omitempty"` + ImagePath *string `json:"image_path,omitempty"` + Success *bool `json:"success,omitempty"` +} + +func (response GetMedia200JSONResponse) VisitGetMediaResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type PostMediaRequestObject struct { +} + +type PostMediaResponseObject interface { + VisitPostMediaResponse(w http.ResponseWriter) error +} + +type PostMedia200JSONResponse struct { + Error *string `json:"error,omitempty"` + ImageId *string `json:"image_id,omitempty"` + Success *bool `json:"success,omitempty"` +} + +func (response PostMedia200JSONResponse) VisitPostMediaResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type PostReviewsRequestObject struct { + Body *PostReviewsJSONRequestBody +} + +type PostReviewsResponseObject interface { + VisitPostReviewsResponse(w http.ResponseWriter) error +} + +type PostReviews200JSONResponse struct { + Error *string `json:"error,omitempty"` + Success *bool `json:"success,omitempty"` +} + +func (response PostReviews200JSONResponse) VisitPostReviewsResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type DeleteReviewsReviewIdRequestObject struct { + ReviewId string `json:"review_id"` +} + +type DeleteReviewsReviewIdResponseObject interface { + VisitDeleteReviewsReviewIdResponse(w http.ResponseWriter) error +} + +type DeleteReviewsReviewId200JSONResponse struct { + Error *string `json:"error,omitempty"` + Success *bool `json:"success,omitempty"` +} + +func (response DeleteReviewsReviewId200JSONResponse) VisitDeleteReviewsReviewIdResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type PatchReviewsReviewIdRequestObject struct { + ReviewId string `json:"review_id"` + Body *PatchReviewsReviewIdJSONRequestBody +} + +type PatchReviewsReviewIdResponseObject interface { + VisitPatchReviewsReviewIdResponse(w http.ResponseWriter) error +} + +type PatchReviewsReviewId200JSONResponse struct { + Error *string `json:"error,omitempty"` + Success *bool `json:"success,omitempty"` +} + +func (response PatchReviewsReviewId200JSONResponse) VisitPatchReviewsReviewIdResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type GetTagsRequestObject struct { + Params GetTagsParams +} + +type GetTagsResponseObject interface { + VisitGetTagsResponse(w http.ResponseWriter) error +} + +type GetTags200JSONResponse []Tag + +func (response GetTags200JSONResponse) VisitGetTagsResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type GetTitleRequestObject struct { + Params GetTitleParams +} + +type GetTitleResponseObject interface { + VisitGetTitleResponse(w http.ResponseWriter) error +} + +type GetTitle200JSONResponse []Title + +func (response GetTitle200JSONResponse) VisitGetTitleResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type GetTitle204Response struct { +} + +func (response GetTitle204Response) VisitGetTitleResponse(w http.ResponseWriter) error { + w.WriteHeader(204) + return nil +} + +type GetTitleTitleIdRequestObject struct { + TitleId string `json:"title_id"` + Params GetTitleTitleIdParams +} + +type GetTitleTitleIdResponseObject interface { + VisitGetTitleTitleIdResponse(w http.ResponseWriter) error +} + +type GetTitleTitleId200JSONResponse Title + +func (response GetTitleTitleId200JSONResponse) VisitGetTitleTitleIdResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type GetTitleTitleId404Response struct { +} + +func (response GetTitleTitleId404Response) VisitGetTitleTitleIdResponse(w http.ResponseWriter) error { + w.WriteHeader(404) + return nil +} + +type PatchTitleTitleIdRequestObject struct { + TitleId string `json:"title_id"` + Body *PatchTitleTitleIdJSONRequestBody +} + +type PatchTitleTitleIdResponseObject interface { + VisitPatchTitleTitleIdResponse(w http.ResponseWriter) error +} + +type PatchTitleTitleId200JSONResponse struct { + Error *string `json:"error,omitempty"` + Success *bool `json:"success,omitempty"` + UserJson *User `json:"user_json,omitempty"` +} + +func (response PatchTitleTitleId200JSONResponse) VisitPatchTitleTitleIdResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type GetTitleTitleIdReviewsRequestObject struct { + TitleId string `json:"title_id"` + Params GetTitleTitleIdReviewsParams +} + +type GetTitleTitleIdReviewsResponseObject interface { + VisitGetTitleTitleIdReviewsResponse(w http.ResponseWriter) error +} + +type GetTitleTitleIdReviews200JSONResponse []Review + +func (response GetTitleTitleIdReviews200JSONResponse) VisitGetTitleTitleIdReviewsResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type GetTitleTitleIdReviews204Response struct { +} + +func (response GetTitleTitleIdReviews204Response) VisitGetTitleTitleIdReviewsResponse(w http.ResponseWriter) error { + w.WriteHeader(204) + return nil +} + +type GetUsersRequestObject struct { + Params GetUsersParams +} + +type GetUsersResponseObject interface { + VisitGetUsersResponse(w http.ResponseWriter) error +} + +type GetUsers200JSONResponse []User + +func (response GetUsers200JSONResponse) VisitGetUsersResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type PostUsersRequestObject struct { + Body *PostUsersJSONRequestBody +} + +type PostUsersResponseObject interface { + VisitPostUsersResponse(w http.ResponseWriter) error +} + +type PostUsers200JSONResponse struct { + Error *string `json:"error,omitempty"` + Success *bool `json:"success,omitempty"` + UserJson *User `json:"user_json,omitempty"` +} + +func (response PostUsers200JSONResponse) VisitPostUsersResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type DeleteUsersUserIdRequestObject struct { + UserId string `json:"user_id"` +} + +type DeleteUsersUserIdResponseObject interface { + VisitDeleteUsersUserIdResponse(w http.ResponseWriter) error +} + +type DeleteUsersUserId200JSONResponse struct { + Error *string `json:"error,omitempty"` + Success *bool `json:"success,omitempty"` +} + +func (response DeleteUsersUserId200JSONResponse) VisitDeleteUsersUserIdResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type GetUsersUserIdRequestObject struct { + UserId string `json:"user_id"` + Params GetUsersUserIdParams +} + +type GetUsersUserIdResponseObject interface { + VisitGetUsersUserIdResponse(w http.ResponseWriter) error +} + +type GetUsersUserId200JSONResponse User + +func (response GetUsersUserId200JSONResponse) VisitGetUsersUserIdResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type GetUsersUserId404Response struct { +} + +func (response GetUsersUserId404Response) VisitGetUsersUserIdResponse(w http.ResponseWriter) error { + w.WriteHeader(404) + return nil +} + +type PatchUsersUserIdRequestObject struct { + UserId string `json:"user_id"` + Body *PatchUsersUserIdJSONRequestBody +} + +type PatchUsersUserIdResponseObject interface { + VisitPatchUsersUserIdResponse(w http.ResponseWriter) error +} + +type PatchUsersUserId200JSONResponse struct { + Error *string `json:"error,omitempty"` + Success *bool `json:"success,omitempty"` +} + +func (response PatchUsersUserId200JSONResponse) VisitPatchUsersUserIdResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type GetUsersUserIdReviewsRequestObject struct { + UserId string `json:"user_id"` + Params GetUsersUserIdReviewsParams +} + +type GetUsersUserIdReviewsResponseObject interface { + VisitGetUsersUserIdReviewsResponse(w http.ResponseWriter) error +} + +type GetUsersUserIdReviews200JSONResponse []Review + +func (response GetUsersUserIdReviews200JSONResponse) VisitGetUsersUserIdReviewsResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type DeleteUsersUserIdTitlesRequestObject struct { + UserId string `json:"user_id"` + Params DeleteUsersUserIdTitlesParams +} + +type DeleteUsersUserIdTitlesResponseObject interface { + VisitDeleteUsersUserIdTitlesResponse(w http.ResponseWriter) error +} + +type DeleteUsersUserIdTitles200JSONResponse struct { + Error *string `json:"error,omitempty"` + Success *bool `json:"success,omitempty"` +} + +func (response DeleteUsersUserIdTitles200JSONResponse) VisitDeleteUsersUserIdTitlesResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type GetUsersUserIdTitlesRequestObject struct { + UserId string `json:"user_id"` + Params GetUsersUserIdTitlesParams +} + +type GetUsersUserIdTitlesResponseObject interface { + VisitGetUsersUserIdTitlesResponse(w http.ResponseWriter) error +} + +type GetUsersUserIdTitles200JSONResponse []UserTitle + +func (response GetUsersUserIdTitles200JSONResponse) VisitGetUsersUserIdTitlesResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type GetUsersUserIdTitles204Response struct { +} + +func (response GetUsersUserIdTitles204Response) VisitGetUsersUserIdTitlesResponse(w http.ResponseWriter) error { + w.WriteHeader(204) + return nil +} + +type PatchUsersUserIdTitlesRequestObject struct { + UserId string `json:"user_id"` + Body *PatchUsersUserIdTitlesJSONRequestBody +} + +type PatchUsersUserIdTitlesResponseObject interface { + VisitPatchUsersUserIdTitlesResponse(w http.ResponseWriter) error +} + +type PatchUsersUserIdTitles200JSONResponse struct { + Error *string `json:"error,omitempty"` + Success *bool `json:"success,omitempty"` +} + +func (response PatchUsersUserIdTitles200JSONResponse) VisitPatchUsersUserIdTitlesResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type PostUsersUserIdTitlesRequestObject struct { + UserId string `json:"user_id"` + Body *PostUsersUserIdTitlesJSONRequestBody +} + +type PostUsersUserIdTitlesResponseObject interface { + VisitPostUsersUserIdTitlesResponse(w http.ResponseWriter) error +} + +type PostUsersUserIdTitles200JSONResponse struct { + Error *string `json:"error,omitempty"` + Success *bool `json:"success,omitempty"` +} + +func (response PostUsersUserIdTitles200JSONResponse) VisitPostUsersUserIdTitlesResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +// StrictServerInterface represents all server handlers. +type StrictServerInterface interface { + // Get image path + // (GET /media) + GetMedia(ctx context.Context, request GetMediaRequestObject) (GetMediaResponseObject, error) + // Upload image + // (POST /media) + PostMedia(ctx context.Context, request PostMediaRequestObject) (PostMediaResponseObject, error) + // Add review + // (POST /reviews) + PostReviews(ctx context.Context, request PostReviewsRequestObject) (PostReviewsResponseObject, error) + // Delete review + // (DELETE /reviews/{review_id}) + DeleteReviewsReviewId(ctx context.Context, request DeleteReviewsReviewIdRequestObject) (DeleteReviewsReviewIdResponseObject, error) + // Update review + // (PATCH /reviews/{review_id}) + PatchReviewsReviewId(ctx context.Context, request PatchReviewsReviewIdRequestObject) (PatchReviewsReviewIdResponseObject, error) + // Get tags + // (GET /tags) + GetTags(ctx context.Context, request GetTagsRequestObject) (GetTagsResponseObject, error) + // Get titles + // (GET /title) + GetTitle(ctx context.Context, request GetTitleRequestObject) (GetTitleResponseObject, error) + // Get title description + // (GET /title/{title_id}) + GetTitleTitleId(ctx context.Context, request GetTitleTitleIdRequestObject) (GetTitleTitleIdResponseObject, error) + // Update title info + // (PATCH /title/{title_id}) + PatchTitleTitleId(ctx context.Context, request PatchTitleTitleIdRequestObject) (PatchTitleTitleIdResponseObject, error) + // Get title reviews + // (GET /title/{title_id}/reviews) + GetTitleTitleIdReviews(ctx context.Context, request GetTitleTitleIdReviewsRequestObject) (GetTitleTitleIdReviewsResponseObject, error) + // Search user + // (GET /users) + GetUsers(ctx context.Context, request GetUsersRequestObject) (GetUsersResponseObject, error) + // Add new user + // (POST /users) + PostUsers(ctx context.Context, request PostUsersRequestObject) (PostUsersResponseObject, error) + // Delete user + // (DELETE /users/{user_id}) + DeleteUsersUserId(ctx context.Context, request DeleteUsersUserIdRequestObject) (DeleteUsersUserIdResponseObject, error) + // Get user info + // (GET /users/{user_id}) + GetUsersUserId(ctx context.Context, request GetUsersUserIdRequestObject) (GetUsersUserIdResponseObject, error) + // Update user + // (PATCH /users/{user_id}) + PatchUsersUserId(ctx context.Context, request PatchUsersUserIdRequestObject) (PatchUsersUserIdResponseObject, error) + // Get user reviews + // (GET /users/{user_id}/reviews) + GetUsersUserIdReviews(ctx context.Context, request GetUsersUserIdReviewsRequestObject) (GetUsersUserIdReviewsResponseObject, error) + // Delete user title + // (DELETE /users/{user_id}/titles) + DeleteUsersUserIdTitles(ctx context.Context, request DeleteUsersUserIdTitlesRequestObject) (DeleteUsersUserIdTitlesResponseObject, error) + // Get user titles + // (GET /users/{user_id}/titles) + GetUsersUserIdTitles(ctx context.Context, request GetUsersUserIdTitlesRequestObject) (GetUsersUserIdTitlesResponseObject, error) + // Update user title + // (PATCH /users/{user_id}/titles) + PatchUsersUserIdTitles(ctx context.Context, request PatchUsersUserIdTitlesRequestObject) (PatchUsersUserIdTitlesResponseObject, error) + // Add user title + // (POST /users/{user_id}/titles) + PostUsersUserIdTitles(ctx context.Context, request PostUsersUserIdTitlesRequestObject) (PostUsersUserIdTitlesResponseObject, error) +} + +type StrictHandlerFunc = strictgin.StrictGinHandlerFunc +type StrictMiddlewareFunc = strictgin.StrictGinMiddlewareFunc + +func NewStrictHandler(ssi StrictServerInterface, middlewares []StrictMiddlewareFunc) ServerInterface { + return &strictHandler{ssi: ssi, middlewares: middlewares} +} + +type strictHandler struct { + ssi StrictServerInterface + middlewares []StrictMiddlewareFunc +} + +// GetMedia operation middleware +func (sh *strictHandler) GetMedia(ctx *gin.Context, params GetMediaParams) { + var request GetMediaRequestObject + + request.Params = params + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.GetMedia(ctx, request.(GetMediaRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "GetMedia") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(GetMediaResponseObject); ok { + if err := validResponse.VisitGetMediaResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// PostMedia operation middleware +func (sh *strictHandler) PostMedia(ctx *gin.Context) { + var request PostMediaRequestObject + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.PostMedia(ctx, request.(PostMediaRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "PostMedia") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(PostMediaResponseObject); ok { + if err := validResponse.VisitPostMediaResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// PostReviews operation middleware +func (sh *strictHandler) PostReviews(ctx *gin.Context) { + var request PostReviewsRequestObject + + var body PostReviewsJSONRequestBody + if err := ctx.ShouldBindJSON(&body); err != nil { + ctx.Status(http.StatusBadRequest) + ctx.Error(err) + return + } + request.Body = &body + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.PostReviews(ctx, request.(PostReviewsRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "PostReviews") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(PostReviewsResponseObject); ok { + if err := validResponse.VisitPostReviewsResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// DeleteReviewsReviewId operation middleware +func (sh *strictHandler) DeleteReviewsReviewId(ctx *gin.Context, reviewId string) { + var request DeleteReviewsReviewIdRequestObject + + request.ReviewId = reviewId + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.DeleteReviewsReviewId(ctx, request.(DeleteReviewsReviewIdRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "DeleteReviewsReviewId") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(DeleteReviewsReviewIdResponseObject); ok { + if err := validResponse.VisitDeleteReviewsReviewIdResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// PatchReviewsReviewId operation middleware +func (sh *strictHandler) PatchReviewsReviewId(ctx *gin.Context, reviewId string) { + var request PatchReviewsReviewIdRequestObject + + request.ReviewId = reviewId + + var body PatchReviewsReviewIdJSONRequestBody + if err := ctx.ShouldBindJSON(&body); err != nil { + ctx.Status(http.StatusBadRequest) + ctx.Error(err) + return + } + request.Body = &body + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.PatchReviewsReviewId(ctx, request.(PatchReviewsReviewIdRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "PatchReviewsReviewId") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(PatchReviewsReviewIdResponseObject); ok { + if err := validResponse.VisitPatchReviewsReviewIdResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// GetTags operation middleware +func (sh *strictHandler) GetTags(ctx *gin.Context, params GetTagsParams) { + var request GetTagsRequestObject + + request.Params = params + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.GetTags(ctx, request.(GetTagsRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "GetTags") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(GetTagsResponseObject); ok { + if err := validResponse.VisitGetTagsResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// GetTitle operation middleware +func (sh *strictHandler) GetTitle(ctx *gin.Context, params GetTitleParams) { + var request GetTitleRequestObject + + request.Params = params + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.GetTitle(ctx, request.(GetTitleRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "GetTitle") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(GetTitleResponseObject); ok { + if err := validResponse.VisitGetTitleResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// GetTitleTitleId operation middleware +func (sh *strictHandler) GetTitleTitleId(ctx *gin.Context, titleId string, params GetTitleTitleIdParams) { + var request GetTitleTitleIdRequestObject + + request.TitleId = titleId + request.Params = params + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.GetTitleTitleId(ctx, request.(GetTitleTitleIdRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "GetTitleTitleId") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(GetTitleTitleIdResponseObject); ok { + if err := validResponse.VisitGetTitleTitleIdResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// PatchTitleTitleId operation middleware +func (sh *strictHandler) PatchTitleTitleId(ctx *gin.Context, titleId string) { + var request PatchTitleTitleIdRequestObject + + request.TitleId = titleId + + var body PatchTitleTitleIdJSONRequestBody + if err := ctx.ShouldBindJSON(&body); err != nil { + ctx.Status(http.StatusBadRequest) + ctx.Error(err) + return + } + request.Body = &body + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.PatchTitleTitleId(ctx, request.(PatchTitleTitleIdRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "PatchTitleTitleId") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(PatchTitleTitleIdResponseObject); ok { + if err := validResponse.VisitPatchTitleTitleIdResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// GetTitleTitleIdReviews operation middleware +func (sh *strictHandler) GetTitleTitleIdReviews(ctx *gin.Context, titleId string, params GetTitleTitleIdReviewsParams) { + var request GetTitleTitleIdReviewsRequestObject + + request.TitleId = titleId + request.Params = params + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.GetTitleTitleIdReviews(ctx, request.(GetTitleTitleIdReviewsRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "GetTitleTitleIdReviews") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(GetTitleTitleIdReviewsResponseObject); ok { + if err := validResponse.VisitGetTitleTitleIdReviewsResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// GetUsers operation middleware +func (sh *strictHandler) GetUsers(ctx *gin.Context, params GetUsersParams) { + var request GetUsersRequestObject + + request.Params = params + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.GetUsers(ctx, request.(GetUsersRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "GetUsers") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(GetUsersResponseObject); ok { + if err := validResponse.VisitGetUsersResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// PostUsers operation middleware +func (sh *strictHandler) PostUsers(ctx *gin.Context) { + var request PostUsersRequestObject + + var body PostUsersJSONRequestBody + if err := ctx.ShouldBindJSON(&body); err != nil { + ctx.Status(http.StatusBadRequest) + ctx.Error(err) + return + } + request.Body = &body + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.PostUsers(ctx, request.(PostUsersRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "PostUsers") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(PostUsersResponseObject); ok { + if err := validResponse.VisitPostUsersResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// DeleteUsersUserId operation middleware +func (sh *strictHandler) DeleteUsersUserId(ctx *gin.Context, userId string) { + var request DeleteUsersUserIdRequestObject + + request.UserId = userId + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.DeleteUsersUserId(ctx, request.(DeleteUsersUserIdRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "DeleteUsersUserId") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(DeleteUsersUserIdResponseObject); ok { + if err := validResponse.VisitDeleteUsersUserIdResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// GetUsersUserId operation middleware +func (sh *strictHandler) GetUsersUserId(ctx *gin.Context, userId string, params GetUsersUserIdParams) { + var request GetUsersUserIdRequestObject + + request.UserId = userId + request.Params = params + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.GetUsersUserId(ctx, request.(GetUsersUserIdRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "GetUsersUserId") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(GetUsersUserIdResponseObject); ok { + if err := validResponse.VisitGetUsersUserIdResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// PatchUsersUserId operation middleware +func (sh *strictHandler) PatchUsersUserId(ctx *gin.Context, userId string) { + var request PatchUsersUserIdRequestObject + + request.UserId = userId + + var body PatchUsersUserIdJSONRequestBody + if err := ctx.ShouldBindJSON(&body); err != nil { + ctx.Status(http.StatusBadRequest) + ctx.Error(err) + return + } + request.Body = &body + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.PatchUsersUserId(ctx, request.(PatchUsersUserIdRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "PatchUsersUserId") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(PatchUsersUserIdResponseObject); ok { + if err := validResponse.VisitPatchUsersUserIdResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// GetUsersUserIdReviews operation middleware +func (sh *strictHandler) GetUsersUserIdReviews(ctx *gin.Context, userId string, params GetUsersUserIdReviewsParams) { + var request GetUsersUserIdReviewsRequestObject + + request.UserId = userId + request.Params = params + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.GetUsersUserIdReviews(ctx, request.(GetUsersUserIdReviewsRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "GetUsersUserIdReviews") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(GetUsersUserIdReviewsResponseObject); ok { + if err := validResponse.VisitGetUsersUserIdReviewsResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// DeleteUsersUserIdTitles operation middleware +func (sh *strictHandler) DeleteUsersUserIdTitles(ctx *gin.Context, userId string, params DeleteUsersUserIdTitlesParams) { + var request DeleteUsersUserIdTitlesRequestObject + + request.UserId = userId + request.Params = params + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.DeleteUsersUserIdTitles(ctx, request.(DeleteUsersUserIdTitlesRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "DeleteUsersUserIdTitles") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(DeleteUsersUserIdTitlesResponseObject); ok { + if err := validResponse.VisitDeleteUsersUserIdTitlesResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// GetUsersUserIdTitles operation middleware +func (sh *strictHandler) GetUsersUserIdTitles(ctx *gin.Context, userId string, params GetUsersUserIdTitlesParams) { + var request GetUsersUserIdTitlesRequestObject + + request.UserId = userId + request.Params = params + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.GetUsersUserIdTitles(ctx, request.(GetUsersUserIdTitlesRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "GetUsersUserIdTitles") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(GetUsersUserIdTitlesResponseObject); ok { + if err := validResponse.VisitGetUsersUserIdTitlesResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// PatchUsersUserIdTitles operation middleware +func (sh *strictHandler) PatchUsersUserIdTitles(ctx *gin.Context, userId string) { + var request PatchUsersUserIdTitlesRequestObject + + request.UserId = userId + + var body PatchUsersUserIdTitlesJSONRequestBody + if err := ctx.ShouldBindJSON(&body); err != nil { + ctx.Status(http.StatusBadRequest) + ctx.Error(err) + return + } + request.Body = &body + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.PatchUsersUserIdTitles(ctx, request.(PatchUsersUserIdTitlesRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "PatchUsersUserIdTitles") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(PatchUsersUserIdTitlesResponseObject); ok { + if err := validResponse.VisitPatchUsersUserIdTitlesResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// PostUsersUserIdTitles operation middleware +func (sh *strictHandler) PostUsersUserIdTitles(ctx *gin.Context, userId string) { + var request PostUsersUserIdTitlesRequestObject + + request.UserId = userId + + var body PostUsersUserIdTitlesJSONRequestBody + if err := ctx.ShouldBindJSON(&body); err != nil { + ctx.Status(http.StatusBadRequest) + ctx.Error(err) + return + } + request.Body = &body + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.PostUsersUserIdTitles(ctx, request.(PostUsersUserIdTitlesRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "PostUsersUserIdTitles") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(PostUsersUserIdTitlesResponseObject); ok { + if err := validResponse.VisitPostUsersUserIdTitlesResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} diff --git a/modules/backend/api/impl.go b/modules/backend/api/impl.go new file mode 100644 index 0000000..5783f47 --- /dev/null +++ b/modules/backend/api/impl.go @@ -0,0 +1,718 @@ +package api + +import ( + "context" + "encoding/json" + "nyanimedb-server/db" + "strconv" + "time" + + "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/pgtype" + "golang.org/x/crypto/bcrypt" +) + +type Server struct { + db *db.Queries +} + +func NewServer(db *db.Queries) Server { + return Server{db: db} +} + +// ————————————————————————————————————————————— +// ВСПОМОГАТЕЛЬНЫЕ ФУНКЦИИ +// ————————————————————————————————————————————— + +func parseInt32(s string) (int32, error) { + i, err := strconv.ParseInt(s, 10, 32) + return int32(i), err +} + +func ptr[T any](v T) *T { return &v } + +func pgInt4ToPtr(v pgtype.Int4) *int32 { + if v.Valid { + return &v.Int32 + } + return nil +} + +func pgTextToPtr(v pgtype.Text) *string { + if v.Valid { + return &v.String + } + return nil +} + +func pgFloat8ToPtr(v pgtype.Float8) *float64 { + if v.Valid { + return &v.Float64 + } + return nil +} + +func jsonbToInterface(data []byte) interface{} { + if data == nil { + return nil + } + var out interface{} + if err := json.Unmarshal(data, &out); err != nil { + return string(data) // fallback + } + return out +} + +// ————————————————————————————————————————————— +// ХЕНДЛЕРЫ +// ————————————————————————————————————————————— + +func (s Server) GetMedia(ctx context.Context, req GetMediaRequestObject) (GetMediaResponseObject, error) { + id, err := parseInt32(req.Params.ImageId) + if err != nil { + return GetMedia200JSONResponse{Success: ptr(false), Error: ptr("invalid image_id")}, nil + } + img, err := s.db.GetImageByID(ctx, id) + if err != nil { + if err == pgx.ErrNoRows { + return GetMedia200JSONResponse{Success: ptr(false), Error: ptr("image not found")}, nil + } + return nil, err + } + return GetMedia200JSONResponse{ + Success: ptr(true), + ImagePath: ptr(img.ImagePath), + }, nil +} + +func (s Server) PostMedia(ctx context.Context, req PostMediaRequestObject) (PostMediaResponseObject, error) { + // ❗ Не реализовано: OpenAPI не определяет тело запроса для загрузки + return PostMedia200JSONResponse{ + Success: ptr(false), + Error: ptr("upload not implemented: request body not defined in spec"), + }, nil +} + +func (s Server) GetUsers(ctx context.Context, req GetUsersRequestObject) (GetUsersResponseObject, error) { + users, err := s.db.ListUsers(ctx, db.ListUsersParams{}) + if err != nil { + return nil, err + } + var resp []User + for _, u := range users { + resp = append(resp, mapUser(u)) + } + return GetUsers200JSONResponse(resp), nil +} + +func (s Server) PostUsers(ctx context.Context, req PostUsersRequestObject) (PostUsersResponseObject, error) { + if req.Body == nil { + return PostUsers200JSONResponse{ + Success: ptr(false), + Error: ptr("request body is required"), + }, nil + } + + body := *req.Body + + // Обязательные поля + nickname, ok := body["nickname"].(string) + if !ok || nickname == "" { + return PostUsers200JSONResponse{Success: ptr(false), Error: ptr("nickname is required")}, nil + } + + mail, ok := body["mail"].(string) + if !ok || mail == "" { + return PostUsers200JSONResponse{Success: ptr(false), Error: ptr("mail is required")}, nil + } + + password, ok := body["password"].(string) + if !ok || password == "" { + return PostUsers200JSONResponse{Success: ptr(false), Error: ptr("password is required")}, nil + } + + // Опциональные поля + var avatarID *int32 + if v, ok := body["avatar_id"].(float64); ok { + id := int32(v) + avatarID = &id + } + + dispName, _ := body["disp_name"].(string) + userDesc, _ := body["user_desc"].(string) + + // 🔐 Хешируем пароль + passhashBytes, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost) + if err != nil { + return PostUsers200JSONResponse{Success: ptr(false), Error: ptr("failed to hash password")}, nil + } + passhash := string(passhashBytes) + + // Сохраняем в БД + _, err = s.db.CreateUser(ctx, db.CreateUserParams{ + AvatarID: pgtype.Int4{ + Int32: 0, + Valid: avatarID != nil, + }, + Passhash: passhash, + Mail: pgtype.Text{ + String: mail, + Valid: true, + }, + Nickname: nickname, + DispName: pgtype.Text{ + String: dispName, + Valid: dispName != "", + }, + UserDesc: pgtype.Text{ + String: userDesc, + Valid: userDesc != "", + }, + CreationDate: pgtype.Timestamp{ + Time: time.Now(), + Valid: true, + }, + }) + if err != nil { + // Проверяем нарушение уникальности (например, дубль mail или nickname) + if err.Error() == "ERROR: duplicate key value violates unique constraint \"users_mail_key\"" || + err.Error() == "ERROR: duplicate key value violates unique constraint \"users_nickname_key\"" { + return PostUsers200JSONResponse{ + Success: ptr(false), + Error: ptr("user with this email or nickname already exists"), + }, nil + } + return PostUsers200JSONResponse{Success: ptr(false), Error: ptr("database error")}, nil + } + + // Получаем созданного пользователя (без passhash и mail!) + // Предположим, что у вас есть запрос GetUserByNickname или аналогичный + // Но проще — вернуть только ID и nickname + + // ⚠️ Поскольку мы не знаем user_id, можно: + // а) добавить RETURNING в CreateUser (рекомендуется), + // б) сделать отдельный SELECT. + + // Пока вернём минимальный ответ + userResp := User{ + "nickname": nickname, + // "user_id" можно добавить, если обновите query.sql + } + + return PostUsers200JSONResponse{ + Success: ptr(true), + UserJson: &userResp, + }, nil +} +func (s Server) DeleteUsersUserId(ctx context.Context, req DeleteUsersUserIdRequestObject) (DeleteUsersUserIdResponseObject, error) { + userID, err := parseInt32(req.UserId) + if err != nil { + return DeleteUsersUserId200JSONResponse{Success: ptr(false), Error: ptr("invalid user_id")}, nil + } + err = s.db.DeleteUser(ctx, userID) + if err != nil { + if err == pgx.ErrNoRows { + return DeleteUsersUserId200JSONResponse{Success: ptr(false), Error: ptr("user not found")}, nil + } + return nil, err + } + return DeleteUsersUserId200JSONResponse{Success: ptr(true)}, nil +} + +func (s Server) GetUsersUserId(ctx context.Context, req GetUsersUserIdRequestObject) (GetUsersUserIdResponseObject, error) { + userID, err := parseInt32(req.UserId) + if err != nil { + return GetUsersUserId404Response{}, nil + } + user, err := s.db.GetUserByID(ctx, userID) + if err != nil { + if err == pgx.ErrNoRows { + return GetUsersUserId404Response{}, nil + } + return nil, err + } + return GetUsersUserId200JSONResponse(mapUser(user)), nil +} + +func (s Server) PatchUsersUserId(ctx context.Context, req PatchUsersUserIdRequestObject) (PatchUsersUserIdResponseObject, error) { + userID, err := parseInt32(req.UserId) + if err != nil { + return PatchUsersUserId200JSONResponse{Success: ptr(false), Error: ptr("invalid user_id")}, nil + } + if req.Body == nil { + return PatchUsersUserId200JSONResponse{Success: ptr(false), Error: ptr("empty body")}, nil + } + + body := *req.Body + args := db.UpdateUserParams{ + UserID: userID, + } + + if v, ok := body["avatar_id"].(float64); ok { + args.AvatarID = pgtype.Int4{Int32: int32(v), Valid: true} + // args.AvatarIDValid = true + } + if v, ok := body["disp_name"].(string); ok { + args.DispName = pgtype.Text{String: v, Valid: true} + // args.DispNameValid = true + } + if v, ok := body["user_desc"].(string); ok { + args.UserDesc = pgtype.Text{String: v, Valid: true} + // args.UserDescValid = true + } + + _, err = s.db.UpdateUser(ctx, args) + if err != nil { + return PatchUsersUserId200JSONResponse{Success: ptr(false), Error: ptr(err.Error())}, nil + } + return PatchUsersUserId200JSONResponse{Success: ptr(true)}, nil +} + +func (s Server) GetUsersUserIdReviews(ctx context.Context, req GetUsersUserIdReviewsRequestObject) (GetUsersUserIdReviewsResponseObject, error) { + userID, err := parseInt32(req.UserId) + if err != nil { + return GetUsersUserIdReviews200JSONResponse{}, nil + } + limit := int32(20) + offset := int32(0) + // if req.Params.Limit != nil { + // limit = int32(*req.Params.Limit) + // } + // if req.Params.Offset != nil { + // offset = int32(*req.Params.Offset) + // } + + reviews, err := s.db.ListReviewsByUser(ctx, db.ListReviewsByUserParams{ + UserID: userID, + Limit: limit, + Offset: offset, + }) + if err != nil { + return nil, err + } + + var resp []Review + for _, r := range reviews { + resp = append(resp, mapReview(r)) + } + return GetUsersUserIdReviews200JSONResponse(resp), nil +} + +func (s Server) DeleteUsersUserIdTitles(ctx context.Context, req DeleteUsersUserIdTitlesRequestObject) (DeleteUsersUserIdTitlesResponseObject, error) { + userID, err := parseInt32(req.UserId) + if err != nil { + return DeleteUsersUserIdTitles200JSONResponse{Success: ptr(false), Error: ptr("invalid user_id")}, nil + } + + if req.Params.TitleId != nil { + titleID, err := parseInt32(*req.Params.TitleId) + if err != nil { + return DeleteUsersUserIdTitles200JSONResponse{Success: ptr(false), Error: ptr("invalid title_id")}, nil + } + err = s.db.DeleteUserTitle(ctx, db.DeleteUserTitleParams{ + UserID: userID, + Column2: titleID, + }) + if err != nil && err != pgx.ErrNoRows { + return nil, err + } + } + // else { + // err = s.db.DeleteAllUserTitles(ctx, userID) + // if err != nil { + // return nil, err + // } + // } + return DeleteUsersUserIdTitles200JSONResponse{Success: ptr(true)}, nil +} + +func (s Server) GetUsersUserIdTitles(ctx context.Context, req GetUsersUserIdTitlesRequestObject) (GetUsersUserIdTitlesResponseObject, error) { + userID, err := parseInt32(req.UserId) + if err != nil { + return GetUsersUserIdTitles200JSONResponse{}, nil + } + limit := int32(100) + offset := int32(0) + if req.Params.Limit != nil { + limit = int32(*req.Params.Limit) + } + if req.Params.Offset != nil { + offset = int32(*req.Params.Offset) + } + + titles, err := s.db.ListUserTitles(ctx, db.ListUserTitlesParams{ + UserID: userID, + Limit: limit, + Offset: offset, + }) + if err != nil { + return nil, err + } + + var resp []UserTitle + for _, t := range titles { + resp = append(resp, mapUserTitle(t)) + } + return GetUsersUserIdTitles200JSONResponse(resp), nil +} + +func (s Server) PatchUsersUserIdTitles(ctx context.Context, req PatchUsersUserIdTitlesRequestObject) (PatchUsersUserIdTitlesResponseObject, error) { + // userID, err := parseInt32(req.UserId) + // if err != nil { + // return PatchUsersUserIdTitles200JSONResponse{Success: ptr(false), Error: ptr("invalid user_id")}, nil + // } + // if req.Body == nil { + // return PatchUsersUserIdTitles200JSONResponse{Success: ptr(false), Error: ptr("empty body")}, nil + // } + + // body := *req.Body + // titleID, ok := body["title_id"].(float64) + // if !ok { + // return PatchUsersUserIdTitles200JSONResponse{Success: ptr(false), Error: ptr("title_id required")}, nil + // } + + // args := db.UpdateUserTitleParams{ + // UserID: userID, + // TitleID: int32(titleID), + // } + + // if v, ok := body["status"].(string); ok { + // args.Status = db.UsertitleStatusT(v) + // // args.StatusValid = true + // } + // if v, ok := body["rate"].(float64); ok { + // args.Rate = pgtype.Int4{Int32: int32(v), Valid: true} + // // args.RateValid = true + // } + // if v, ok := body["review_id"].(float64); ok { + // args.ReviewID = pgtype.Int4{Int32: int32(v), Valid: true} + // // args.ReviewIDValid = true + // } + + // _, err = s.db.UpdateUserTitle(ctx, args) + // if err != nil { + // return PatchUsersUserIdTitles200JSONResponse{Success: ptr(false), Error: ptr(err.Error())}, nil + // } + return PatchUsersUserIdTitles200JSONResponse{Success: ptr(true)}, nil +} + +func (s Server) PostUsersUserIdTitles(ctx context.Context, req PostUsersUserIdTitlesRequestObject) (PostUsersUserIdTitlesResponseObject, error) { + userID, err := parseInt32(req.UserId) + if err != nil { + return PostUsersUserIdTitles200JSONResponse{Success: ptr(false), Error: ptr("invalid user_id")}, nil + } + if req.Body == nil { + return PostUsersUserIdTitles200JSONResponse{Success: ptr(false), Error: ptr("empty body")}, nil + } + + body := req.Body + titleID, err := parseInt32(*body.TitleId) + if err != nil { + return PostUsersUserIdTitles200JSONResponse{Success: ptr(false), Error: ptr("invalid title_id")}, nil + } + + status := db.UsertitleStatusT("planned") + if body.Status != nil { + status = db.UsertitleStatusT(*body.Status) + } + + _, err = s.db.CreateUserTitle(ctx, db.CreateUserTitleParams{ + UserID: userID, + TitleID: titleID, + Status: status, + Rate: pgtype.Int4{Valid: false}, + ReviewID: pgtype.Int4{Valid: false}, + }) + if err != nil { + return PostUsersUserIdTitles200JSONResponse{Success: ptr(false), Error: ptr(err.Error())}, nil + } + return PostUsersUserIdTitles200JSONResponse{Success: ptr(true)}, nil +} + +func (s Server) GetTags(ctx context.Context, req GetTagsRequestObject) (GetTagsResponseObject, error) { + limit := int32(100) + offset := int32(0) + if req.Params.Limit != nil { + limit = int32(*req.Params.Limit) + } + if req.Params.Offset != nil { + offset = int32(*req.Params.Offset) + } + tags, err := s.db.ListTags(ctx, db.ListTagsParams{Limit: limit, Offset: offset}) + if err != nil { + return nil, err + } + var resp []Tag + for _, t := range tags { + resp = append(resp, Tag{ + "tag_id": t.TagID, + "tag_names": jsonbToInterface(t.TagNames), + }) + } + return GetTags200JSONResponse(resp), nil +} + +func (s Server) GetTitle(ctx context.Context, req GetTitleRequestObject) (GetTitleResponseObject, error) { + limit := int32(50) + offset := int32(0) + if req.Params.Limit != nil { + limit = int32(*req.Params.Limit) + } + if req.Params.Offset != nil { + offset = int32(*req.Params.Offset) + } + titles, err := s.db.ListTitles(ctx, db.ListTitlesParams{Limit: limit, Offset: offset}) + if err != nil { + return nil, err + } + var resp []Title + for _, t := range titles { + resp = append(resp, mapTitle(t)) + } + return GetTitle200JSONResponse(resp), nil +} + +func (s Server) GetTitleTitleId(ctx context.Context, req GetTitleTitleIdRequestObject) (GetTitleTitleIdResponseObject, error) { + titleID, err := parseInt32(req.TitleId) + if err != nil { + return GetTitleTitleId404Response{}, nil + } + title, err := s.db.GetTitleByID(ctx, titleID) + if err != nil { + if err == pgx.ErrNoRows { + return GetTitleTitleId404Response{}, nil + } + return nil, err + } + return GetTitleTitleId200JSONResponse(mapTitle(title)), nil +} + +func (s Server) PatchTitleTitleId(ctx context.Context, req PatchTitleTitleIdRequestObject) (PatchTitleTitleIdResponseObject, error) { + titleID, err := parseInt32(req.TitleId) + if err != nil { + return PatchTitleTitleId200JSONResponse{Success: ptr(false), Error: ptr("invalid title_id")}, nil + } + if req.Body == nil { + return PatchTitleTitleId200JSONResponse{Success: ptr(false), Error: ptr("empty body")}, nil + } + + body := *req.Body + args := db.UpdateTitleParams{ + TitleID: titleID, + } + + if v, ok := body["title_names"].(map[string]interface{}); ok { + data, _ := json.Marshal(v) + args.TitleNames = data + // args.TitleNamesValid = true + } + if v, ok := body["studio_id"].(float64); ok { + args.StudioID = pgtype.Int4{Int32: int32(v), Valid: true} + // args.StudioIDValid = true + } + if v, ok := body["poster_id"].(float64); ok { + args.PosterID = pgtype.Int4{Int32: int32(v), Valid: true} + // args.PosterIDValid = true + } + // if v, ok := body["title_status"].(string); ok { + // args.TitleStatus = db.NullTitleStatusT(v) + // // args.TitleStatusValid = true + // } + if v, ok := body["release_year"].(float64); ok { + args.ReleaseYear = pgtype.Int4{Int32: int32(v), Valid: true} + // args.ReleaseYearValid = true + } + if v, ok := body["episodes_aired"].(float64); ok { + args.EpisodesAired = pgtype.Int4{Int32: int32(v), Valid: true} + // args.EpisodesAiredValid = true + } + if v, ok := body["episodes_all"].(float64); ok { + args.EpisodesAll = pgtype.Int4{Int32: int32(v), Valid: true} + // args.EpisodesAllValid = true + } + + _, err = s.db.UpdateTitle(ctx, args) + if err != nil { + return PatchTitleTitleId200JSONResponse{Success: ptr(false), Error: ptr(err.Error())}, nil + } + return PatchTitleTitleId200JSONResponse{Success: ptr(true)}, nil +} + +func (s Server) GetTitleTitleIdReviews(ctx context.Context, req GetTitleTitleIdReviewsRequestObject) (GetTitleTitleIdReviewsResponseObject, error) { + titleID, err := parseInt32(req.TitleId) + if err != nil { + return GetTitleTitleIdReviews200JSONResponse{}, nil + } + limit := int32(20) + offset := int32(0) + if req.Params.Limit != nil { + limit = int32(*req.Params.Limit) + } + if req.Params.Offset != nil { + offset = int32(*req.Params.Offset) + } + + reviews, err := s.db.ListReviewsByTitle(ctx, db.ListReviewsByTitleParams{ + TitleID: titleID, + Limit: limit, + Offset: offset, + }) + if err != nil { + return nil, err + } + + var resp []Review + for _, r := range reviews { + resp = append(resp, mapReview(r)) + } + return GetTitleTitleIdReviews200JSONResponse(resp), nil +} + +func (s Server) PostReviews(ctx context.Context, req PostReviewsRequestObject) (PostReviewsResponseObject, error) { + if req.Body == nil { + return PostReviews200JSONResponse{Success: ptr(false), Error: ptr("empty body")}, nil + } + + body := *req.Body + userID, ok1 := body["user_id"].(float64) + titleID, ok2 := body["title_id"].(float64) + reviewText, ok3 := body["review_text"].(string) + if !ok1 || !ok2 || !ok3 { + return PostReviews200JSONResponse{Success: ptr(false), Error: ptr("user_id, title_id, review_text required")}, nil + } + + var imageIDs []int32 + if ids, ok := body["image_ids"].([]interface{}); ok { + for _, id := range ids { + if f, ok := id.(float64); ok { + imageIDs = append(imageIDs, int32(f)) + } + } + } + + _, err := s.db.CreateReview(ctx, db.CreateReviewParams{ + UserID: int32(userID), + TitleID: int32(titleID), + ImageIds: imageIDs, + ReviewText: reviewText, + CreationDate: pgtype.Timestamp{Time: time.Now(), Valid: true}, + }) + if err != nil { + return PostReviews200JSONResponse{Success: ptr(false), Error: ptr(err.Error())}, nil + } + + return PostReviews200JSONResponse{Success: ptr(true)}, nil +} + +func (s Server) DeleteReviewsReviewId(ctx context.Context, req DeleteReviewsReviewIdRequestObject) (DeleteReviewsReviewIdResponseObject, error) { + reviewID, err := parseInt32(req.ReviewId) + if err != nil { + return DeleteReviewsReviewId200JSONResponse{Success: ptr(false), Error: ptr("invalid review_id")}, nil + } + err = s.db.DeleteReview(ctx, reviewID) + if err != nil { + if err == pgx.ErrNoRows { + return DeleteReviewsReviewId200JSONResponse{Success: ptr(false), Error: ptr("review not found")}, nil + } + return nil, err + } + return DeleteReviewsReviewId200JSONResponse{Success: ptr(true)}, nil +} + +func (s Server) PatchReviewsReviewId(ctx context.Context, req PatchReviewsReviewIdRequestObject) (PatchReviewsReviewIdResponseObject, error) { + reviewID, err := parseInt32(req.ReviewId) + if err != nil { + return PatchReviewsReviewId200JSONResponse{Success: ptr(false), Error: ptr("invalid review_id")}, nil + } + if req.Body == nil { + return PatchReviewsReviewId200JSONResponse{Success: ptr(false), Error: ptr("empty body")}, nil + } + + body := *req.Body + args := db.UpdateReviewParams{ + ReviewID: reviewID, + } + + if v, ok := body["review_text"].(string); ok { + args.ReviewText = pgtype.Text{String: v, Valid: true} + // args.ReviewTextValid = true + } + if ids, ok := body["image_ids"].([]interface{}); ok { + var imageIDs []int32 + for _, id := range ids { + if f, ok := id.(float64); ok { + imageIDs = append(imageIDs, int32(f)) + } + } + args.ImageIds = imageIDs + // args.ImageIdsValid = true + } + + _, err = s.db.UpdateReview(ctx, args) + if err != nil { + return PatchReviewsReviewId200JSONResponse{Success: ptr(false), Error: ptr(err.Error())}, nil + } + return PatchReviewsReviewId200JSONResponse{Success: ptr(true)}, nil +} + +// ————————————————————————————————————————————— +// МАППИНГИ +// ————————————————————————————————————————————— + +func mapUser(u db.Users) User { + return User{ + "user_id": u.UserID, + "avatar_id": pgInt4ToPtr(u.AvatarID), + "nickname": u.Nickname, + "disp_name": pgTextToPtr(u.DispName), + "user_desc": pgTextToPtr(u.UserDesc), + "creation_date": u.CreationDate.Time, + // mail и passhash НЕ возвращаем! + } +} + +func mapTitle(t db.Titles) Title { + var releaseSeason interface{} + if t.ReleaseSeason.Valid { + releaseSeason = string(t.ReleaseSeason.ReleaseSeasonT) + } + + return Title{ + "title_id": t.TitleID, + "title_names": jsonbToInterface(t.TitleNames), + "studio_id": t.StudioID, + "poster_id": pgInt4ToPtr(t.PosterID), + "signal_ids": t.SignalIds, + "title_status": string(t.TitleStatus), + "rating": pgFloat8ToPtr(t.Rating), + "rating_count": pgInt4ToPtr(t.RatingCount), + "release_year": pgInt4ToPtr(t.ReleaseYear), + "release_season": releaseSeason, + "season": pgInt4ToPtr(t.Season), + "episodes_aired": pgInt4ToPtr(t.EpisodesAired), + "episodes_all": pgInt4ToPtr(t.EpisodesAll), + "episodes_len": jsonbToInterface(t.EpisodesLen), + } +} + +func mapReview(r db.Reviews) Review { + return Review{ + "review_id": r.ReviewID, + "user_id": r.UserID, + "title_id": r.TitleID, + "image_ids": r.ImageIds, + "review_text": r.ReviewText, + "creation_date": r.CreationDate.Time, + } +} + +func mapUserTitle(ut db.Usertitles) UserTitle { + return UserTitle{ + "usertitle_id": ut.UsertitleID, + "user_id": ut.UserID, + "title_id": ut.TitleID, + "status": string(ut.Status), + "rate": pgInt4ToPtr(ut.Rate), + "review_id": pgInt4ToPtr(ut.ReviewID), + } +} From e239c0ca0484c19443eb950a6dd8c3cd262e34d7 Mon Sep 17 00:00:00 2001 From: Iron_Felix Date: Sat, 11 Oct 2025 02:16:48 +0300 Subject: [PATCH 26/80] fix: now use strictgin --- api/gen.go | 1958 +++++++++++++++++++++++++++++++++++++++++ api/oapi-codegen.yaml | 6 + 2 files changed, 1964 insertions(+) create mode 100644 api/gen.go create mode 100644 api/oapi-codegen.yaml diff --git a/api/gen.go b/api/gen.go new file mode 100644 index 0000000..2dcb886 --- /dev/null +++ b/api/gen.go @@ -0,0 +1,1958 @@ +// Package api provides primitives to interact with the openapi HTTP API. +// +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.5.0 DO NOT EDIT. +package api + +import ( + "context" + "encoding/json" + "fmt" + "net/http" + + "github.com/gin-gonic/gin" + "github.com/oapi-codegen/runtime" + strictgin "github.com/oapi-codegen/runtime/strictmiddleware/gin" +) + +// Review defines model for Review. +type Review map[string]interface{} + +// Tag defines model for Tag. +type Tag map[string]interface{} + +// Title defines model for Title. +type Title map[string]interface{} + +// User defines model for User. +type User map[string]interface{} + +// UserTitle defines model for UserTitle. +type UserTitle map[string]interface{} + +// GetMediaParams defines parameters for GetMedia. +type GetMediaParams struct { + ImageId string `form:"image_id" json:"image_id"` +} + +// GetTagsParams defines parameters for GetTags. +type GetTagsParams struct { + Limit *int `form:"limit,omitempty" json:"limit,omitempty"` + Offset *int `form:"offset,omitempty" json:"offset,omitempty"` + Fields *string `form:"fields,omitempty" json:"fields,omitempty"` +} + +// GetTitleParams defines parameters for GetTitle. +type GetTitleParams struct { + Query *string `form:"query,omitempty" json:"query,omitempty"` + Limit *int `form:"limit,omitempty" json:"limit,omitempty"` + Offset *int `form:"offset,omitempty" json:"offset,omitempty"` + Fields *string `form:"fields,omitempty" json:"fields,omitempty"` +} + +// GetTitleTitleIdParams defines parameters for GetTitleTitleId. +type GetTitleTitleIdParams struct { + Fields *string `form:"fields,omitempty" json:"fields,omitempty"` +} + +// GetTitleTitleIdReviewsParams defines parameters for GetTitleTitleIdReviews. +type GetTitleTitleIdReviewsParams struct { + Limit *int `form:"limit,omitempty" json:"limit,omitempty"` + Offset *int `form:"offset,omitempty" json:"offset,omitempty"` +} + +// GetUsersParams defines parameters for GetUsers. +type GetUsersParams struct { + Query *string `form:"query,omitempty" json:"query,omitempty"` + Fields *string `form:"fields,omitempty" json:"fields,omitempty"` +} + +// GetUsersUserIdParams defines parameters for GetUsersUserId. +type GetUsersUserIdParams struct { + Fields *string `form:"fields,omitempty" json:"fields,omitempty"` +} + +// GetUsersUserIdReviewsParams defines parameters for GetUsersUserIdReviews. +type GetUsersUserIdReviewsParams struct { + Limit *int `form:"limit,omitempty" json:"limit,omitempty"` + Offset *int `form:"offset,omitempty" json:"offset,omitempty"` +} + +// DeleteUsersUserIdTitlesParams defines parameters for DeleteUsersUserIdTitles. +type DeleteUsersUserIdTitlesParams struct { + TitleId *string `form:"title_id,omitempty" json:"title_id,omitempty"` +} + +// GetUsersUserIdTitlesParams defines parameters for GetUsersUserIdTitles. +type GetUsersUserIdTitlesParams struct { + Query *string `form:"query,omitempty" json:"query,omitempty"` + Limit *int `form:"limit,omitempty" json:"limit,omitempty"` + Offset *int `form:"offset,omitempty" json:"offset,omitempty"` + Fields *string `form:"fields,omitempty" json:"fields,omitempty"` +} + +// PostUsersUserIdTitlesJSONBody defines parameters for PostUsersUserIdTitles. +type PostUsersUserIdTitlesJSONBody struct { + Status *string `json:"status,omitempty"` + TitleId *string `json:"title_id,omitempty"` +} + +// PostReviewsJSONRequestBody defines body for PostReviews for application/json ContentType. +type PostReviewsJSONRequestBody = Review + +// PatchReviewsReviewIdJSONRequestBody defines body for PatchReviewsReviewId for application/json ContentType. +type PatchReviewsReviewIdJSONRequestBody = Review + +// PatchTitleTitleIdJSONRequestBody defines body for PatchTitleTitleId for application/json ContentType. +type PatchTitleTitleIdJSONRequestBody = Title + +// PostUsersJSONRequestBody defines body for PostUsers for application/json ContentType. +type PostUsersJSONRequestBody = User + +// PatchUsersUserIdJSONRequestBody defines body for PatchUsersUserId for application/json ContentType. +type PatchUsersUserIdJSONRequestBody = User + +// PatchUsersUserIdTitlesJSONRequestBody defines body for PatchUsersUserIdTitles for application/json ContentType. +type PatchUsersUserIdTitlesJSONRequestBody = UserTitle + +// PostUsersUserIdTitlesJSONRequestBody defines body for PostUsersUserIdTitles for application/json ContentType. +type PostUsersUserIdTitlesJSONRequestBody PostUsersUserIdTitlesJSONBody + +// ServerInterface represents all server handlers. +type ServerInterface interface { + // Get image path + // (GET /media) + GetMedia(c *gin.Context, params GetMediaParams) + // Upload image + // (POST /media) + PostMedia(c *gin.Context) + // Add review + // (POST /reviews) + PostReviews(c *gin.Context) + // Delete review + // (DELETE /reviews/{review_id}) + DeleteReviewsReviewId(c *gin.Context, reviewId string) + // Update review + // (PATCH /reviews/{review_id}) + PatchReviewsReviewId(c *gin.Context, reviewId string) + // Get tags + // (GET /tags) + GetTags(c *gin.Context, params GetTagsParams) + // Get titles + // (GET /title) + GetTitle(c *gin.Context, params GetTitleParams) + // Get title description + // (GET /title/{title_id}) + GetTitleTitleId(c *gin.Context, titleId string, params GetTitleTitleIdParams) + // Update title info + // (PATCH /title/{title_id}) + PatchTitleTitleId(c *gin.Context, titleId string) + // Get title reviews + // (GET /title/{title_id}/reviews) + GetTitleTitleIdReviews(c *gin.Context, titleId string, params GetTitleTitleIdReviewsParams) + // Search user + // (GET /users) + GetUsers(c *gin.Context, params GetUsersParams) + // Add new user + // (POST /users) + PostUsers(c *gin.Context) + // Delete user + // (DELETE /users/{user_id}) + DeleteUsersUserId(c *gin.Context, userId string) + // Get user info + // (GET /users/{user_id}) + GetUsersUserId(c *gin.Context, userId string, params GetUsersUserIdParams) + // Update user + // (PATCH /users/{user_id}) + PatchUsersUserId(c *gin.Context, userId string) + // Get user reviews + // (GET /users/{user_id}/reviews) + GetUsersUserIdReviews(c *gin.Context, userId string, params GetUsersUserIdReviewsParams) + // Delete user title + // (DELETE /users/{user_id}/titles) + DeleteUsersUserIdTitles(c *gin.Context, userId string, params DeleteUsersUserIdTitlesParams) + // Get user titles + // (GET /users/{user_id}/titles) + GetUsersUserIdTitles(c *gin.Context, userId string, params GetUsersUserIdTitlesParams) + // Update user title + // (PATCH /users/{user_id}/titles) + PatchUsersUserIdTitles(c *gin.Context, userId string) + // Add user title + // (POST /users/{user_id}/titles) + PostUsersUserIdTitles(c *gin.Context, userId string) +} + +// ServerInterfaceWrapper converts contexts to parameters. +type ServerInterfaceWrapper struct { + Handler ServerInterface + HandlerMiddlewares []MiddlewareFunc + ErrorHandler func(*gin.Context, error, int) +} + +type MiddlewareFunc func(c *gin.Context) + +// GetMedia operation middleware +func (siw *ServerInterfaceWrapper) GetMedia(c *gin.Context) { + + var err error + + // Parameter object where we will unmarshal all parameters from the context + var params GetMediaParams + + // ------------- Required query parameter "image_id" ------------- + + if paramValue := c.Query("image_id"); paramValue != "" { + + } else { + siw.ErrorHandler(c, fmt.Errorf("Query argument image_id is required, but not found"), http.StatusBadRequest) + return + } + + err = runtime.BindQueryParameter("form", true, true, "image_id", c.Request.URL.Query(), ¶ms.ImageId) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter image_id: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.GetMedia(c, params) +} + +// PostMedia operation middleware +func (siw *ServerInterfaceWrapper) PostMedia(c *gin.Context) { + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.PostMedia(c) +} + +// PostReviews operation middleware +func (siw *ServerInterfaceWrapper) PostReviews(c *gin.Context) { + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.PostReviews(c) +} + +// DeleteReviewsReviewId operation middleware +func (siw *ServerInterfaceWrapper) DeleteReviewsReviewId(c *gin.Context) { + + var err error + + // ------------- Path parameter "review_id" ------------- + var reviewId string + + err = runtime.BindStyledParameterWithOptions("simple", "review_id", c.Param("review_id"), &reviewId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter review_id: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.DeleteReviewsReviewId(c, reviewId) +} + +// PatchReviewsReviewId operation middleware +func (siw *ServerInterfaceWrapper) PatchReviewsReviewId(c *gin.Context) { + + var err error + + // ------------- Path parameter "review_id" ------------- + var reviewId string + + err = runtime.BindStyledParameterWithOptions("simple", "review_id", c.Param("review_id"), &reviewId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter review_id: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.PatchReviewsReviewId(c, reviewId) +} + +// GetTags operation middleware +func (siw *ServerInterfaceWrapper) GetTags(c *gin.Context) { + + var err error + + // Parameter object where we will unmarshal all parameters from the context + var params GetTagsParams + + // ------------- Optional query parameter "limit" ------------- + + err = runtime.BindQueryParameter("form", true, false, "limit", c.Request.URL.Query(), ¶ms.Limit) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter limit: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "offset" ------------- + + err = runtime.BindQueryParameter("form", true, false, "offset", c.Request.URL.Query(), ¶ms.Offset) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter offset: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "fields" ------------- + + err = runtime.BindQueryParameter("form", true, false, "fields", c.Request.URL.Query(), ¶ms.Fields) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter fields: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.GetTags(c, params) +} + +// GetTitle operation middleware +func (siw *ServerInterfaceWrapper) GetTitle(c *gin.Context) { + + var err error + + // Parameter object where we will unmarshal all parameters from the context + var params GetTitleParams + + // ------------- Optional query parameter "query" ------------- + + err = runtime.BindQueryParameter("form", true, false, "query", c.Request.URL.Query(), ¶ms.Query) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter query: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "limit" ------------- + + err = runtime.BindQueryParameter("form", true, false, "limit", c.Request.URL.Query(), ¶ms.Limit) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter limit: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "offset" ------------- + + err = runtime.BindQueryParameter("form", true, false, "offset", c.Request.URL.Query(), ¶ms.Offset) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter offset: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "fields" ------------- + + err = runtime.BindQueryParameter("form", true, false, "fields", c.Request.URL.Query(), ¶ms.Fields) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter fields: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.GetTitle(c, params) +} + +// GetTitleTitleId operation middleware +func (siw *ServerInterfaceWrapper) GetTitleTitleId(c *gin.Context) { + + var err error + + // ------------- Path parameter "title_id" ------------- + var titleId string + + err = runtime.BindStyledParameterWithOptions("simple", "title_id", c.Param("title_id"), &titleId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter title_id: %w", err), http.StatusBadRequest) + return + } + + // Parameter object where we will unmarshal all parameters from the context + var params GetTitleTitleIdParams + + // ------------- Optional query parameter "fields" ------------- + + err = runtime.BindQueryParameter("form", true, false, "fields", c.Request.URL.Query(), ¶ms.Fields) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter fields: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.GetTitleTitleId(c, titleId, params) +} + +// PatchTitleTitleId operation middleware +func (siw *ServerInterfaceWrapper) PatchTitleTitleId(c *gin.Context) { + + var err error + + // ------------- Path parameter "title_id" ------------- + var titleId string + + err = runtime.BindStyledParameterWithOptions("simple", "title_id", c.Param("title_id"), &titleId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter title_id: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.PatchTitleTitleId(c, titleId) +} + +// GetTitleTitleIdReviews operation middleware +func (siw *ServerInterfaceWrapper) GetTitleTitleIdReviews(c *gin.Context) { + + var err error + + // ------------- Path parameter "title_id" ------------- + var titleId string + + err = runtime.BindStyledParameterWithOptions("simple", "title_id", c.Param("title_id"), &titleId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter title_id: %w", err), http.StatusBadRequest) + return + } + + // Parameter object where we will unmarshal all parameters from the context + var params GetTitleTitleIdReviewsParams + + // ------------- Optional query parameter "limit" ------------- + + err = runtime.BindQueryParameter("form", true, false, "limit", c.Request.URL.Query(), ¶ms.Limit) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter limit: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "offset" ------------- + + err = runtime.BindQueryParameter("form", true, false, "offset", c.Request.URL.Query(), ¶ms.Offset) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter offset: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.GetTitleTitleIdReviews(c, titleId, params) +} + +// GetUsers operation middleware +func (siw *ServerInterfaceWrapper) GetUsers(c *gin.Context) { + + var err error + + // Parameter object where we will unmarshal all parameters from the context + var params GetUsersParams + + // ------------- Optional query parameter "query" ------------- + + err = runtime.BindQueryParameter("form", true, false, "query", c.Request.URL.Query(), ¶ms.Query) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter query: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "fields" ------------- + + err = runtime.BindQueryParameter("form", true, false, "fields", c.Request.URL.Query(), ¶ms.Fields) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter fields: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.GetUsers(c, params) +} + +// PostUsers operation middleware +func (siw *ServerInterfaceWrapper) PostUsers(c *gin.Context) { + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.PostUsers(c) +} + +// DeleteUsersUserId operation middleware +func (siw *ServerInterfaceWrapper) DeleteUsersUserId(c *gin.Context) { + + var err error + + // ------------- Path parameter "user_id" ------------- + var userId string + + err = runtime.BindStyledParameterWithOptions("simple", "user_id", c.Param("user_id"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter user_id: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.DeleteUsersUserId(c, userId) +} + +// GetUsersUserId operation middleware +func (siw *ServerInterfaceWrapper) GetUsersUserId(c *gin.Context) { + + var err error + + // ------------- Path parameter "user_id" ------------- + var userId string + + err = runtime.BindStyledParameterWithOptions("simple", "user_id", c.Param("user_id"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter user_id: %w", err), http.StatusBadRequest) + return + } + + // Parameter object where we will unmarshal all parameters from the context + var params GetUsersUserIdParams + + // ------------- Optional query parameter "fields" ------------- + + err = runtime.BindQueryParameter("form", true, false, "fields", c.Request.URL.Query(), ¶ms.Fields) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter fields: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.GetUsersUserId(c, userId, params) +} + +// PatchUsersUserId operation middleware +func (siw *ServerInterfaceWrapper) PatchUsersUserId(c *gin.Context) { + + var err error + + // ------------- Path parameter "user_id" ------------- + var userId string + + err = runtime.BindStyledParameterWithOptions("simple", "user_id", c.Param("user_id"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter user_id: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.PatchUsersUserId(c, userId) +} + +// GetUsersUserIdReviews operation middleware +func (siw *ServerInterfaceWrapper) GetUsersUserIdReviews(c *gin.Context) { + + var err error + + // ------------- Path parameter "user_id" ------------- + var userId string + + err = runtime.BindStyledParameterWithOptions("simple", "user_id", c.Param("user_id"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter user_id: %w", err), http.StatusBadRequest) + return + } + + // Parameter object where we will unmarshal all parameters from the context + var params GetUsersUserIdReviewsParams + + // ------------- Optional query parameter "limit" ------------- + + err = runtime.BindQueryParameter("form", true, false, "limit", c.Request.URL.Query(), ¶ms.Limit) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter limit: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "offset" ------------- + + err = runtime.BindQueryParameter("form", true, false, "offset", c.Request.URL.Query(), ¶ms.Offset) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter offset: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.GetUsersUserIdReviews(c, userId, params) +} + +// DeleteUsersUserIdTitles operation middleware +func (siw *ServerInterfaceWrapper) DeleteUsersUserIdTitles(c *gin.Context) { + + var err error + + // ------------- Path parameter "user_id" ------------- + var userId string + + err = runtime.BindStyledParameterWithOptions("simple", "user_id", c.Param("user_id"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter user_id: %w", err), http.StatusBadRequest) + return + } + + // Parameter object where we will unmarshal all parameters from the context + var params DeleteUsersUserIdTitlesParams + + // ------------- Optional query parameter "title_id" ------------- + + err = runtime.BindQueryParameter("form", true, false, "title_id", c.Request.URL.Query(), ¶ms.TitleId) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter title_id: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.DeleteUsersUserIdTitles(c, userId, params) +} + +// GetUsersUserIdTitles operation middleware +func (siw *ServerInterfaceWrapper) GetUsersUserIdTitles(c *gin.Context) { + + var err error + + // ------------- Path parameter "user_id" ------------- + var userId string + + err = runtime.BindStyledParameterWithOptions("simple", "user_id", c.Param("user_id"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter user_id: %w", err), http.StatusBadRequest) + return + } + + // Parameter object where we will unmarshal all parameters from the context + var params GetUsersUserIdTitlesParams + + // ------------- Optional query parameter "query" ------------- + + err = runtime.BindQueryParameter("form", true, false, "query", c.Request.URL.Query(), ¶ms.Query) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter query: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "limit" ------------- + + err = runtime.BindQueryParameter("form", true, false, "limit", c.Request.URL.Query(), ¶ms.Limit) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter limit: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "offset" ------------- + + err = runtime.BindQueryParameter("form", true, false, "offset", c.Request.URL.Query(), ¶ms.Offset) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter offset: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "fields" ------------- + + err = runtime.BindQueryParameter("form", true, false, "fields", c.Request.URL.Query(), ¶ms.Fields) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter fields: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.GetUsersUserIdTitles(c, userId, params) +} + +// PatchUsersUserIdTitles operation middleware +func (siw *ServerInterfaceWrapper) PatchUsersUserIdTitles(c *gin.Context) { + + var err error + + // ------------- Path parameter "user_id" ------------- + var userId string + + err = runtime.BindStyledParameterWithOptions("simple", "user_id", c.Param("user_id"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter user_id: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.PatchUsersUserIdTitles(c, userId) +} + +// PostUsersUserIdTitles operation middleware +func (siw *ServerInterfaceWrapper) PostUsersUserIdTitles(c *gin.Context) { + + var err error + + // ------------- Path parameter "user_id" ------------- + var userId string + + err = runtime.BindStyledParameterWithOptions("simple", "user_id", c.Param("user_id"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter user_id: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.PostUsersUserIdTitles(c, userId) +} + +// GinServerOptions provides options for the Gin server. +type GinServerOptions struct { + BaseURL string + Middlewares []MiddlewareFunc + ErrorHandler func(*gin.Context, error, int) +} + +// RegisterHandlers creates http.Handler with routing matching OpenAPI spec. +func RegisterHandlers(router gin.IRouter, si ServerInterface) { + RegisterHandlersWithOptions(router, si, GinServerOptions{}) +} + +// RegisterHandlersWithOptions creates http.Handler with additional options +func RegisterHandlersWithOptions(router gin.IRouter, si ServerInterface, options GinServerOptions) { + errorHandler := options.ErrorHandler + if errorHandler == nil { + errorHandler = func(c *gin.Context, err error, statusCode int) { + c.JSON(statusCode, gin.H{"msg": err.Error()}) + } + } + + wrapper := ServerInterfaceWrapper{ + Handler: si, + HandlerMiddlewares: options.Middlewares, + ErrorHandler: errorHandler, + } + + router.GET(options.BaseURL+"/media", wrapper.GetMedia) + router.POST(options.BaseURL+"/media", wrapper.PostMedia) + router.POST(options.BaseURL+"/reviews", wrapper.PostReviews) + router.DELETE(options.BaseURL+"/reviews/:review_id", wrapper.DeleteReviewsReviewId) + router.PATCH(options.BaseURL+"/reviews/:review_id", wrapper.PatchReviewsReviewId) + router.GET(options.BaseURL+"/tags", wrapper.GetTags) + router.GET(options.BaseURL+"/title", wrapper.GetTitle) + router.GET(options.BaseURL+"/title/:title_id", wrapper.GetTitleTitleId) + router.PATCH(options.BaseURL+"/title/:title_id", wrapper.PatchTitleTitleId) + router.GET(options.BaseURL+"/title/:title_id/reviews", wrapper.GetTitleTitleIdReviews) + router.GET(options.BaseURL+"/users", wrapper.GetUsers) + router.POST(options.BaseURL+"/users", wrapper.PostUsers) + router.DELETE(options.BaseURL+"/users/:user_id", wrapper.DeleteUsersUserId) + router.GET(options.BaseURL+"/users/:user_id", wrapper.GetUsersUserId) + router.PATCH(options.BaseURL+"/users/:user_id", wrapper.PatchUsersUserId) + router.GET(options.BaseURL+"/users/:user_id/reviews", wrapper.GetUsersUserIdReviews) + router.DELETE(options.BaseURL+"/users/:user_id/titles", wrapper.DeleteUsersUserIdTitles) + router.GET(options.BaseURL+"/users/:user_id/titles", wrapper.GetUsersUserIdTitles) + router.PATCH(options.BaseURL+"/users/:user_id/titles", wrapper.PatchUsersUserIdTitles) + router.POST(options.BaseURL+"/users/:user_id/titles", wrapper.PostUsersUserIdTitles) +} + +type GetMediaRequestObject struct { + Params GetMediaParams +} + +type GetMediaResponseObject interface { + VisitGetMediaResponse(w http.ResponseWriter) error +} + +type GetMedia200JSONResponse struct { + Error *string `json:"error,omitempty"` + ImagePath *string `json:"image_path,omitempty"` + Success *bool `json:"success,omitempty"` +} + +func (response GetMedia200JSONResponse) VisitGetMediaResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type PostMediaRequestObject struct { +} + +type PostMediaResponseObject interface { + VisitPostMediaResponse(w http.ResponseWriter) error +} + +type PostMedia200JSONResponse struct { + Error *string `json:"error,omitempty"` + ImageId *string `json:"image_id,omitempty"` + Success *bool `json:"success,omitempty"` +} + +func (response PostMedia200JSONResponse) VisitPostMediaResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type PostReviewsRequestObject struct { + Body *PostReviewsJSONRequestBody +} + +type PostReviewsResponseObject interface { + VisitPostReviewsResponse(w http.ResponseWriter) error +} + +type PostReviews200JSONResponse struct { + Error *string `json:"error,omitempty"` + Success *bool `json:"success,omitempty"` +} + +func (response PostReviews200JSONResponse) VisitPostReviewsResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type DeleteReviewsReviewIdRequestObject struct { + ReviewId string `json:"review_id"` +} + +type DeleteReviewsReviewIdResponseObject interface { + VisitDeleteReviewsReviewIdResponse(w http.ResponseWriter) error +} + +type DeleteReviewsReviewId200JSONResponse struct { + Error *string `json:"error,omitempty"` + Success *bool `json:"success,omitempty"` +} + +func (response DeleteReviewsReviewId200JSONResponse) VisitDeleteReviewsReviewIdResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type PatchReviewsReviewIdRequestObject struct { + ReviewId string `json:"review_id"` + Body *PatchReviewsReviewIdJSONRequestBody +} + +type PatchReviewsReviewIdResponseObject interface { + VisitPatchReviewsReviewIdResponse(w http.ResponseWriter) error +} + +type PatchReviewsReviewId200JSONResponse struct { + Error *string `json:"error,omitempty"` + Success *bool `json:"success,omitempty"` +} + +func (response PatchReviewsReviewId200JSONResponse) VisitPatchReviewsReviewIdResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type GetTagsRequestObject struct { + Params GetTagsParams +} + +type GetTagsResponseObject interface { + VisitGetTagsResponse(w http.ResponseWriter) error +} + +type GetTags200JSONResponse []Tag + +func (response GetTags200JSONResponse) VisitGetTagsResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type GetTitleRequestObject struct { + Params GetTitleParams +} + +type GetTitleResponseObject interface { + VisitGetTitleResponse(w http.ResponseWriter) error +} + +type GetTitle200JSONResponse []Title + +func (response GetTitle200JSONResponse) VisitGetTitleResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type GetTitle204Response struct { +} + +func (response GetTitle204Response) VisitGetTitleResponse(w http.ResponseWriter) error { + w.WriteHeader(204) + return nil +} + +type GetTitleTitleIdRequestObject struct { + TitleId string `json:"title_id"` + Params GetTitleTitleIdParams +} + +type GetTitleTitleIdResponseObject interface { + VisitGetTitleTitleIdResponse(w http.ResponseWriter) error +} + +type GetTitleTitleId200JSONResponse Title + +func (response GetTitleTitleId200JSONResponse) VisitGetTitleTitleIdResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type GetTitleTitleId404Response struct { +} + +func (response GetTitleTitleId404Response) VisitGetTitleTitleIdResponse(w http.ResponseWriter) error { + w.WriteHeader(404) + return nil +} + +type PatchTitleTitleIdRequestObject struct { + TitleId string `json:"title_id"` + Body *PatchTitleTitleIdJSONRequestBody +} + +type PatchTitleTitleIdResponseObject interface { + VisitPatchTitleTitleIdResponse(w http.ResponseWriter) error +} + +type PatchTitleTitleId200JSONResponse struct { + Error *string `json:"error,omitempty"` + Success *bool `json:"success,omitempty"` + UserJson *User `json:"user_json,omitempty"` +} + +func (response PatchTitleTitleId200JSONResponse) VisitPatchTitleTitleIdResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type GetTitleTitleIdReviewsRequestObject struct { + TitleId string `json:"title_id"` + Params GetTitleTitleIdReviewsParams +} + +type GetTitleTitleIdReviewsResponseObject interface { + VisitGetTitleTitleIdReviewsResponse(w http.ResponseWriter) error +} + +type GetTitleTitleIdReviews200JSONResponse []Review + +func (response GetTitleTitleIdReviews200JSONResponse) VisitGetTitleTitleIdReviewsResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type GetTitleTitleIdReviews204Response struct { +} + +func (response GetTitleTitleIdReviews204Response) VisitGetTitleTitleIdReviewsResponse(w http.ResponseWriter) error { + w.WriteHeader(204) + return nil +} + +type GetUsersRequestObject struct { + Params GetUsersParams +} + +type GetUsersResponseObject interface { + VisitGetUsersResponse(w http.ResponseWriter) error +} + +type GetUsers200JSONResponse []User + +func (response GetUsers200JSONResponse) VisitGetUsersResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type PostUsersRequestObject struct { + Body *PostUsersJSONRequestBody +} + +type PostUsersResponseObject interface { + VisitPostUsersResponse(w http.ResponseWriter) error +} + +type PostUsers200JSONResponse struct { + Error *string `json:"error,omitempty"` + Success *bool `json:"success,omitempty"` + UserJson *User `json:"user_json,omitempty"` +} + +func (response PostUsers200JSONResponse) VisitPostUsersResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type DeleteUsersUserIdRequestObject struct { + UserId string `json:"user_id"` +} + +type DeleteUsersUserIdResponseObject interface { + VisitDeleteUsersUserIdResponse(w http.ResponseWriter) error +} + +type DeleteUsersUserId200JSONResponse struct { + Error *string `json:"error,omitempty"` + Success *bool `json:"success,omitempty"` +} + +func (response DeleteUsersUserId200JSONResponse) VisitDeleteUsersUserIdResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type GetUsersUserIdRequestObject struct { + UserId string `json:"user_id"` + Params GetUsersUserIdParams +} + +type GetUsersUserIdResponseObject interface { + VisitGetUsersUserIdResponse(w http.ResponseWriter) error +} + +type GetUsersUserId200JSONResponse User + +func (response GetUsersUserId200JSONResponse) VisitGetUsersUserIdResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type GetUsersUserId404Response struct { +} + +func (response GetUsersUserId404Response) VisitGetUsersUserIdResponse(w http.ResponseWriter) error { + w.WriteHeader(404) + return nil +} + +type PatchUsersUserIdRequestObject struct { + UserId string `json:"user_id"` + Body *PatchUsersUserIdJSONRequestBody +} + +type PatchUsersUserIdResponseObject interface { + VisitPatchUsersUserIdResponse(w http.ResponseWriter) error +} + +type PatchUsersUserId200JSONResponse struct { + Error *string `json:"error,omitempty"` + Success *bool `json:"success,omitempty"` +} + +func (response PatchUsersUserId200JSONResponse) VisitPatchUsersUserIdResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type GetUsersUserIdReviewsRequestObject struct { + UserId string `json:"user_id"` + Params GetUsersUserIdReviewsParams +} + +type GetUsersUserIdReviewsResponseObject interface { + VisitGetUsersUserIdReviewsResponse(w http.ResponseWriter) error +} + +type GetUsersUserIdReviews200JSONResponse []Review + +func (response GetUsersUserIdReviews200JSONResponse) VisitGetUsersUserIdReviewsResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type DeleteUsersUserIdTitlesRequestObject struct { + UserId string `json:"user_id"` + Params DeleteUsersUserIdTitlesParams +} + +type DeleteUsersUserIdTitlesResponseObject interface { + VisitDeleteUsersUserIdTitlesResponse(w http.ResponseWriter) error +} + +type DeleteUsersUserIdTitles200JSONResponse struct { + Error *string `json:"error,omitempty"` + Success *bool `json:"success,omitempty"` +} + +func (response DeleteUsersUserIdTitles200JSONResponse) VisitDeleteUsersUserIdTitlesResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type GetUsersUserIdTitlesRequestObject struct { + UserId string `json:"user_id"` + Params GetUsersUserIdTitlesParams +} + +type GetUsersUserIdTitlesResponseObject interface { + VisitGetUsersUserIdTitlesResponse(w http.ResponseWriter) error +} + +type GetUsersUserIdTitles200JSONResponse []UserTitle + +func (response GetUsersUserIdTitles200JSONResponse) VisitGetUsersUserIdTitlesResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type GetUsersUserIdTitles204Response struct { +} + +func (response GetUsersUserIdTitles204Response) VisitGetUsersUserIdTitlesResponse(w http.ResponseWriter) error { + w.WriteHeader(204) + return nil +} + +type PatchUsersUserIdTitlesRequestObject struct { + UserId string `json:"user_id"` + Body *PatchUsersUserIdTitlesJSONRequestBody +} + +type PatchUsersUserIdTitlesResponseObject interface { + VisitPatchUsersUserIdTitlesResponse(w http.ResponseWriter) error +} + +type PatchUsersUserIdTitles200JSONResponse struct { + Error *string `json:"error,omitempty"` + Success *bool `json:"success,omitempty"` +} + +func (response PatchUsersUserIdTitles200JSONResponse) VisitPatchUsersUserIdTitlesResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type PostUsersUserIdTitlesRequestObject struct { + UserId string `json:"user_id"` + Body *PostUsersUserIdTitlesJSONRequestBody +} + +type PostUsersUserIdTitlesResponseObject interface { + VisitPostUsersUserIdTitlesResponse(w http.ResponseWriter) error +} + +type PostUsersUserIdTitles200JSONResponse struct { + Error *string `json:"error,omitempty"` + Success *bool `json:"success,omitempty"` +} + +func (response PostUsersUserIdTitles200JSONResponse) VisitPostUsersUserIdTitlesResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +// StrictServerInterface represents all server handlers. +type StrictServerInterface interface { + // Get image path + // (GET /media) + GetMedia(ctx context.Context, request GetMediaRequestObject) (GetMediaResponseObject, error) + // Upload image + // (POST /media) + PostMedia(ctx context.Context, request PostMediaRequestObject) (PostMediaResponseObject, error) + // Add review + // (POST /reviews) + PostReviews(ctx context.Context, request PostReviewsRequestObject) (PostReviewsResponseObject, error) + // Delete review + // (DELETE /reviews/{review_id}) + DeleteReviewsReviewId(ctx context.Context, request DeleteReviewsReviewIdRequestObject) (DeleteReviewsReviewIdResponseObject, error) + // Update review + // (PATCH /reviews/{review_id}) + PatchReviewsReviewId(ctx context.Context, request PatchReviewsReviewIdRequestObject) (PatchReviewsReviewIdResponseObject, error) + // Get tags + // (GET /tags) + GetTags(ctx context.Context, request GetTagsRequestObject) (GetTagsResponseObject, error) + // Get titles + // (GET /title) + GetTitle(ctx context.Context, request GetTitleRequestObject) (GetTitleResponseObject, error) + // Get title description + // (GET /title/{title_id}) + GetTitleTitleId(ctx context.Context, request GetTitleTitleIdRequestObject) (GetTitleTitleIdResponseObject, error) + // Update title info + // (PATCH /title/{title_id}) + PatchTitleTitleId(ctx context.Context, request PatchTitleTitleIdRequestObject) (PatchTitleTitleIdResponseObject, error) + // Get title reviews + // (GET /title/{title_id}/reviews) + GetTitleTitleIdReviews(ctx context.Context, request GetTitleTitleIdReviewsRequestObject) (GetTitleTitleIdReviewsResponseObject, error) + // Search user + // (GET /users) + GetUsers(ctx context.Context, request GetUsersRequestObject) (GetUsersResponseObject, error) + // Add new user + // (POST /users) + PostUsers(ctx context.Context, request PostUsersRequestObject) (PostUsersResponseObject, error) + // Delete user + // (DELETE /users/{user_id}) + DeleteUsersUserId(ctx context.Context, request DeleteUsersUserIdRequestObject) (DeleteUsersUserIdResponseObject, error) + // Get user info + // (GET /users/{user_id}) + GetUsersUserId(ctx context.Context, request GetUsersUserIdRequestObject) (GetUsersUserIdResponseObject, error) + // Update user + // (PATCH /users/{user_id}) + PatchUsersUserId(ctx context.Context, request PatchUsersUserIdRequestObject) (PatchUsersUserIdResponseObject, error) + // Get user reviews + // (GET /users/{user_id}/reviews) + GetUsersUserIdReviews(ctx context.Context, request GetUsersUserIdReviewsRequestObject) (GetUsersUserIdReviewsResponseObject, error) + // Delete user title + // (DELETE /users/{user_id}/titles) + DeleteUsersUserIdTitles(ctx context.Context, request DeleteUsersUserIdTitlesRequestObject) (DeleteUsersUserIdTitlesResponseObject, error) + // Get user titles + // (GET /users/{user_id}/titles) + GetUsersUserIdTitles(ctx context.Context, request GetUsersUserIdTitlesRequestObject) (GetUsersUserIdTitlesResponseObject, error) + // Update user title + // (PATCH /users/{user_id}/titles) + PatchUsersUserIdTitles(ctx context.Context, request PatchUsersUserIdTitlesRequestObject) (PatchUsersUserIdTitlesResponseObject, error) + // Add user title + // (POST /users/{user_id}/titles) + PostUsersUserIdTitles(ctx context.Context, request PostUsersUserIdTitlesRequestObject) (PostUsersUserIdTitlesResponseObject, error) +} + +type StrictHandlerFunc = strictgin.StrictGinHandlerFunc +type StrictMiddlewareFunc = strictgin.StrictGinMiddlewareFunc + +func NewStrictHandler(ssi StrictServerInterface, middlewares []StrictMiddlewareFunc) ServerInterface { + return &strictHandler{ssi: ssi, middlewares: middlewares} +} + +type strictHandler struct { + ssi StrictServerInterface + middlewares []StrictMiddlewareFunc +} + +// GetMedia operation middleware +func (sh *strictHandler) GetMedia(ctx *gin.Context, params GetMediaParams) { + var request GetMediaRequestObject + + request.Params = params + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.GetMedia(ctx, request.(GetMediaRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "GetMedia") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(GetMediaResponseObject); ok { + if err := validResponse.VisitGetMediaResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// PostMedia operation middleware +func (sh *strictHandler) PostMedia(ctx *gin.Context) { + var request PostMediaRequestObject + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.PostMedia(ctx, request.(PostMediaRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "PostMedia") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(PostMediaResponseObject); ok { + if err := validResponse.VisitPostMediaResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// PostReviews operation middleware +func (sh *strictHandler) PostReviews(ctx *gin.Context) { + var request PostReviewsRequestObject + + var body PostReviewsJSONRequestBody + if err := ctx.ShouldBindJSON(&body); err != nil { + ctx.Status(http.StatusBadRequest) + ctx.Error(err) + return + } + request.Body = &body + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.PostReviews(ctx, request.(PostReviewsRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "PostReviews") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(PostReviewsResponseObject); ok { + if err := validResponse.VisitPostReviewsResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// DeleteReviewsReviewId operation middleware +func (sh *strictHandler) DeleteReviewsReviewId(ctx *gin.Context, reviewId string) { + var request DeleteReviewsReviewIdRequestObject + + request.ReviewId = reviewId + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.DeleteReviewsReviewId(ctx, request.(DeleteReviewsReviewIdRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "DeleteReviewsReviewId") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(DeleteReviewsReviewIdResponseObject); ok { + if err := validResponse.VisitDeleteReviewsReviewIdResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// PatchReviewsReviewId operation middleware +func (sh *strictHandler) PatchReviewsReviewId(ctx *gin.Context, reviewId string) { + var request PatchReviewsReviewIdRequestObject + + request.ReviewId = reviewId + + var body PatchReviewsReviewIdJSONRequestBody + if err := ctx.ShouldBindJSON(&body); err != nil { + ctx.Status(http.StatusBadRequest) + ctx.Error(err) + return + } + request.Body = &body + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.PatchReviewsReviewId(ctx, request.(PatchReviewsReviewIdRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "PatchReviewsReviewId") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(PatchReviewsReviewIdResponseObject); ok { + if err := validResponse.VisitPatchReviewsReviewIdResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// GetTags operation middleware +func (sh *strictHandler) GetTags(ctx *gin.Context, params GetTagsParams) { + var request GetTagsRequestObject + + request.Params = params + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.GetTags(ctx, request.(GetTagsRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "GetTags") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(GetTagsResponseObject); ok { + if err := validResponse.VisitGetTagsResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// GetTitle operation middleware +func (sh *strictHandler) GetTitle(ctx *gin.Context, params GetTitleParams) { + var request GetTitleRequestObject + + request.Params = params + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.GetTitle(ctx, request.(GetTitleRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "GetTitle") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(GetTitleResponseObject); ok { + if err := validResponse.VisitGetTitleResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// GetTitleTitleId operation middleware +func (sh *strictHandler) GetTitleTitleId(ctx *gin.Context, titleId string, params GetTitleTitleIdParams) { + var request GetTitleTitleIdRequestObject + + request.TitleId = titleId + request.Params = params + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.GetTitleTitleId(ctx, request.(GetTitleTitleIdRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "GetTitleTitleId") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(GetTitleTitleIdResponseObject); ok { + if err := validResponse.VisitGetTitleTitleIdResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// PatchTitleTitleId operation middleware +func (sh *strictHandler) PatchTitleTitleId(ctx *gin.Context, titleId string) { + var request PatchTitleTitleIdRequestObject + + request.TitleId = titleId + + var body PatchTitleTitleIdJSONRequestBody + if err := ctx.ShouldBindJSON(&body); err != nil { + ctx.Status(http.StatusBadRequest) + ctx.Error(err) + return + } + request.Body = &body + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.PatchTitleTitleId(ctx, request.(PatchTitleTitleIdRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "PatchTitleTitleId") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(PatchTitleTitleIdResponseObject); ok { + if err := validResponse.VisitPatchTitleTitleIdResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// GetTitleTitleIdReviews operation middleware +func (sh *strictHandler) GetTitleTitleIdReviews(ctx *gin.Context, titleId string, params GetTitleTitleIdReviewsParams) { + var request GetTitleTitleIdReviewsRequestObject + + request.TitleId = titleId + request.Params = params + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.GetTitleTitleIdReviews(ctx, request.(GetTitleTitleIdReviewsRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "GetTitleTitleIdReviews") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(GetTitleTitleIdReviewsResponseObject); ok { + if err := validResponse.VisitGetTitleTitleIdReviewsResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// GetUsers operation middleware +func (sh *strictHandler) GetUsers(ctx *gin.Context, params GetUsersParams) { + var request GetUsersRequestObject + + request.Params = params + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.GetUsers(ctx, request.(GetUsersRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "GetUsers") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(GetUsersResponseObject); ok { + if err := validResponse.VisitGetUsersResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// PostUsers operation middleware +func (sh *strictHandler) PostUsers(ctx *gin.Context) { + var request PostUsersRequestObject + + var body PostUsersJSONRequestBody + if err := ctx.ShouldBindJSON(&body); err != nil { + ctx.Status(http.StatusBadRequest) + ctx.Error(err) + return + } + request.Body = &body + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.PostUsers(ctx, request.(PostUsersRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "PostUsers") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(PostUsersResponseObject); ok { + if err := validResponse.VisitPostUsersResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// DeleteUsersUserId operation middleware +func (sh *strictHandler) DeleteUsersUserId(ctx *gin.Context, userId string) { + var request DeleteUsersUserIdRequestObject + + request.UserId = userId + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.DeleteUsersUserId(ctx, request.(DeleteUsersUserIdRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "DeleteUsersUserId") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(DeleteUsersUserIdResponseObject); ok { + if err := validResponse.VisitDeleteUsersUserIdResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// GetUsersUserId operation middleware +func (sh *strictHandler) GetUsersUserId(ctx *gin.Context, userId string, params GetUsersUserIdParams) { + var request GetUsersUserIdRequestObject + + request.UserId = userId + request.Params = params + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.GetUsersUserId(ctx, request.(GetUsersUserIdRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "GetUsersUserId") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(GetUsersUserIdResponseObject); ok { + if err := validResponse.VisitGetUsersUserIdResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// PatchUsersUserId operation middleware +func (sh *strictHandler) PatchUsersUserId(ctx *gin.Context, userId string) { + var request PatchUsersUserIdRequestObject + + request.UserId = userId + + var body PatchUsersUserIdJSONRequestBody + if err := ctx.ShouldBindJSON(&body); err != nil { + ctx.Status(http.StatusBadRequest) + ctx.Error(err) + return + } + request.Body = &body + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.PatchUsersUserId(ctx, request.(PatchUsersUserIdRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "PatchUsersUserId") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(PatchUsersUserIdResponseObject); ok { + if err := validResponse.VisitPatchUsersUserIdResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// GetUsersUserIdReviews operation middleware +func (sh *strictHandler) GetUsersUserIdReviews(ctx *gin.Context, userId string, params GetUsersUserIdReviewsParams) { + var request GetUsersUserIdReviewsRequestObject + + request.UserId = userId + request.Params = params + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.GetUsersUserIdReviews(ctx, request.(GetUsersUserIdReviewsRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "GetUsersUserIdReviews") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(GetUsersUserIdReviewsResponseObject); ok { + if err := validResponse.VisitGetUsersUserIdReviewsResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// DeleteUsersUserIdTitles operation middleware +func (sh *strictHandler) DeleteUsersUserIdTitles(ctx *gin.Context, userId string, params DeleteUsersUserIdTitlesParams) { + var request DeleteUsersUserIdTitlesRequestObject + + request.UserId = userId + request.Params = params + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.DeleteUsersUserIdTitles(ctx, request.(DeleteUsersUserIdTitlesRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "DeleteUsersUserIdTitles") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(DeleteUsersUserIdTitlesResponseObject); ok { + if err := validResponse.VisitDeleteUsersUserIdTitlesResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// GetUsersUserIdTitles operation middleware +func (sh *strictHandler) GetUsersUserIdTitles(ctx *gin.Context, userId string, params GetUsersUserIdTitlesParams) { + var request GetUsersUserIdTitlesRequestObject + + request.UserId = userId + request.Params = params + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.GetUsersUserIdTitles(ctx, request.(GetUsersUserIdTitlesRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "GetUsersUserIdTitles") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(GetUsersUserIdTitlesResponseObject); ok { + if err := validResponse.VisitGetUsersUserIdTitlesResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// PatchUsersUserIdTitles operation middleware +func (sh *strictHandler) PatchUsersUserIdTitles(ctx *gin.Context, userId string) { + var request PatchUsersUserIdTitlesRequestObject + + request.UserId = userId + + var body PatchUsersUserIdTitlesJSONRequestBody + if err := ctx.ShouldBindJSON(&body); err != nil { + ctx.Status(http.StatusBadRequest) + ctx.Error(err) + return + } + request.Body = &body + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.PatchUsersUserIdTitles(ctx, request.(PatchUsersUserIdTitlesRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "PatchUsersUserIdTitles") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(PatchUsersUserIdTitlesResponseObject); ok { + if err := validResponse.VisitPatchUsersUserIdTitlesResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// PostUsersUserIdTitles operation middleware +func (sh *strictHandler) PostUsersUserIdTitles(ctx *gin.Context, userId string) { + var request PostUsersUserIdTitlesRequestObject + + request.UserId = userId + + var body PostUsersUserIdTitlesJSONRequestBody + if err := ctx.ShouldBindJSON(&body); err != nil { + ctx.Status(http.StatusBadRequest) + ctx.Error(err) + return + } + request.Body = &body + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.PostUsersUserIdTitles(ctx, request.(PostUsersUserIdTitlesRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "PostUsersUserIdTitles") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(PostUsersUserIdTitlesResponseObject); ok { + if err := validResponse.VisitPostUsersUserIdTitlesResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} diff --git a/api/oapi-codegen.yaml b/api/oapi-codegen.yaml new file mode 100644 index 0000000..1d470ac --- /dev/null +++ b/api/oapi-codegen.yaml @@ -0,0 +1,6 @@ +package: api +generate: + strict-server: true + gin-server: true + models: true +output: gen.go \ No newline at end of file From eda59c68d3eca76515f2ad661c4d62d35af6d4a7 Mon Sep 17 00:00:00 2001 From: Iron_Felix Date: Sat, 11 Oct 2025 02:18:14 +0300 Subject: [PATCH 27/80] feat: all the work with db now here, for some time it dups ../api dir --- modules/backend/db/db.go | 32 ++ modules/backend/db/models.go | 266 ++++++++++++ modules/backend/db/query.sql.go | 712 ++++++++++++++++++++++++++++++++ 3 files changed, 1010 insertions(+) create mode 100644 modules/backend/db/db.go create mode 100644 modules/backend/db/models.go create mode 100644 modules/backend/db/query.sql.go diff --git a/modules/backend/db/db.go b/modules/backend/db/db.go new file mode 100644 index 0000000..9d485b5 --- /dev/null +++ b/modules/backend/db/db.go @@ -0,0 +1,32 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.30.0 + +package db + +import ( + "context" + + "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/pgconn" +) + +type DBTX interface { + Exec(context.Context, string, ...interface{}) (pgconn.CommandTag, error) + Query(context.Context, string, ...interface{}) (pgx.Rows, error) + QueryRow(context.Context, string, ...interface{}) pgx.Row +} + +func New(db DBTX) *Queries { + return &Queries{db: db} +} + +type Queries struct { + db DBTX +} + +func (q *Queries) WithTx(tx pgx.Tx) *Queries { + return &Queries{ + db: tx, + } +} diff --git a/modules/backend/db/models.go b/modules/backend/db/models.go new file mode 100644 index 0000000..ba76782 --- /dev/null +++ b/modules/backend/db/models.go @@ -0,0 +1,266 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.30.0 + +package db + +import ( + "database/sql/driver" + "fmt" + + "github.com/jackc/pgx/v5/pgtype" +) + +type ReleaseSeasonT string + +const ( + ReleaseSeasonTWinter ReleaseSeasonT = "winter" + ReleaseSeasonTSpring ReleaseSeasonT = "spring" + ReleaseSeasonTSummer ReleaseSeasonT = "summer" + ReleaseSeasonTFall ReleaseSeasonT = "fall" +) + +func (e *ReleaseSeasonT) Scan(src interface{}) error { + switch s := src.(type) { + case []byte: + *e = ReleaseSeasonT(s) + case string: + *e = ReleaseSeasonT(s) + default: + return fmt.Errorf("unsupported scan type for ReleaseSeasonT: %T", src) + } + return nil +} + +type NullReleaseSeasonT struct { + ReleaseSeasonT ReleaseSeasonT `json:"release_season_t"` + Valid bool `json:"valid"` // Valid is true if ReleaseSeasonT is not NULL +} + +// Scan implements the Scanner interface. +func (ns *NullReleaseSeasonT) Scan(value interface{}) error { + if value == nil { + ns.ReleaseSeasonT, ns.Valid = "", false + return nil + } + ns.Valid = true + return ns.ReleaseSeasonT.Scan(value) +} + +// Value implements the driver Valuer interface. +func (ns NullReleaseSeasonT) Value() (driver.Value, error) { + if !ns.Valid { + return nil, nil + } + return string(ns.ReleaseSeasonT), nil +} + +type StorageTypeT string + +const ( + StorageTypeTLocal StorageTypeT = "local" + StorageTypeTS3 StorageTypeT = "s3" +) + +func (e *StorageTypeT) Scan(src interface{}) error { + switch s := src.(type) { + case []byte: + *e = StorageTypeT(s) + case string: + *e = StorageTypeT(s) + default: + return fmt.Errorf("unsupported scan type for StorageTypeT: %T", src) + } + return nil +} + +type NullStorageTypeT struct { + StorageTypeT StorageTypeT `json:"storage_type_t"` + Valid bool `json:"valid"` // Valid is true if StorageTypeT is not NULL +} + +// Scan implements the Scanner interface. +func (ns *NullStorageTypeT) Scan(value interface{}) error { + if value == nil { + ns.StorageTypeT, ns.Valid = "", false + return nil + } + ns.Valid = true + return ns.StorageTypeT.Scan(value) +} + +// Value implements the driver Valuer interface. +func (ns NullStorageTypeT) Value() (driver.Value, error) { + if !ns.Valid { + return nil, nil + } + return string(ns.StorageTypeT), nil +} + +type TitleStatusT string + +const ( + TitleStatusTFinished TitleStatusT = "finished" + TitleStatusTOngoing TitleStatusT = "ongoing" + TitleStatusTPlanned TitleStatusT = "planned" +) + +func (e *TitleStatusT) Scan(src interface{}) error { + switch s := src.(type) { + case []byte: + *e = TitleStatusT(s) + case string: + *e = TitleStatusT(s) + default: + return fmt.Errorf("unsupported scan type for TitleStatusT: %T", src) + } + return nil +} + +type NullTitleStatusT struct { + TitleStatusT TitleStatusT `json:"title_status_t"` + Valid bool `json:"valid"` // Valid is true if TitleStatusT is not NULL +} + +// Scan implements the Scanner interface. +func (ns *NullTitleStatusT) Scan(value interface{}) error { + if value == nil { + ns.TitleStatusT, ns.Valid = "", false + return nil + } + ns.Valid = true + return ns.TitleStatusT.Scan(value) +} + +// Value implements the driver Valuer interface. +func (ns NullTitleStatusT) Value() (driver.Value, error) { + if !ns.Valid { + return nil, nil + } + return string(ns.TitleStatusT), nil +} + +type UsertitleStatusT string + +const ( + UsertitleStatusTFinished UsertitleStatusT = "finished" + UsertitleStatusTPlanned UsertitleStatusT = "planned" + UsertitleStatusTDropped UsertitleStatusT = "dropped" + UsertitleStatusTInProgress UsertitleStatusT = "in-progress" +) + +func (e *UsertitleStatusT) Scan(src interface{}) error { + switch s := src.(type) { + case []byte: + *e = UsertitleStatusT(s) + case string: + *e = UsertitleStatusT(s) + default: + return fmt.Errorf("unsupported scan type for UsertitleStatusT: %T", src) + } + return nil +} + +type NullUsertitleStatusT struct { + UsertitleStatusT UsertitleStatusT `json:"usertitle_status_t"` + Valid bool `json:"valid"` // Valid is true if UsertitleStatusT is not NULL +} + +// Scan implements the Scanner interface. +func (ns *NullUsertitleStatusT) Scan(value interface{}) error { + if value == nil { + ns.UsertitleStatusT, ns.Valid = "", false + return nil + } + ns.Valid = true + return ns.UsertitleStatusT.Scan(value) +} + +// Value implements the driver Valuer interface. +func (ns NullUsertitleStatusT) Value() (driver.Value, error) { + if !ns.Valid { + return nil, nil + } + return string(ns.UsertitleStatusT), nil +} + +type Images struct { + ImageID int32 `db:"image_id" json:"image_id"` + StorageType StorageTypeT `db:"storage_type" json:"storage_type"` + ImagePath string `db:"image_path" json:"image_path"` +} + +type Providers struct { + ProviderID int32 `db:"provider_id" json:"provider_id"` + ProviderName string `db:"provider_name" json:"provider_name"` +} + +type Reviews struct { + ReviewID int32 `db:"review_id" json:"review_id"` + UserID int32 `db:"user_id" json:"user_id"` + TitleID int32 `db:"title_id" json:"title_id"` + ImageIds []int32 `db:"image_ids" json:"image_ids"` + ReviewText string `db:"review_text" json:"review_text"` + CreationDate pgtype.Timestamp `db:"creation_date" json:"creation_date"` +} + +type Signals struct { + SignalID int32 `db:"signal_id" json:"signal_id"` + RawData []byte `db:"raw_data" json:"raw_data"` + ProviderID int32 `db:"provider_id" json:"provider_id"` + Dirty bool `db:"dirty" json:"dirty"` +} + +type Studios struct { + StudioID int32 `db:"studio_id" json:"studio_id"` + StudioName pgtype.Text `db:"studio_name" json:"studio_name"` + IllustID pgtype.Int4 `db:"illust_id" json:"illust_id"` + StudioDesc pgtype.Text `db:"studio_desc" json:"studio_desc"` +} + +type Tags struct { + TagID int32 `db:"tag_id" json:"tag_id"` + TagNames []byte `db:"tag_names" json:"tag_names"` +} + +type TitleTags struct { + TitleID int32 `db:"title_id" json:"title_id"` + TagID int32 `db:"tag_id" json:"tag_id"` +} + +type Titles struct { + TitleID int32 `db:"title_id" json:"title_id"` + TitleNames []byte `db:"title_names" json:"title_names"` + StudioID int32 `db:"studio_id" json:"studio_id"` + PosterID pgtype.Int4 `db:"poster_id" json:"poster_id"` + SignalIds []int32 `db:"signal_ids" json:"signal_ids"` + TitleStatus TitleStatusT `db:"title_status" json:"title_status"` + Rating pgtype.Float8 `db:"rating" json:"rating"` + RatingCount pgtype.Int4 `db:"rating_count" json:"rating_count"` + ReleaseYear pgtype.Int4 `db:"release_year" json:"release_year"` + ReleaseSeason NullReleaseSeasonT `db:"release_season" json:"release_season"` + Season pgtype.Int4 `db:"season" json:"season"` + EpisodesAired pgtype.Int4 `db:"episodes_aired" json:"episodes_aired"` + EpisodesAll pgtype.Int4 `db:"episodes_all" json:"episodes_all"` + EpisodesLen []byte `db:"episodes_len" json:"episodes_len"` +} + +type Users struct { + UserID int32 `db:"user_id" json:"user_id"` + AvatarID pgtype.Int4 `db:"avatar_id" json:"avatar_id"` + Passhash string `db:"passhash" json:"passhash"` + Mail pgtype.Text `db:"mail" json:"mail"` + Nickname string `db:"nickname" json:"nickname"` + DispName pgtype.Text `db:"disp_name" json:"disp_name"` + UserDesc pgtype.Text `db:"user_desc" json:"user_desc"` + CreationDate pgtype.Timestamp `db:"creation_date" json:"creation_date"` +} + +type Usertitles struct { + UsertitleID int32 `db:"usertitle_id" json:"usertitle_id"` + UserID int32 `db:"user_id" json:"user_id"` + TitleID int32 `db:"title_id" json:"title_id"` + Status UsertitleStatusT `db:"status" json:"status"` + Rate pgtype.Int4 `db:"rate" json:"rate"` + ReviewID pgtype.Int4 `db:"review_id" json:"review_id"` +} diff --git a/modules/backend/db/query.sql.go b/modules/backend/db/query.sql.go new file mode 100644 index 0000000..1fc06ac --- /dev/null +++ b/modules/backend/db/query.sql.go @@ -0,0 +1,712 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.30.0 +// source: query.sql + +package db + +import ( + "context" + + "github.com/jackc/pgx/v5/pgtype" +) + +const createImage = `-- name: CreateImage :one +INSERT INTO images (storage_type, image_path) +VALUES ($1, $2) +RETURNING image_id, storage_type, image_path +` + +type CreateImageParams struct { + StorageType StorageTypeT `db:"storage_type" json:"storage_type"` + ImagePath string `db:"image_path" json:"image_path"` +} + +func (q *Queries) CreateImage(ctx context.Context, arg CreateImageParams) (Images, error) { + row := q.db.QueryRow(ctx, createImage, arg.StorageType, arg.ImagePath) + var i Images + err := row.Scan(&i.ImageID, &i.StorageType, &i.ImagePath) + return i, err +} + +const createReview = `-- name: CreateReview :one +INSERT INTO reviews (user_id, title_id, image_ids, review_text, creation_date) +VALUES ($1, $2, $3, $4, $5) +RETURNING review_id, user_id, title_id, image_ids, review_text, creation_date +` + +type CreateReviewParams struct { + UserID int32 `db:"user_id" json:"user_id"` + TitleID int32 `db:"title_id" json:"title_id"` + ImageIds []int32 `db:"image_ids" json:"image_ids"` + ReviewText string `db:"review_text" json:"review_text"` + CreationDate pgtype.Timestamp `db:"creation_date" json:"creation_date"` +} + +func (q *Queries) CreateReview(ctx context.Context, arg CreateReviewParams) (Reviews, error) { + row := q.db.QueryRow(ctx, createReview, + arg.UserID, + arg.TitleID, + arg.ImageIds, + arg.ReviewText, + arg.CreationDate, + ) + var i Reviews + err := row.Scan( + &i.ReviewID, + &i.UserID, + &i.TitleID, + &i.ImageIds, + &i.ReviewText, + &i.CreationDate, + ) + return i, err +} + +const createUser = `-- name: CreateUser :one +INSERT INTO users (avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date) +VALUES ($1, $2, $3, $4, $5, $6, $7) +RETURNING user_id, avatar_id, nickname, disp_name, user_desc, creation_date +` + +type CreateUserParams struct { + AvatarID pgtype.Int4 `db:"avatar_id" json:"avatar_id"` + Passhash string `db:"passhash" json:"passhash"` + Mail pgtype.Text `db:"mail" json:"mail"` + Nickname string `db:"nickname" json:"nickname"` + DispName pgtype.Text `db:"disp_name" json:"disp_name"` + UserDesc pgtype.Text `db:"user_desc" json:"user_desc"` + CreationDate pgtype.Timestamp `db:"creation_date" json:"creation_date"` +} + +type CreateUserRow struct { + UserID int32 `db:"user_id" json:"user_id"` + AvatarID pgtype.Int4 `db:"avatar_id" json:"avatar_id"` + Nickname string `db:"nickname" json:"nickname"` + DispName pgtype.Text `db:"disp_name" json:"disp_name"` + UserDesc pgtype.Text `db:"user_desc" json:"user_desc"` + CreationDate pgtype.Timestamp `db:"creation_date" json:"creation_date"` +} + +func (q *Queries) CreateUser(ctx context.Context, arg CreateUserParams) (CreateUserRow, error) { + row := q.db.QueryRow(ctx, createUser, + arg.AvatarID, + arg.Passhash, + arg.Mail, + arg.Nickname, + arg.DispName, + arg.UserDesc, + arg.CreationDate, + ) + var i CreateUserRow + err := row.Scan( + &i.UserID, + &i.AvatarID, + &i.Nickname, + &i.DispName, + &i.UserDesc, + &i.CreationDate, + ) + return i, err +} + +const createUserTitle = `-- name: CreateUserTitle :one +INSERT INTO usertitles (user_id, title_id, status, rate, review_id) +VALUES ($1, $2, $3, $4, $5) +RETURNING usertitle_id, user_id, title_id, status, rate, review_id +` + +type CreateUserTitleParams struct { + UserID int32 `db:"user_id" json:"user_id"` + TitleID int32 `db:"title_id" json:"title_id"` + Status UsertitleStatusT `db:"status" json:"status"` + Rate pgtype.Int4 `db:"rate" json:"rate"` + ReviewID pgtype.Int4 `db:"review_id" json:"review_id"` +} + +func (q *Queries) CreateUserTitle(ctx context.Context, arg CreateUserTitleParams) (Usertitles, error) { + row := q.db.QueryRow(ctx, createUserTitle, + arg.UserID, + arg.TitleID, + arg.Status, + arg.Rate, + arg.ReviewID, + ) + var i Usertitles + err := row.Scan( + &i.UsertitleID, + &i.UserID, + &i.TitleID, + &i.Status, + &i.Rate, + &i.ReviewID, + ) + return i, err +} + +const deleteReview = `-- name: DeleteReview :exec +DELETE FROM reviews +WHERE review_id = $1 +` + +func (q *Queries) DeleteReview(ctx context.Context, reviewID int32) error { + _, err := q.db.Exec(ctx, deleteReview, reviewID) + return err +} + +const deleteUser = `-- name: DeleteUser :exec +DELETE FROM users +WHERE user_id = $1 +` + +func (q *Queries) DeleteUser(ctx context.Context, userID int32) error { + _, err := q.db.Exec(ctx, deleteUser, userID) + return err +} + +const deleteUserTitle = `-- name: DeleteUserTitle :exec +DELETE FROM usertitles +WHERE user_id = $1 AND ($2::int IS NULL OR title_id = $2) +` + +type DeleteUserTitleParams struct { + UserID int32 `db:"user_id" json:"user_id"` + Column2 int32 `db:"column_2" json:"column_2"` +} + +func (q *Queries) DeleteUserTitle(ctx context.Context, arg DeleteUserTitleParams) error { + _, err := q.db.Exec(ctx, deleteUserTitle, arg.UserID, arg.Column2) + return err +} + +const getImageByID = `-- name: GetImageByID :one +SELECT image_id, storage_type, image_path +FROM images +WHERE image_id = $1 +` + +func (q *Queries) GetImageByID(ctx context.Context, imageID int32) (Images, error) { + row := q.db.QueryRow(ctx, getImageByID, imageID) + var i Images + err := row.Scan(&i.ImageID, &i.StorageType, &i.ImagePath) + return i, err +} + +const getReviewByID = `-- name: GetReviewByID :one +SELECT review_id, user_id, title_id, image_ids, review_text, creation_date +FROM reviews +WHERE review_id = $1 +` + +func (q *Queries) GetReviewByID(ctx context.Context, reviewID int32) (Reviews, error) { + row := q.db.QueryRow(ctx, getReviewByID, reviewID) + var i Reviews + err := row.Scan( + &i.ReviewID, + &i.UserID, + &i.TitleID, + &i.ImageIds, + &i.ReviewText, + &i.CreationDate, + ) + return i, err +} + +const getTitleByID = `-- name: GetTitleByID :one +SELECT title_id, title_names, studio_id, poster_id, signal_ids, + title_status, rating, rating_count, release_year, release_season, + season, episodes_aired, episodes_all, episodes_len +FROM titles +WHERE title_id = $1 +` + +func (q *Queries) GetTitleByID(ctx context.Context, titleID int32) (Titles, error) { + row := q.db.QueryRow(ctx, getTitleByID, titleID) + var i Titles + err := row.Scan( + &i.TitleID, + &i.TitleNames, + &i.StudioID, + &i.PosterID, + &i.SignalIds, + &i.TitleStatus, + &i.Rating, + &i.RatingCount, + &i.ReleaseYear, + &i.ReleaseSeason, + &i.Season, + &i.EpisodesAired, + &i.EpisodesAll, + &i.EpisodesLen, + ) + return i, err +} + +const getUserByID = `-- name: GetUserByID :one +SELECT user_id, avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date +FROM users +WHERE user_id = $1 +` + +func (q *Queries) GetUserByID(ctx context.Context, userID int32) (Users, error) { + row := q.db.QueryRow(ctx, getUserByID, userID) + var i Users + err := row.Scan( + &i.UserID, + &i.AvatarID, + &i.Passhash, + &i.Mail, + &i.Nickname, + &i.DispName, + &i.UserDesc, + &i.CreationDate, + ) + return i, err +} + +const getUserTitle = `-- name: GetUserTitle :one +SELECT usertitle_id, user_id, title_id, status, rate, review_id +FROM usertitles +WHERE user_id = $1 AND title_id = $2 +` + +type GetUserTitleParams struct { + UserID int32 `db:"user_id" json:"user_id"` + TitleID int32 `db:"title_id" json:"title_id"` +} + +func (q *Queries) GetUserTitle(ctx context.Context, arg GetUserTitleParams) (Usertitles, error) { + row := q.db.QueryRow(ctx, getUserTitle, arg.UserID, arg.TitleID) + var i Usertitles + err := row.Scan( + &i.UsertitleID, + &i.UserID, + &i.TitleID, + &i.Status, + &i.Rate, + &i.ReviewID, + ) + return i, err +} + +const listReviewsByTitle = `-- name: ListReviewsByTitle :many +SELECT review_id, user_id, title_id, image_ids, review_text, creation_date +FROM reviews +WHERE title_id = $1 +ORDER BY creation_date DESC +LIMIT $2 OFFSET $3 +` + +type ListReviewsByTitleParams struct { + TitleID int32 `db:"title_id" json:"title_id"` + Limit int32 `db:"limit" json:"limit"` + Offset int32 `db:"offset" json:"offset"` +} + +func (q *Queries) ListReviewsByTitle(ctx context.Context, arg ListReviewsByTitleParams) ([]Reviews, error) { + rows, err := q.db.Query(ctx, listReviewsByTitle, arg.TitleID, arg.Limit, arg.Offset) + if err != nil { + return nil, err + } + defer rows.Close() + var items []Reviews + for rows.Next() { + var i Reviews + if err := rows.Scan( + &i.ReviewID, + &i.UserID, + &i.TitleID, + &i.ImageIds, + &i.ReviewText, + &i.CreationDate, + ); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const listReviewsByUser = `-- name: ListReviewsByUser :many +SELECT review_id, user_id, title_id, image_ids, review_text, creation_date +FROM reviews +WHERE user_id = $1 +ORDER BY creation_date DESC +LIMIT $2 OFFSET $3 +` + +type ListReviewsByUserParams struct { + UserID int32 `db:"user_id" json:"user_id"` + Limit int32 `db:"limit" json:"limit"` + Offset int32 `db:"offset" json:"offset"` +} + +func (q *Queries) ListReviewsByUser(ctx context.Context, arg ListReviewsByUserParams) ([]Reviews, error) { + rows, err := q.db.Query(ctx, listReviewsByUser, arg.UserID, arg.Limit, arg.Offset) + if err != nil { + return nil, err + } + defer rows.Close() + var items []Reviews + for rows.Next() { + var i Reviews + if err := rows.Scan( + &i.ReviewID, + &i.UserID, + &i.TitleID, + &i.ImageIds, + &i.ReviewText, + &i.CreationDate, + ); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const listTags = `-- name: ListTags :many +SELECT tag_id, tag_names +FROM tags +ORDER BY tag_id +LIMIT $1 OFFSET $2 +` + +type ListTagsParams struct { + Limit int32 `db:"limit" json:"limit"` + Offset int32 `db:"offset" json:"offset"` +} + +func (q *Queries) ListTags(ctx context.Context, arg ListTagsParams) ([]Tags, error) { + rows, err := q.db.Query(ctx, listTags, arg.Limit, arg.Offset) + if err != nil { + return nil, err + } + defer rows.Close() + var items []Tags + for rows.Next() { + var i Tags + if err := rows.Scan(&i.TagID, &i.TagNames); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const listTitles = `-- name: ListTitles :many +SELECT title_id, title_names, studio_id, poster_id, signal_ids, + title_status, rating, rating_count, release_year, release_season, + season, episodes_aired, episodes_all, episodes_len +FROM titles +ORDER BY title_id +LIMIT $1 OFFSET $2 +` + +type ListTitlesParams struct { + Limit int32 `db:"limit" json:"limit"` + Offset int32 `db:"offset" json:"offset"` +} + +func (q *Queries) ListTitles(ctx context.Context, arg ListTitlesParams) ([]Titles, error) { + rows, err := q.db.Query(ctx, listTitles, arg.Limit, arg.Offset) + if err != nil { + return nil, err + } + defer rows.Close() + var items []Titles + for rows.Next() { + var i Titles + if err := rows.Scan( + &i.TitleID, + &i.TitleNames, + &i.StudioID, + &i.PosterID, + &i.SignalIds, + &i.TitleStatus, + &i.Rating, + &i.RatingCount, + &i.ReleaseYear, + &i.ReleaseSeason, + &i.Season, + &i.EpisodesAired, + &i.EpisodesAll, + &i.EpisodesLen, + ); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const listUserTitles = `-- name: ListUserTitles :many +SELECT usertitle_id, user_id, title_id, status, rate, review_id +FROM usertitles +WHERE user_id = $1 +ORDER BY usertitle_id +LIMIT $2 OFFSET $3 +` + +type ListUserTitlesParams struct { + UserID int32 `db:"user_id" json:"user_id"` + Limit int32 `db:"limit" json:"limit"` + Offset int32 `db:"offset" json:"offset"` +} + +func (q *Queries) ListUserTitles(ctx context.Context, arg ListUserTitlesParams) ([]Usertitles, error) { + rows, err := q.db.Query(ctx, listUserTitles, arg.UserID, arg.Limit, arg.Offset) + if err != nil { + return nil, err + } + defer rows.Close() + var items []Usertitles + for rows.Next() { + var i Usertitles + if err := rows.Scan( + &i.UsertitleID, + &i.UserID, + &i.TitleID, + &i.Status, + &i.Rate, + &i.ReviewID, + ); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const listUsers = `-- name: ListUsers :many +SELECT user_id, avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date +FROM users +ORDER BY user_id +LIMIT $1 OFFSET $2 +` + +type ListUsersParams struct { + Limit int32 `db:"limit" json:"limit"` + Offset int32 `db:"offset" json:"offset"` +} + +func (q *Queries) ListUsers(ctx context.Context, arg ListUsersParams) ([]Users, error) { + rows, err := q.db.Query(ctx, listUsers, arg.Limit, arg.Offset) + if err != nil { + return nil, err + } + defer rows.Close() + var items []Users + for rows.Next() { + var i Users + if err := rows.Scan( + &i.UserID, + &i.AvatarID, + &i.Passhash, + &i.Mail, + &i.Nickname, + &i.DispName, + &i.UserDesc, + &i.CreationDate, + ); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const updateReview = `-- name: UpdateReview :one +UPDATE reviews +SET + image_ids = COALESCE($1, image_ids), + review_text = COALESCE($2, review_text) +WHERE review_id = $3 +RETURNING review_id, user_id, title_id, image_ids, review_text, creation_date +` + +type UpdateReviewParams struct { + ImageIds []int32 `db:"image_ids" json:"image_ids"` + ReviewText pgtype.Text `db:"review_text" json:"review_text"` + ReviewID int32 `db:"review_id" json:"review_id"` +} + +func (q *Queries) UpdateReview(ctx context.Context, arg UpdateReviewParams) (Reviews, error) { + row := q.db.QueryRow(ctx, updateReview, arg.ImageIds, arg.ReviewText, arg.ReviewID) + var i Reviews + err := row.Scan( + &i.ReviewID, + &i.UserID, + &i.TitleID, + &i.ImageIds, + &i.ReviewText, + &i.CreationDate, + ) + return i, err +} + +const updateTitle = `-- name: UpdateTitle :one +UPDATE titles +SET + title_names = COALESCE($1, title_names), + studio_id = COALESCE($2, studio_id), + poster_id = COALESCE($3, poster_id), + signal_ids = COALESCE($4, signal_ids), + title_status = COALESCE($5, title_status), + release_year = COALESCE($6, release_year), + release_season = COALESCE($7, release_season), + episodes_aired = COALESCE($8, episodes_aired), + episodes_all = COALESCE($9, episodes_all), + episodes_len = COALESCE($10, episodes_len) +WHERE title_id = $11 +RETURNING title_id, title_names, studio_id, poster_id, signal_ids, title_status, rating, rating_count, release_year, release_season, season, episodes_aired, episodes_all, episodes_len +` + +type UpdateTitleParams struct { + TitleNames []byte `db:"title_names" json:"title_names"` + StudioID pgtype.Int4 `db:"studio_id" json:"studio_id"` + PosterID pgtype.Int4 `db:"poster_id" json:"poster_id"` + SignalIds []int32 `db:"signal_ids" json:"signal_ids"` + TitleStatus NullTitleStatusT `db:"title_status" json:"title_status"` + ReleaseYear pgtype.Int4 `db:"release_year" json:"release_year"` + ReleaseSeason NullReleaseSeasonT `db:"release_season" json:"release_season"` + EpisodesAired pgtype.Int4 `db:"episodes_aired" json:"episodes_aired"` + EpisodesAll pgtype.Int4 `db:"episodes_all" json:"episodes_all"` + EpisodesLen []byte `db:"episodes_len" json:"episodes_len"` + TitleID int32 `db:"title_id" json:"title_id"` +} + +func (q *Queries) UpdateTitle(ctx context.Context, arg UpdateTitleParams) (Titles, error) { + row := q.db.QueryRow(ctx, updateTitle, + arg.TitleNames, + arg.StudioID, + arg.PosterID, + arg.SignalIds, + arg.TitleStatus, + arg.ReleaseYear, + arg.ReleaseSeason, + arg.EpisodesAired, + arg.EpisodesAll, + arg.EpisodesLen, + arg.TitleID, + ) + var i Titles + err := row.Scan( + &i.TitleID, + &i.TitleNames, + &i.StudioID, + &i.PosterID, + &i.SignalIds, + &i.TitleStatus, + &i.Rating, + &i.RatingCount, + &i.ReleaseYear, + &i.ReleaseSeason, + &i.Season, + &i.EpisodesAired, + &i.EpisodesAll, + &i.EpisodesLen, + ) + return i, err +} + +const updateUser = `-- name: UpdateUser :one +UPDATE users +SET + avatar_id = COALESCE($1, avatar_id), + disp_name = COALESCE($2, disp_name), + user_desc = COALESCE($3, user_desc) +WHERE user_id = $4 +RETURNING user_id, avatar_id, nickname, disp_name, user_desc, creation_date +` + +type UpdateUserParams struct { + AvatarID pgtype.Int4 `db:"avatar_id" json:"avatar_id"` + DispName pgtype.Text `db:"disp_name" json:"disp_name"` + UserDesc pgtype.Text `db:"user_desc" json:"user_desc"` + UserID int32 `db:"user_id" json:"user_id"` +} + +type UpdateUserRow struct { + UserID int32 `db:"user_id" json:"user_id"` + AvatarID pgtype.Int4 `db:"avatar_id" json:"avatar_id"` + Nickname string `db:"nickname" json:"nickname"` + DispName pgtype.Text `db:"disp_name" json:"disp_name"` + UserDesc pgtype.Text `db:"user_desc" json:"user_desc"` + CreationDate pgtype.Timestamp `db:"creation_date" json:"creation_date"` +} + +func (q *Queries) UpdateUser(ctx context.Context, arg UpdateUserParams) (UpdateUserRow, error) { + row := q.db.QueryRow(ctx, updateUser, + arg.AvatarID, + arg.DispName, + arg.UserDesc, + arg.UserID, + ) + var i UpdateUserRow + err := row.Scan( + &i.UserID, + &i.AvatarID, + &i.Nickname, + &i.DispName, + &i.UserDesc, + &i.CreationDate, + ) + return i, err +} + +const updateUserTitle = `-- name: UpdateUserTitle :one +UPDATE usertitles +SET + status = COALESCE($3, status), + rate = COALESCE($4, rate), + review_id = COALESCE($5, review_id) +WHERE user_id = $1 AND title_id = $2 +RETURNING usertitle_id, user_id, title_id, status, rate, review_id +` + +type UpdateUserTitleParams struct { + UserID int32 `db:"user_id" json:"user_id"` + TitleID int32 `db:"title_id" json:"title_id"` + Status NullUsertitleStatusT `db:"status" json:"status"` + Rate pgtype.Int4 `db:"rate" json:"rate"` + ReviewID pgtype.Int4 `db:"review_id" json:"review_id"` +} + +func (q *Queries) UpdateUserTitle(ctx context.Context, arg UpdateUserTitleParams) (Usertitles, error) { + row := q.db.QueryRow(ctx, updateUserTitle, + arg.UserID, + arg.TitleID, + arg.Status, + arg.Rate, + arg.ReviewID, + ) + var i Usertitles + err := row.Scan( + &i.UsertitleID, + &i.UserID, + &i.TitleID, + &i.Status, + &i.Rate, + &i.ReviewID, + ) + return i, err +} From 102d15c5fdb238c29ed842c2eb8652967ec49059 Mon Sep 17 00:00:00 2001 From: Iron_Felix Date: Sat, 11 Oct 2025 02:19:33 +0300 Subject: [PATCH 28/80] feat: connection to db logic added to main --- modules/backend/go.mod | 6 ++++ modules/backend/go.sum | 16 ++++++++++ modules/backend/main.go | 68 ++++++++++++++++++++++++++--------------- 3 files changed, 65 insertions(+), 25 deletions(-) diff --git a/modules/backend/go.mod b/modules/backend/go.mod index 9c9e8fc..d8e0cb3 100644 --- a/modules/backend/go.mod +++ b/modules/backend/go.mod @@ -3,6 +3,7 @@ module nyanimedb-server go 1.25.0 require ( + github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/bytedance/sonic v1.14.0 // indirect github.com/bytedance/sonic/loader v0.3.0 // indirect github.com/cloudwego/base64x v0.1.6 // indirect @@ -15,12 +16,17 @@ require ( github.com/go-playground/validator/v10 v10.27.0 // indirect github.com/goccy/go-json v0.10.5 // indirect github.com/goccy/go-yaml v1.18.0 // indirect + github.com/google/uuid v1.5.0 // indirect + github.com/jackc/pgpassfile v1.0.0 // indirect + github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect + github.com/jackc/pgx/v5 v5.7.6 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/cpuid/v2 v2.3.0 // indirect github.com/leodido/go-urn v1.4.0 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/oapi-codegen/runtime v1.1.2 // indirect github.com/pelletier/go-toml/v2 v2.2.4 // indirect github.com/quic-go/qpack v0.5.1 // indirect github.com/quic-go/quic-go v0.54.0 // indirect diff --git a/modules/backend/go.sum b/modules/backend/go.sum index 5cc008d..a08eb1d 100644 --- a/modules/backend/go.sum +++ b/modules/backend/go.sum @@ -1,3 +1,7 @@ +github.com/RaveNoX/go-jsoncommentstrip v1.0.0/go.mod h1:78ihd09MekBnJnxpICcwzCMzGrKSKYe4AqU6PDYYpjk= +github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ= +github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk= +github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w= github.com/bytedance/sonic v1.14.0 h1:/OfKt8HFw0kh2rj8N0F6C/qPGRESq0BbaNZgcNXXzQQ= github.com/bytedance/sonic v1.14.0/go.mod h1:WoEbx8WTcFJfzCe0hbmyTGrfjt8PzNEBdxlNUO24NhA= github.com/bytedance/sonic/loader v0.3.0 h1:dskwH8edlzNMctoruo8FPTJDF3vLtDT0sXZwvZJyqeA= @@ -29,8 +33,17 @@ github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PU github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw= github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= +github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= +github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= +github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo= +github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= +github.com/jackc/pgx/v5 v5.7.6 h1:rWQc5FwZSPX58r1OQmkuaNicxdmExaEz5A2DO2hUuTk= +github.com/jackc/pgx/v5 v5.7.6/go.mod h1:aruU7o91Tc2q2cFp5h4uP3f6ztExVpyVv88Xl/8Vl8M= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d/go.mod h1:2PavIy+JPciBPrBUjwbNvtwB6RQlve+hkpll6QSNmOE= github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= @@ -43,6 +56,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/oapi-codegen/runtime v1.1.2 h1:P2+CubHq8fO4Q6fV1tqDBZHCwpVpvPg7oKiYzQgXIyI= +github.com/oapi-codegen/runtime v1.1.2/go.mod h1:SK9X900oXmPWilYR5/WKPzt3Kqxn/uS/+lbpREv+eCg= github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4= github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -52,6 +67,7 @@ github.com/quic-go/quic-go v0.54.0 h1:6s1YB9QotYI6Ospeiguknbp2Znb/jZYjZLRXn9kMQB github.com/quic-go/quic-go v0.54.0/go.mod h1:e68ZEaCdyviluZmy44P6Iey98v/Wfz6HCjQEm+l8zTY= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= diff --git a/modules/backend/main.go b/modules/backend/main.go index 651d9cc..5a61226 100644 --- a/modules/backend/main.go +++ b/modules/backend/main.go @@ -1,35 +1,48 @@ package main import ( + "context" "fmt" - "net/http" + "nyanimedb-server/api" + "nyanimedb-server/db" "os" "reflect" "time" "github.com/gin-contrib/cors" "github.com/gin-gonic/gin" + "github.com/jackc/pgx/v5" "github.com/pelletier/go-toml/v2" - log "github.com/sirupsen/logrus" ) var AppConfig Config func main() { - if len(os.Args) != 2 { - AppConfig.Mode = "env" - } else { - AppConfig.Mode = "argv" + // if len(os.Args) != 2 { + // AppConfig.Mode = "env" + // } else { + // AppConfig.Mode = "argv" + // } + + // err := InitConfig() + // if err != nil { + // log.Fatalf("Failed to init config: %v\n", err) + // } + + conn, err := pgx.Connect(context.Background(), os.Getenv("DATABASE_URL")) + if err != nil { + fmt.Fprintf(os.Stderr, "Unable to connect to database: %v\n", err) + os.Exit(1) } - err := InitConfig() - if err != nil { - log.Fatalf("Failed to init config: %v\n", err) - } + defer conn.Close(context.Background()) r := gin.Default() - r.LoadHTMLGlob("templates/*") + queries := db.New(conn) + + server := api.NewServer(queries) + // r.LoadHTMLGlob("templates/*") r.Use(cors.New(cors.Config{ AllowOrigins: []string{"*"}, // allow all origins, change to specific domains in production @@ -40,22 +53,27 @@ func main() { MaxAge: 12 * time.Hour, })) - r.GET("/", func(c *gin.Context) { - c.HTML(http.StatusOK, "index.html", gin.H{ - "title": "Welcome Page", - "message": "Hello, Gin with HTML templates!", - }) - }) + api.RegisterHandlers(r, api.NewStrictHandler( + server, + // сюда можно добавить middlewares, если нужно + []api.StrictMiddlewareFunc{}, + )) + // r.GET("/", func(c *gin.Context) { + // c.HTML(http.StatusOK, "index.html", gin.H{ + // "title": "Welcome Page", + // "message": "Hello, Gin with HTML templates!", + // }) + // }) - r.GET("/api", func(c *gin.Context) { - items := []Item{ - {ID: 1, Title: "First Item", Description: "This is the description of the first item."}, - {ID: 2, Title: "Second Item", Description: "This is the description of the second item."}, - {ID: 3, Title: "Third Item", Description: "This is the description of the third item."}, - } + // r.GET("/api", func(c *gin.Context) { + // items := []Item{ + // {ID: 1, Title: "First Item", Description: "This is the description of the first item."}, + // {ID: 2, Title: "Second Item", Description: "This is the description of the second item."}, + // {ID: 3, Title: "Third Item", Description: "This is the description of the third item."}, + // } - c.JSON(http.StatusOK, items) - }) + // c.JSON(http.StatusOK, items) + // }) r.Run(":8080") } From 28c38ca1a0ef875a9d9f0151b29af798fd5d8651 Mon Sep 17 00:00:00 2001 From: Iron_Felix Date: Sat, 11 Oct 2025 02:27:13 +0300 Subject: [PATCH 29/80] feat: db url env added --- .forgejo/workflows/build-and-deploy.yml | 1 + deploy/docker-compose.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.forgejo/workflows/build-and-deploy.yml b/.forgejo/workflows/build-and-deploy.yml index 2bc0106..cd1087b 100644 --- a/.forgejo/workflows/build-and-deploy.yml +++ b/.forgejo/workflows/build-and-deploy.yml @@ -94,6 +94,7 @@ jobs: POSTGRES_PORT: 5432 POSTGRES_VERSION: 18 LOG_LEVEL: ${{ vars.LOG_LEVEL }} + DATABASE_URL: ${{ secrets.DATABASE_URL }} steps: - name: Checkout code diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index 266f9d5..a9ca65d 100644 --- a/deploy/docker-compose.yml +++ b/deploy/docker-compose.yml @@ -32,6 +32,7 @@ services: restart: always environment: LOG_LEVEL: ${LOG_LEVEL} + DATABASE_URL: ${DATABASE_URL} ports: - "8080:8080" depends_on: From 8e44b8b7b45105719fd4695f91670b5d093eb7d7 Mon Sep 17 00:00:00 2001 From: nihonium Date: Sat, 11 Oct 2025 04:25:57 +0300 Subject: [PATCH 30/80] feat: fetch user info --- modules/frontend/package-lock.json | 181 +++++++ modules/frontend/package.json | 1 + modules/frontend/src/App.tsx | 27 +- modules/frontend/src/api/core/ApiError.ts | 25 + .../src/api/core/ApiRequestOptions.ts | 17 + modules/frontend/src/api/core/ApiResult.ts | 11 + .../src/api/core/CancelablePromise.ts | 131 +++++ modules/frontend/src/api/core/OpenAPI.ts | 32 ++ modules/frontend/src/api/core/request.ts | 323 ++++++++++++ modules/frontend/src/api/index.ts | 16 + modules/frontend/src/api/models/Review.ts | 5 + modules/frontend/src/api/models/Tag.ts | 5 + modules/frontend/src/api/models/Title.ts | 5 + modules/frontend/src/api/models/User.ts | 5 + modules/frontend/src/api/models/UserTitle.ts | 5 + .../src/api/services/DefaultService.ts | 478 ++++++++++++++++++ 16 files changed, 1254 insertions(+), 13 deletions(-) create mode 100644 modules/frontend/src/api/core/ApiError.ts create mode 100644 modules/frontend/src/api/core/ApiRequestOptions.ts create mode 100644 modules/frontend/src/api/core/ApiResult.ts create mode 100644 modules/frontend/src/api/core/CancelablePromise.ts create mode 100644 modules/frontend/src/api/core/OpenAPI.ts create mode 100644 modules/frontend/src/api/core/request.ts create mode 100644 modules/frontend/src/api/index.ts create mode 100644 modules/frontend/src/api/models/Review.ts create mode 100644 modules/frontend/src/api/models/Tag.ts create mode 100644 modules/frontend/src/api/models/Title.ts create mode 100644 modules/frontend/src/api/models/User.ts create mode 100644 modules/frontend/src/api/models/UserTitle.ts create mode 100644 modules/frontend/src/api/services/DefaultService.ts diff --git a/modules/frontend/package-lock.json b/modules/frontend/package-lock.json index a282de5..b1789ed 100644 --- a/modules/frontend/package-lock.json +++ b/modules/frontend/package-lock.json @@ -22,11 +22,30 @@ "eslint-plugin-react-hooks": "^5.2.0", "eslint-plugin-react-refresh": "^0.4.22", "globals": "^16.4.0", + "openapi-typescript-codegen": "^0.29.0", "typescript": "~5.9.3", "typescript-eslint": "^8.45.0", "vite": "^7.1.7" } }, + "node_modules/@apidevtools/json-schema-ref-parser": { + "version": "11.9.3", + "resolved": "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-11.9.3.tgz", + "integrity": "sha512-60vepv88RwcJtSHrD6MjIL6Ta3SOYbgfnkHb+ppAVK+o9mXprRtulx7VlRl3lN3bbvysAfCS7WMVfhUYemB0IQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jsdevtools/ono": "^7.1.3", + "@types/json-schema": "^7.0.15", + "js-yaml": "^4.1.0" + }, + "engines": { + "node": ">= 16" + }, + "funding": { + "url": "https://github.com/sponsors/philsturgeon" + } + }, "node_modules/@babel/code-frame": { "version": "7.27.1", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz", @@ -1011,6 +1030,13 @@ "@jridgewell/sourcemap-codec": "^1.4.14" } }, + "node_modules/@jsdevtools/ono": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.3.tgz", + "integrity": "sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==", + "dev": true, + "license": "MIT" + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -1928,6 +1954,19 @@ "node": ">=6" } }, + "node_modules/camelcase": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/caniuse-lite": { "version": "1.0.30001749", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001749.tgz", @@ -1998,6 +2037,16 @@ "node": ">= 0.8" } }, + "node_modules/commander": { + "version": "12.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz", + "integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + } + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -2539,6 +2588,21 @@ "node": ">= 6" } }, + "node_modules/fs-extra": { + "version": "11.3.2", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.2.tgz", + "integrity": "sha512-Xr9F6z6up6Ws+NjzMCZc6WXg2YFRlrLP9NQDO3VQrWrfiojdhS56TzueT88ze0uBdCTwEIhQ3ptnmKeWGFAe0A==", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=14.14" + } + }, "node_modules/fsevents": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", @@ -2648,6 +2712,13 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true, + "license": "ISC" + }, "node_modules/graphemer": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", @@ -2655,6 +2726,28 @@ "dev": true, "license": "MIT" }, + "node_modules/handlebars": { + "version": "4.7.8", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz", + "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "minimist": "^1.2.5", + "neo-async": "^2.6.2", + "source-map": "^0.6.1", + "wordwrap": "^1.0.0" + }, + "bin": { + "handlebars": "bin/handlebars" + }, + "engines": { + "node": ">=0.4.7" + }, + "optionalDependencies": { + "uglify-js": "^3.1.4" + } + }, "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -2848,6 +2941,19 @@ "node": ">=6" } }, + "node_modules/jsonfile": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz", + "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==", + "dev": true, + "license": "MIT", + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, "node_modules/keyv": { "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", @@ -2972,6 +3078,16 @@ "node": "*" } }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -3005,6 +3121,13 @@ "dev": true, "license": "MIT" }, + "node_modules/neo-async": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", + "dev": true, + "license": "MIT" + }, "node_modules/node-releases": { "version": "2.0.23", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.23.tgz", @@ -3012,6 +3135,23 @@ "dev": true, "license": "MIT" }, + "node_modules/openapi-typescript-codegen": { + "version": "0.29.0", + "resolved": "https://registry.npmjs.org/openapi-typescript-codegen/-/openapi-typescript-codegen-0.29.0.tgz", + "integrity": "sha512-/wC42PkD0LGjDTEULa/XiWQbv4E9NwLjwLjsaJ/62yOsoYhwvmBR31kPttn1DzQ2OlGe5stACcF/EIkZk43M6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@apidevtools/json-schema-ref-parser": "^11.5.4", + "camelcase": "^6.3.0", + "commander": "^12.0.0", + "fs-extra": "^11.2.0", + "handlebars": "^4.7.8" + }, + "bin": { + "openapi": "bin/index.js" + } + }, "node_modules/optionator": { "version": "0.9.4", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", @@ -3349,6 +3489,16 @@ "node": ">=8" } }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/source-map-js": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", @@ -3512,6 +3662,20 @@ "typescript": ">=4.8.4 <6.0.0" } }, + "node_modules/uglify-js": { + "version": "3.19.3", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz", + "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==", + "dev": true, + "license": "BSD-2-Clause", + "optional": true, + "bin": { + "uglifyjs": "bin/uglifyjs" + }, + "engines": { + "node": ">=0.8.0" + } + }, "node_modules/undici-types": { "version": "7.14.0", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.14.0.tgz", @@ -3519,6 +3683,16 @@ "dev": true, "license": "MIT" }, + "node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 10.0.0" + } + }, "node_modules/update-browserslist-db": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz", @@ -3694,6 +3868,13 @@ "node": ">=0.10.0" } }, + "node_modules/wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==", + "dev": true, + "license": "MIT" + }, "node_modules/yallist": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", diff --git a/modules/frontend/package.json b/modules/frontend/package.json index 9fbc7aa..c40ff17 100644 --- a/modules/frontend/package.json +++ b/modules/frontend/package.json @@ -24,6 +24,7 @@ "eslint-plugin-react-hooks": "^5.2.0", "eslint-plugin-react-refresh": "^0.4.22", "globals": "^16.4.0", + "openapi-typescript-codegen": "^0.29.0", "typescript": "~5.9.3", "typescript-eslint": "^8.45.0", "vite": "^7.1.7" diff --git a/modules/frontend/src/App.tsx b/modules/frontend/src/App.tsx index d9e6fbd..f16bb18 100644 --- a/modules/frontend/src/App.tsx +++ b/modules/frontend/src/App.tsx @@ -1,36 +1,37 @@ import React, { useEffect, useState } from "react"; -import { fetchItems } from "./services/api"; -import type { Item } from "./services/api"; -import ItemTemplate from "./components/ItemTemplate"; +import { DefaultService } from "./api/services/DefaultService"; // adjust path if needed +import type { User } from "./api/models/User"; // adjust path if needed const App: React.FC = () => { - const [items, setItems] = useState([]); + const [user, setUser] = useState(null); const [loading, setLoading] = useState(true); const [error, setError] = useState(null); useEffect(() => { - const getData = async () => { + const getUserInfo = async () => { try { - const data = await fetchItems(); - setItems(data); + const userInfo = await DefaultService.getUsers("1", "all"); + setUser(userInfo); } catch (err) { - setError("Failed to fetch items."); + console.error(err); + setError("Failed to fetch user info."); } finally { setLoading(false); } }; - getData(); + getUserInfo(); }, []); if (loading) return
Loading...
; if (error) return
{error}
; + if (!user) return
No user found.
; return (
-

Items List

- {items.map((item) => ( - - ))} +

User Info

+

ID: {user.id}

+

Name: {user.name}

+

Email: {user.email}

); }; diff --git a/modules/frontend/src/api/core/ApiError.ts b/modules/frontend/src/api/core/ApiError.ts new file mode 100644 index 0000000..ec7b16a --- /dev/null +++ b/modules/frontend/src/api/core/ApiError.ts @@ -0,0 +1,25 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +import type { ApiRequestOptions } from './ApiRequestOptions'; +import type { ApiResult } from './ApiResult'; + +export class ApiError extends Error { + public readonly url: string; + public readonly status: number; + public readonly statusText: string; + public readonly body: any; + public readonly request: ApiRequestOptions; + + constructor(request: ApiRequestOptions, response: ApiResult, message: string) { + super(message); + + this.name = 'ApiError'; + this.url = response.url; + this.status = response.status; + this.statusText = response.statusText; + this.body = response.body; + this.request = request; + } +} diff --git a/modules/frontend/src/api/core/ApiRequestOptions.ts b/modules/frontend/src/api/core/ApiRequestOptions.ts new file mode 100644 index 0000000..93143c3 --- /dev/null +++ b/modules/frontend/src/api/core/ApiRequestOptions.ts @@ -0,0 +1,17 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +export type ApiRequestOptions = { + readonly method: 'GET' | 'PUT' | 'POST' | 'DELETE' | 'OPTIONS' | 'HEAD' | 'PATCH'; + readonly url: string; + readonly path?: Record; + readonly cookies?: Record; + readonly headers?: Record; + readonly query?: Record; + readonly formData?: Record; + readonly body?: any; + readonly mediaType?: string; + readonly responseHeader?: string; + readonly errors?: Record; +}; diff --git a/modules/frontend/src/api/core/ApiResult.ts b/modules/frontend/src/api/core/ApiResult.ts new file mode 100644 index 0000000..ee1126e --- /dev/null +++ b/modules/frontend/src/api/core/ApiResult.ts @@ -0,0 +1,11 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +export type ApiResult = { + readonly url: string; + readonly ok: boolean; + readonly status: number; + readonly statusText: string; + readonly body: any; +}; diff --git a/modules/frontend/src/api/core/CancelablePromise.ts b/modules/frontend/src/api/core/CancelablePromise.ts new file mode 100644 index 0000000..d70de92 --- /dev/null +++ b/modules/frontend/src/api/core/CancelablePromise.ts @@ -0,0 +1,131 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +export class CancelError extends Error { + + constructor(message: string) { + super(message); + this.name = 'CancelError'; + } + + public get isCancelled(): boolean { + return true; + } +} + +export interface OnCancel { + readonly isResolved: boolean; + readonly isRejected: boolean; + readonly isCancelled: boolean; + + (cancelHandler: () => void): void; +} + +export class CancelablePromise implements Promise { + #isResolved: boolean; + #isRejected: boolean; + #isCancelled: boolean; + readonly #cancelHandlers: (() => void)[]; + readonly #promise: Promise; + #resolve?: (value: T | PromiseLike) => void; + #reject?: (reason?: any) => void; + + constructor( + executor: ( + resolve: (value: T | PromiseLike) => void, + reject: (reason?: any) => void, + onCancel: OnCancel + ) => void + ) { + this.#isResolved = false; + this.#isRejected = false; + this.#isCancelled = false; + this.#cancelHandlers = []; + this.#promise = new Promise((resolve, reject) => { + this.#resolve = resolve; + this.#reject = reject; + + const onResolve = (value: T | PromiseLike): void => { + if (this.#isResolved || this.#isRejected || this.#isCancelled) { + return; + } + this.#isResolved = true; + if (this.#resolve) this.#resolve(value); + }; + + const onReject = (reason?: any): void => { + if (this.#isResolved || this.#isRejected || this.#isCancelled) { + return; + } + this.#isRejected = true; + if (this.#reject) this.#reject(reason); + }; + + const onCancel = (cancelHandler: () => void): void => { + if (this.#isResolved || this.#isRejected || this.#isCancelled) { + return; + } + this.#cancelHandlers.push(cancelHandler); + }; + + Object.defineProperty(onCancel, 'isResolved', { + get: (): boolean => this.#isResolved, + }); + + Object.defineProperty(onCancel, 'isRejected', { + get: (): boolean => this.#isRejected, + }); + + Object.defineProperty(onCancel, 'isCancelled', { + get: (): boolean => this.#isCancelled, + }); + + return executor(onResolve, onReject, onCancel as OnCancel); + }); + } + + get [Symbol.toStringTag]() { + return "Cancellable Promise"; + } + + public then( + onFulfilled?: ((value: T) => TResult1 | PromiseLike) | null, + onRejected?: ((reason: any) => TResult2 | PromiseLike) | null + ): Promise { + return this.#promise.then(onFulfilled, onRejected); + } + + public catch( + onRejected?: ((reason: any) => TResult | PromiseLike) | null + ): Promise { + return this.#promise.catch(onRejected); + } + + public finally(onFinally?: (() => void) | null): Promise { + return this.#promise.finally(onFinally); + } + + public cancel(): void { + if (this.#isResolved || this.#isRejected || this.#isCancelled) { + return; + } + this.#isCancelled = true; + if (this.#cancelHandlers.length) { + try { + for (const cancelHandler of this.#cancelHandlers) { + cancelHandler(); + } + } catch (error) { + console.warn('Cancellation threw an error', error); + return; + } + } + this.#cancelHandlers.length = 0; + if (this.#reject) this.#reject(new CancelError('Request aborted')); + } + + public get isCancelled(): boolean { + return this.#isCancelled; + } +} diff --git a/modules/frontend/src/api/core/OpenAPI.ts b/modules/frontend/src/api/core/OpenAPI.ts new file mode 100644 index 0000000..4fb2299 --- /dev/null +++ b/modules/frontend/src/api/core/OpenAPI.ts @@ -0,0 +1,32 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +import type { ApiRequestOptions } from './ApiRequestOptions'; + +type Resolver = (options: ApiRequestOptions) => Promise; +type Headers = Record; + +export type OpenAPIConfig = { + BASE: string; + VERSION: string; + WITH_CREDENTIALS: boolean; + CREDENTIALS: 'include' | 'omit' | 'same-origin'; + TOKEN?: string | Resolver | undefined; + USERNAME?: string | Resolver | undefined; + PASSWORD?: string | Resolver | undefined; + HEADERS?: Headers | Resolver | undefined; + ENCODE_PATH?: ((path: string) => string) | undefined; +}; + +export const OpenAPI: OpenAPIConfig = { + BASE: 'https://api.example.com', + VERSION: '1.0.0', + WITH_CREDENTIALS: false, + CREDENTIALS: 'include', + TOKEN: undefined, + USERNAME: undefined, + PASSWORD: undefined, + HEADERS: undefined, + ENCODE_PATH: undefined, +}; diff --git a/modules/frontend/src/api/core/request.ts b/modules/frontend/src/api/core/request.ts new file mode 100644 index 0000000..1dc6fef --- /dev/null +++ b/modules/frontend/src/api/core/request.ts @@ -0,0 +1,323 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +import axios from 'axios'; +import type { AxiosError, AxiosRequestConfig, AxiosResponse, AxiosInstance } from 'axios'; +import FormData from 'form-data'; + +import { ApiError } from './ApiError'; +import type { ApiRequestOptions } from './ApiRequestOptions'; +import type { ApiResult } from './ApiResult'; +import { CancelablePromise } from './CancelablePromise'; +import type { OnCancel } from './CancelablePromise'; +import type { OpenAPIConfig } from './OpenAPI'; + +export const isDefined = (value: T | null | undefined): value is Exclude => { + return value !== undefined && value !== null; +}; + +export const isString = (value: any): value is string => { + return typeof value === 'string'; +}; + +export const isStringWithValue = (value: any): value is string => { + return isString(value) && value !== ''; +}; + +export const isBlob = (value: any): value is Blob => { + return ( + typeof value === 'object' && + typeof value.type === 'string' && + typeof value.stream === 'function' && + typeof value.arrayBuffer === 'function' && + typeof value.constructor === 'function' && + typeof value.constructor.name === 'string' && + /^(Blob|File)$/.test(value.constructor.name) && + /^(Blob|File)$/.test(value[Symbol.toStringTag]) + ); +}; + +export const isFormData = (value: any): value is FormData => { + return value instanceof FormData; +}; + +export const isSuccess = (status: number): boolean => { + return status >= 200 && status < 300; +}; + +export const base64 = (str: string): string => { + try { + return btoa(str); + } catch (err) { + // @ts-ignore + return Buffer.from(str).toString('base64'); + } +}; + +export const getQueryString = (params: Record): string => { + const qs: string[] = []; + + const append = (key: string, value: any) => { + qs.push(`${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`); + }; + + const process = (key: string, value: any) => { + if (isDefined(value)) { + if (Array.isArray(value)) { + value.forEach(v => { + process(key, v); + }); + } else if (typeof value === 'object') { + Object.entries(value).forEach(([k, v]) => { + process(`${key}[${k}]`, v); + }); + } else { + append(key, value); + } + } + }; + + Object.entries(params).forEach(([key, value]) => { + process(key, value); + }); + + if (qs.length > 0) { + return `?${qs.join('&')}`; + } + + return ''; +}; + +const getUrl = (config: OpenAPIConfig, options: ApiRequestOptions): string => { + const encoder = config.ENCODE_PATH || encodeURI; + + const path = options.url + .replace('{api-version}', config.VERSION) + .replace(/{(.*?)}/g, (substring: string, group: string) => { + if (options.path?.hasOwnProperty(group)) { + return encoder(String(options.path[group])); + } + return substring; + }); + + const url = `${config.BASE}${path}`; + if (options.query) { + return `${url}${getQueryString(options.query)}`; + } + return url; +}; + +export const getFormData = (options: ApiRequestOptions): FormData | undefined => { + if (options.formData) { + const formData = new FormData(); + + const process = (key: string, value: any) => { + if (isString(value) || isBlob(value)) { + formData.append(key, value); + } else { + formData.append(key, JSON.stringify(value)); + } + }; + + Object.entries(options.formData) + .filter(([_, value]) => isDefined(value)) + .forEach(([key, value]) => { + if (Array.isArray(value)) { + value.forEach(v => process(key, v)); + } else { + process(key, value); + } + }); + + return formData; + } + return undefined; +}; + +type Resolver = (options: ApiRequestOptions) => Promise; + +export const resolve = async (options: ApiRequestOptions, resolver?: T | Resolver): Promise => { + if (typeof resolver === 'function') { + return (resolver as Resolver)(options); + } + return resolver; +}; + +export const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions, formData?: FormData): Promise> => { + const [token, username, password, additionalHeaders] = await Promise.all([ + resolve(options, config.TOKEN), + resolve(options, config.USERNAME), + resolve(options, config.PASSWORD), + resolve(options, config.HEADERS), + ]); + + const formHeaders = typeof formData?.getHeaders === 'function' && formData?.getHeaders() || {} + + const headers = Object.entries({ + Accept: 'application/json', + ...additionalHeaders, + ...options.headers, + ...formHeaders, + }) + .filter(([_, value]) => isDefined(value)) + .reduce((headers, [key, value]) => ({ + ...headers, + [key]: String(value), + }), {} as Record); + + if (isStringWithValue(token)) { + headers['Authorization'] = `Bearer ${token}`; + } + + if (isStringWithValue(username) && isStringWithValue(password)) { + const credentials = base64(`${username}:${password}`); + headers['Authorization'] = `Basic ${credentials}`; + } + + if (options.body !== undefined) { + if (options.mediaType) { + headers['Content-Type'] = options.mediaType; + } else if (isBlob(options.body)) { + headers['Content-Type'] = options.body.type || 'application/octet-stream'; + } else if (isString(options.body)) { + headers['Content-Type'] = 'text/plain'; + } else if (!isFormData(options.body)) { + headers['Content-Type'] = 'application/json'; + } + } + + return headers; +}; + +export const getRequestBody = (options: ApiRequestOptions): any => { + if (options.body) { + return options.body; + } + return undefined; +}; + +export const sendRequest = async ( + config: OpenAPIConfig, + options: ApiRequestOptions, + url: string, + body: any, + formData: FormData | undefined, + headers: Record, + onCancel: OnCancel, + axiosClient: AxiosInstance +): Promise> => { + const source = axios.CancelToken.source(); + + const requestConfig: AxiosRequestConfig = { + url, + headers, + data: body ?? formData, + method: options.method, + withCredentials: config.WITH_CREDENTIALS, + withXSRFToken: config.CREDENTIALS === 'include' ? config.WITH_CREDENTIALS : false, + cancelToken: source.token, + }; + + onCancel(() => source.cancel('The user aborted a request.')); + + try { + return await axiosClient.request(requestConfig); + } catch (error) { + const axiosError = error as AxiosError; + if (axiosError.response) { + return axiosError.response; + } + throw error; + } +}; + +export const getResponseHeader = (response: AxiosResponse, responseHeader?: string): string | undefined => { + if (responseHeader) { + const content = response.headers[responseHeader]; + if (isString(content)) { + return content; + } + } + return undefined; +}; + +export const getResponseBody = (response: AxiosResponse): any => { + if (response.status !== 204) { + return response.data; + } + return undefined; +}; + +export const catchErrorCodes = (options: ApiRequestOptions, result: ApiResult): void => { + const errors: Record = { + 400: 'Bad Request', + 401: 'Unauthorized', + 403: 'Forbidden', + 404: 'Not Found', + 500: 'Internal Server Error', + 502: 'Bad Gateway', + 503: 'Service Unavailable', + ...options.errors, + } + + const error = errors[result.status]; + if (error) { + throw new ApiError(options, result, error); + } + + if (!result.ok) { + const errorStatus = result.status ?? 'unknown'; + const errorStatusText = result.statusText ?? 'unknown'; + const errorBody = (() => { + try { + return JSON.stringify(result.body, null, 2); + } catch (e) { + return undefined; + } + })(); + + throw new ApiError(options, result, + `Generic Error: status: ${errorStatus}; status text: ${errorStatusText}; body: ${errorBody}` + ); + } +}; + +/** + * Request method + * @param config The OpenAPI configuration object + * @param options The request options from the service + * @param axiosClient The axios client instance to use + * @returns CancelablePromise + * @throws ApiError + */ +export const request = (config: OpenAPIConfig, options: ApiRequestOptions, axiosClient: AxiosInstance = axios): CancelablePromise => { + return new CancelablePromise(async (resolve, reject, onCancel) => { + try { + const url = getUrl(config, options); + const formData = getFormData(options); + const body = getRequestBody(options); + const headers = await getHeaders(config, options, formData); + + if (!onCancel.isCancelled) { + const response = await sendRequest(config, options, url, body, formData, headers, onCancel, axiosClient); + const responseBody = getResponseBody(response); + const responseHeader = getResponseHeader(response, options.responseHeader); + + const result: ApiResult = { + url, + ok: isSuccess(response.status), + status: response.status, + statusText: response.statusText, + body: responseHeader ?? responseBody, + }; + + catchErrorCodes(options, result); + + resolve(result.body); + } + } catch (error) { + reject(error); + } + }); +}; diff --git a/modules/frontend/src/api/index.ts b/modules/frontend/src/api/index.ts new file mode 100644 index 0000000..e4f4ef4 --- /dev/null +++ b/modules/frontend/src/api/index.ts @@ -0,0 +1,16 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +export { ApiError } from './core/ApiError'; +export { CancelablePromise, CancelError } from './core/CancelablePromise'; +export { OpenAPI } from './core/OpenAPI'; +export type { OpenAPIConfig } from './core/OpenAPI'; + +export type { Review } from './models/Review'; +export type { Tag } from './models/Tag'; +export type { Title } from './models/Title'; +export type { User } from './models/User'; +export type { UserTitle } from './models/UserTitle'; + +export { DefaultService } from './services/DefaultService'; diff --git a/modules/frontend/src/api/models/Review.ts b/modules/frontend/src/api/models/Review.ts new file mode 100644 index 0000000..9b453b7 --- /dev/null +++ b/modules/frontend/src/api/models/Review.ts @@ -0,0 +1,5 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +export type Review = Record; diff --git a/modules/frontend/src/api/models/Tag.ts b/modules/frontend/src/api/models/Tag.ts new file mode 100644 index 0000000..9560ea8 --- /dev/null +++ b/modules/frontend/src/api/models/Tag.ts @@ -0,0 +1,5 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +export type Tag = Record; diff --git a/modules/frontend/src/api/models/Title.ts b/modules/frontend/src/api/models/Title.ts new file mode 100644 index 0000000..4da7aa3 --- /dev/null +++ b/modules/frontend/src/api/models/Title.ts @@ -0,0 +1,5 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +export type Title = Record; diff --git a/modules/frontend/src/api/models/User.ts b/modules/frontend/src/api/models/User.ts new file mode 100644 index 0000000..6c47b04 --- /dev/null +++ b/modules/frontend/src/api/models/User.ts @@ -0,0 +1,5 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +export type User = Record; diff --git a/modules/frontend/src/api/models/UserTitle.ts b/modules/frontend/src/api/models/UserTitle.ts new file mode 100644 index 0000000..26d5ddc --- /dev/null +++ b/modules/frontend/src/api/models/UserTitle.ts @@ -0,0 +1,5 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +export type UserTitle = Record; diff --git a/modules/frontend/src/api/services/DefaultService.ts b/modules/frontend/src/api/services/DefaultService.ts new file mode 100644 index 0000000..f000c3f --- /dev/null +++ b/modules/frontend/src/api/services/DefaultService.ts @@ -0,0 +1,478 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +import type { Review } from '../models/Review'; +import type { Tag } from '../models/Tag'; +import type { Title } from '../models/Title'; +import type { User } from '../models/User'; +import type { UserTitle } from '../models/UserTitle'; +import type { CancelablePromise } from '../core/CancelablePromise'; +import { OpenAPI } from '../core/OpenAPI'; +import { request as __request } from '../core/request'; +export class DefaultService { + /** + * Get titles + * @param query + * @param limit + * @param offset + * @param fields + * @returns Title List of titles + * @throws ApiError + */ + public static getTitle( + query?: string, + limit: number = 10, + offset?: number, + fields: string = 'all', + ): CancelablePromise> { + return __request(OpenAPI, { + method: 'GET', + url: '/title', + query: { + 'query': query, + 'limit': limit, + 'offset': offset, + 'fields': fields, + }, + }); + } + /** + * Get title description + * @param titleId + * @param fields + * @returns Title Title description + * @throws ApiError + */ + public static getTitle1( + titleId: string, + fields: string = 'all', + ): CancelablePromise { + return __request(OpenAPI, { + method: 'GET', + url: '/title/{title_id}', + path: { + 'title_id': titleId, + }, + query: { + 'fields': fields, + }, + errors: { + 404: `Title not found`, + }, + }); + } + /** + * Update title info + * @param titleId + * @param requestBody + * @returns any Update result + * @throws ApiError + */ + public static patchTitle( + titleId: string, + requestBody: Title, + ): CancelablePromise<{ + success?: boolean; + error?: string; + user_json?: User; + }> { + return __request(OpenAPI, { + method: 'PATCH', + url: '/title/{title_id}', + path: { + 'title_id': titleId, + }, + body: requestBody, + mediaType: 'application/json', + }); + } + /** + * Get title reviews + * @param titleId + * @param limit + * @param offset + * @returns Review List of reviews + * @throws ApiError + */ + public static getTitleReviews( + titleId: string, + limit: number = 10, + offset?: number, + ): CancelablePromise<Array<Review>> { + return __request(OpenAPI, { + method: 'GET', + url: '/title/{title_id}/reviews', + path: { + 'title_id': titleId, + }, + query: { + 'limit': limit, + 'offset': offset, + }, + }); + } + /** + * Get user info + * @param userId + * @param fields + * @returns User User info + * @throws ApiError + */ + public static getUsers( + userId: string, + fields: string = 'all', + ): CancelablePromise<User> { + return __request(OpenAPI, { + method: 'GET', + url: '/users/{user_id}', + path: { + 'user_id': userId, + }, + query: { + 'fields': fields, + }, + errors: { + 404: `User not found`, + }, + }); + } + /** + * Update user + * @param userId + * @param requestBody + * @returns any Update result + * @throws ApiError + */ + public static patchUsers( + userId: string, + requestBody: User, + ): CancelablePromise<{ + success?: boolean; + error?: string; + }> { + return __request(OpenAPI, { + method: 'PATCH', + url: '/users/{user_id}', + path: { + 'user_id': userId, + }, + body: requestBody, + mediaType: 'application/json', + }); + } + /** + * Delete user + * @param userId + * @returns any Delete result + * @throws ApiError + */ + public static deleteUsers( + userId: string, + ): CancelablePromise<{ + success?: boolean; + error?: string; + }> { + return __request(OpenAPI, { + method: 'DELETE', + url: '/users/{user_id}', + path: { + 'user_id': userId, + }, + }); + } + /** + * Search user + * @param query + * @param fields + * @returns User List of users + * @throws ApiError + */ + public static getUsers1( + query?: string, + fields?: string, + ): CancelablePromise<Array<User>> { + return __request(OpenAPI, { + method: 'GET', + url: '/users', + query: { + 'query': query, + 'fields': fields, + }, + }); + } + /** + * Add new user + * @param requestBody + * @returns any Add result + * @throws ApiError + */ + public static postUsers( + requestBody: User, + ): CancelablePromise<{ + success?: boolean; + error?: string; + user_json?: User; + }> { + return __request(OpenAPI, { + method: 'POST', + url: '/users', + body: requestBody, + mediaType: 'application/json', + }); + } + /** + * Get user titles + * @param userId + * @param query + * @param limit + * @param offset + * @param fields + * @returns UserTitle List of user titles + * @throws ApiError + */ + public static getUsersTitles( + userId: string, + query?: string, + limit: number = 10, + offset?: number, + fields: string = 'all', + ): CancelablePromise<Array<UserTitle>> { + return __request(OpenAPI, { + method: 'GET', + url: '/users/{user_id}/titles', + path: { + 'user_id': userId, + }, + query: { + 'query': query, + 'limit': limit, + 'offset': offset, + 'fields': fields, + }, + }); + } + /** + * Add user title + * @param userId + * @param requestBody + * @returns any Add result + * @throws ApiError + */ + public static postUsersTitles( + userId: string, + requestBody: { + title_id?: string; + status?: string; + }, + ): CancelablePromise<{ + success?: boolean; + error?: string; + }> { + return __request(OpenAPI, { + method: 'POST', + url: '/users/{user_id}/titles', + path: { + 'user_id': userId, + }, + body: requestBody, + mediaType: 'application/json', + }); + } + /** + * Update user title + * @param userId + * @param requestBody + * @returns any Update result + * @throws ApiError + */ + public static patchUsersTitles( + userId: string, + requestBody: UserTitle, + ): CancelablePromise<{ + success?: boolean; + error?: string; + }> { + return __request(OpenAPI, { + method: 'PATCH', + url: '/users/{user_id}/titles', + path: { + 'user_id': userId, + }, + body: requestBody, + mediaType: 'application/json', + }); + } + /** + * Delete user title + * @param userId + * @param titleId + * @returns any Delete result + * @throws ApiError + */ + public static deleteUsersTitles( + userId: string, + titleId?: string, + ): CancelablePromise<{ + success?: boolean; + error?: string; + }> { + return __request(OpenAPI, { + method: 'DELETE', + url: '/users/{user_id}/titles', + path: { + 'user_id': userId, + }, + query: { + 'title_id': titleId, + }, + }); + } + /** + * Get user reviews + * @param userId + * @param limit + * @param offset + * @returns Review List of reviews + * @throws ApiError + */ + public static getUsersReviews( + userId: string, + limit: number = 10, + offset?: number, + ): CancelablePromise<Array<Review>> { + return __request(OpenAPI, { + method: 'GET', + url: '/users/{user_id}/reviews', + path: { + 'user_id': userId, + }, + query: { + 'limit': limit, + 'offset': offset, + }, + }); + } + /** + * Add review + * @param requestBody + * @returns any Add result + * @throws ApiError + */ + public static postReviews( + requestBody: Review, + ): CancelablePromise<{ + success?: boolean; + error?: string; + }> { + return __request(OpenAPI, { + method: 'POST', + url: '/reviews', + body: requestBody, + mediaType: 'application/json', + }); + } + /** + * Update review + * @param reviewId + * @param requestBody + * @returns any Update result + * @throws ApiError + */ + public static patchReviews( + reviewId: string, + requestBody: Review, + ): CancelablePromise<{ + success?: boolean; + error?: string; + }> { + return __request(OpenAPI, { + method: 'PATCH', + url: '/reviews/{review_id}', + path: { + 'review_id': reviewId, + }, + body: requestBody, + mediaType: 'application/json', + }); + } + /** + * Delete review + * @param reviewId + * @returns any Delete result + * @throws ApiError + */ + public static deleteReviews( + reviewId: string, + ): CancelablePromise<{ + success?: boolean; + error?: string; + }> { + return __request(OpenAPI, { + method: 'DELETE', + url: '/reviews/{review_id}', + path: { + 'review_id': reviewId, + }, + }); + } + /** + * Get tags + * @param limit + * @param offset + * @param fields + * @returns Tag List of tags + * @throws ApiError + */ + public static getTags( + limit: number = 10, + offset?: number, + fields?: string, + ): CancelablePromise<Array<Tag>> { + return __request(OpenAPI, { + method: 'GET', + url: '/tags', + query: { + 'limit': limit, + 'offset': offset, + 'fields': fields, + }, + }); + } + /** + * Upload image + * @returns any Upload result + * @throws ApiError + */ + public static postMedia(): CancelablePromise<{ + success?: boolean; + error?: string; + image_id?: string; + }> { + return __request(OpenAPI, { + method: 'POST', + url: '/media', + }); + } + /** + * Get image path + * @param imageId + * @returns any Image path + * @throws ApiError + */ + public static getMedia( + imageId: string, + ): CancelablePromise<{ + success?: boolean; + error?: string; + image_path?: string; + }> { + return __request(OpenAPI, { + method: 'GET', + url: '/media', + query: { + 'image_id': imageId, + }, + }); + } +} From f2188f636302c932fd5b6c74222dc2057e0f558e Mon Sep 17 00:00:00 2001 From: nihonium <nihonium@nekoea.red> Date: Sat, 11 Oct 2025 04:33:56 +0300 Subject: [PATCH 31/80] fix: temp fix for API endpoint --- modules/frontend/src/api/core/OpenAPI.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/frontend/src/api/core/OpenAPI.ts b/modules/frontend/src/api/core/OpenAPI.ts index 4fb2299..99c577d 100644 --- a/modules/frontend/src/api/core/OpenAPI.ts +++ b/modules/frontend/src/api/core/OpenAPI.ts @@ -20,7 +20,7 @@ export type OpenAPIConfig = { }; export const OpenAPI: OpenAPIConfig = { - BASE: 'https://api.example.com', + BASE: 'http://10.1.0.65:8080', VERSION: '1.0.0', WITH_CREDENTIALS: false, CREDENTIALS: 'include', From a0df0dff00e732b0a7453eb99a9b15c5a9b9f2d1 Mon Sep 17 00:00:00 2001 From: nihonium <nihonium@nekoea.red> Date: Sat, 11 Oct 2025 04:51:50 +0300 Subject: [PATCH 32/80] feat: add User scahema to api --- api/openapi.yaml | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/api/openapi.yaml b/api/openapi.yaml index 5a35e20..ca6099f 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -540,7 +540,47 @@ components: additionalProperties: true User: type: object - additionalProperties: true + properties: + user_id: + type: integer + format: int32 + description: Unique user ID (primary key) + example: 1 + avatar_id: + type: integer + format: int32 + description: ID of the user avatar (references images table) + nullable: true + example: null + mail: + type: string + format: email + description: User email + example: "john.doe@example.com" + nickname: + type: string + description: Username (alphanumeric + _ or -) + maxLength: 16 + example: "john_doe_42" + disp_name: + type: string + description: Display name + maxLength: 32 + example: "John Doe" + user_desc: + type: string + description: User description + maxLength: 512 + example: "Just a regular user." + creation_date: + type: string + format: date-time + description: Timestamp when the user was created + example: "2025-10-10T23:45:47.908073Z" + required: + - user_id + - nickname + - creation_date UserTitle: type: object additionalProperties: true From 0b5ea285de47a51416c7b7ba9884b5910fd191d1 Mon Sep 17 00:00:00 2001 From: nihonium <nihonium@nekoea.red> Date: Sat, 11 Oct 2025 04:52:21 +0300 Subject: [PATCH 33/80] fix: regenerated api --- modules/frontend/src/api/models/User.ts | 32 ++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/modules/frontend/src/api/models/User.ts b/modules/frontend/src/api/models/User.ts index 6c47b04..c296445 100644 --- a/modules/frontend/src/api/models/User.ts +++ b/modules/frontend/src/api/models/User.ts @@ -2,4 +2,34 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ -export type User = Record<string, any>; +export type User = { + /** + * Unique user ID (primary key) + */ + user_id: number; + /** + * ID of the user avatar (references images table) + */ + avatar_id?: number | null; + /** + * User email + */ + mail?: string; + /** + * Username (alphanumeric + _ or -) + */ + nickname: string; + /** + * Display name + */ + disp_name?: string; + /** + * User description + */ + user_desc?: string; + /** + * Timestamp when the user was created + */ + creation_date: string; +}; + From 827431bb2fa2d7326203f78d8ee1b32190edfbf0 Mon Sep 17 00:00:00 2001 From: nihonium <nihonium@nekoea.red> Date: Sat, 11 Oct 2025 04:54:39 +0300 Subject: [PATCH 34/80] fix: App.tsx user field names --- modules/frontend/src/App.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/frontend/src/App.tsx b/modules/frontend/src/App.tsx index f16bb18..2b0ffa7 100644 --- a/modules/frontend/src/App.tsx +++ b/modules/frontend/src/App.tsx @@ -29,9 +29,9 @@ const App: React.FC = () => { return ( <div style={{ padding: "2rem" }}> <h1>User Info</h1> - <p><strong>ID:</strong> {user.id}</p> - <p><strong>Name:</strong> {user.name}</p> - <p><strong>Email:</strong> {user.email}</p> + <p><strong>ID:</strong> {user.user_id}</p> + <p><strong>Name:</strong> {user.nickname}</p> + <p><strong>Email:</strong> {user.mail}</p> </div> ); }; From fd0ca4411bee588f74473427240537acaf70b875 Mon Sep 17 00:00:00 2001 From: nihonium <nihonium@nekoea.red> Date: Sat, 11 Oct 2025 05:24:11 +0300 Subject: [PATCH 35/80] feat: created UserPage.tsx --- modules/frontend/src/App.tsx | 37 +------ .../components/UserPage/UserPage.module.css | 97 +++++++++++++++++++ .../src/components/UserPage/UserPage.tsx | 60 ++++++++++++ 3 files changed, 160 insertions(+), 34 deletions(-) create mode 100644 modules/frontend/src/components/UserPage/UserPage.module.css create mode 100644 modules/frontend/src/components/UserPage/UserPage.tsx diff --git a/modules/frontend/src/App.tsx b/modules/frontend/src/App.tsx index 2b0ffa7..6b2ee5f 100644 --- a/modules/frontend/src/App.tsx +++ b/modules/frontend/src/App.tsx @@ -1,39 +1,8 @@ -import React, { useEffect, useState } from "react"; -import { DefaultService } from "./api/services/DefaultService"; // adjust path if needed -import type { User } from "./api/models/User"; // adjust path if needed +import React from "react"; +import UserPage from "./components/UserPage/UserPage"; const App: React.FC = () => { - const [user, setUser] = useState<User | null>(null); - const [loading, setLoading] = useState(true); - const [error, setError] = useState<string | null>(null); - - useEffect(() => { - const getUserInfo = async () => { - try { - const userInfo = await DefaultService.getUsers("1", "all"); - setUser(userInfo); - } catch (err) { - console.error(err); - setError("Failed to fetch user info."); - } finally { - setLoading(false); - } - }; - getUserInfo(); - }, []); - - if (loading) return <div>Loading...</div>; - if (error) return <div>{error}</div>; - if (!user) return <div>No user found.</div>; - - return ( - <div style={{ padding: "2rem" }}> - <h1>User Info</h1> - <p><strong>ID:</strong> {user.user_id}</p> - <p><strong>Name:</strong> {user.nickname}</p> - <p><strong>Email:</strong> {user.mail}</p> - </div> - ); + return <UserPage />; }; export default App; diff --git a/modules/frontend/src/components/UserPage/UserPage.module.css b/modules/frontend/src/components/UserPage/UserPage.module.css new file mode 100644 index 0000000..75195bf --- /dev/null +++ b/modules/frontend/src/components/UserPage/UserPage.module.css @@ -0,0 +1,97 @@ +.container { + display: flex; + justify-content: center; + align-items: flex-start; + padding: 3rem 1rem; + background-color: #f5f6fa; + min-height: 100vh; + font-family: "Inter", sans-serif; +} + +.card { + background-color: #ffffff; + border-radius: 1rem; + box-shadow: 0 8px 20px rgba(0, 0, 0, 0.1); + padding: 2rem; + max-width: 400px; + width: 100%; + display: flex; + flex-direction: column; + align-items: center; + text-align: center; +} + +.avatar { + margin-bottom: 1.5rem; +} + +.avatarImg { + width: 120px; + height: 120px; + border-radius: 50%; + object-fit: cover; + border: 3px solid #4a90e2; +} + +.avatarPlaceholder { + width: 120px; + height: 120px; + border-radius: 50%; + background-color: #dcdde1; + display: flex; + align-items: center; + justify-content: center; + font-size: 3rem; + color: #4a4a4a; + font-weight: bold; + border: 3px solid #4a90e2; +} + +.info { + display: flex; + flex-direction: column; + align-items: center; +} + +.name { + font-size: 1.8rem; + font-weight: 700; + margin: 0.25rem 0; + color: #2f3640; +} + +.nickname { + font-size: 1rem; + color: #718093; + margin-bottom: 1rem; +} + +.desc { + font-size: 1rem; + color: #353b48; + margin-bottom: 1rem; +} + +.created { + font-size: 0.9rem; + color: #7f8fa6; +} + +.loader { + display: flex; + justify-content: center; + align-items: center; + height: 80vh; + font-size: 1.5rem; + color: #4a90e2; +} + +.error { + display: flex; + justify-content: center; + align-items: center; + height: 80vh; + color: #e84118; + font-weight: 600; + font-size: 1.2rem; +} diff --git a/modules/frontend/src/components/UserPage/UserPage.tsx b/modules/frontend/src/components/UserPage/UserPage.tsx new file mode 100644 index 0000000..b0db90c --- /dev/null +++ b/modules/frontend/src/components/UserPage/UserPage.tsx @@ -0,0 +1,60 @@ +import React, { useEffect, useState } from "react"; +import { DefaultService } from "../../api/services/DefaultService"; // adjust path +import type { User } from "../../api/models/User"; +import styles from "./UserPage.module.css"; + +const UserPage: React.FC = () => { + const [user, setUser] = useState<User | null>(null); + const [loading, setLoading] = useState(true); + const [error, setError] = useState<string | null>(null); + + useEffect(() => { + const getUserInfo = async () => { + try { + const userInfo = await DefaultService.getUsers("1", "all"); + setUser(userInfo); + } catch (err) { + console.error(err); + setError("Failed to fetch user info."); + } finally { + setLoading(false); + } + }; + getUserInfo(); + }, []); + + if (loading) return <div className={styles.loader}>Loading...</div>; + if (error) return <div className={styles.error}>{error}</div>; + if (!user) return <div className={styles.error}>User not found.</div>; + + return ( + <div className={styles.container}> + <div className={styles.card}> + <div className={styles.avatar}> + {user.avatar_id ? ( + <img + src={`/images/${user.avatar_id}.png`} + alt="User Avatar" + className={styles.avatarImg} + /> + ) : ( + <div className={styles.avatarPlaceholder}> + {user.disp_name?.[0] || "U"} + </div> + )} + </div> + + <div className={styles.info}> + <h1 className={styles.name}>{user.disp_name || user.nickname}</h1> + <p className={styles.nickname}>@{user.nickname}</p> + {user.user_desc && <p className={styles.desc}>{user.user_desc}</p>} + <p className={styles.created}> + Joined: {new Date(user.creation_date).toLocaleDateString()} + </p> + </div> + </div> + </div> + ); +}; + +export default UserPage; From db53ae04e39bff6e625963be87809d798263e827 Mon Sep 17 00:00:00 2001 From: nihonium <nihonium@nekoea.red> Date: Sat, 25 Oct 2025 21:05:16 +0300 Subject: [PATCH 36/80] refact!: project structure --- api/api.gen.go | 193 ++ api/gen.go | 1958 ----------------- api/oapi-codegen.yaml | 4 +- api/openapi.yaml | 950 ++++---- deploy/generate.sh | 3 + modules/backend/go.mod => go.mod | 18 +- modules/backend/go.sum => go.sum | 20 +- modules/backend/api/gen.go | 1958 ----------------- modules/backend/db/query.sql.go | 712 ------ modules/backend/{api/impl.go => handlers.go} | 7 +- modules/backend/main.go | 13 +- modules/backend/queries.sql | 142 ++ modules/backend/templates/index.html | 10 - modules/sql/go.mod | 3 - modules/sql/query.sql | 142 -- modules/sql/sqlc-generate.yaml | 13 - modules/sql/sqlc.yaml | 14 - modules/sql/sqlc/db.go | 32 - modules/sql/sqlc/models.go | 266 --- modules/sql/sqlc/query.sql.go | 712 ------ {modules/backend/db => sql}/db.go | 2 +- sql/migrations/000001_init.down.sql | 15 + .../migrations/000001_init.up.sql | 20 +- {modules/backend/db => sql}/models.go | 122 +- sql/queries.sql.go | 23 + sql/sqlc.yaml | 14 + 26 files changed, 971 insertions(+), 6395 deletions(-) create mode 100644 api/api.gen.go delete mode 100644 api/gen.go create mode 100644 deploy/generate.sh rename modules/backend/go.mod => go.mod (82%) rename modules/backend/go.sum => go.sum (90%) delete mode 100644 modules/backend/api/gen.go delete mode 100644 modules/backend/db/query.sql.go rename modules/backend/{api/impl.go => handlers.go} (99%) create mode 100644 modules/backend/queries.sql delete mode 100644 modules/backend/templates/index.html delete mode 100644 modules/sql/go.mod delete mode 100644 modules/sql/query.sql delete mode 100644 modules/sql/sqlc-generate.yaml delete mode 100644 modules/sql/sqlc.yaml delete mode 100644 modules/sql/sqlc/db.go delete mode 100644 modules/sql/sqlc/models.go delete mode 100644 modules/sql/sqlc/query.sql.go rename {modules/backend/db => sql}/db.go (97%) create mode 100644 sql/migrations/000001_init.down.sql rename modules/sql/scheme.sql => sql/migrations/000001_init.up.sql (91%) rename {modules/backend/db => sql}/models.go (56%) create mode 100644 sql/queries.sql.go create mode 100644 sql/sqlc.yaml diff --git a/api/api.gen.go b/api/api.gen.go new file mode 100644 index 0000000..58b5b53 --- /dev/null +++ b/api/api.gen.go @@ -0,0 +1,193 @@ +// Package oapi provides primitives to interact with the openapi HTTP API. +// +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.5.0 DO NOT EDIT. +package oapi + +import ( + "context" + "encoding/json" + "fmt" + "net/http" + + "github.com/gin-gonic/gin" + "github.com/oapi-codegen/runtime" + strictgin "github.com/oapi-codegen/runtime/strictmiddleware/gin" +) + +// Title defines model for Title. +type Title map[string]interface{} + +// GetTitleParams defines parameters for GetTitle. +type GetTitleParams struct { + Query *string `form:"query,omitempty" json:"query,omitempty"` + Limit *int `form:"limit,omitempty" json:"limit,omitempty"` + Offset *int `form:"offset,omitempty" json:"offset,omitempty"` + Fields *string `form:"fields,omitempty" json:"fields,omitempty"` +} + +// ServerInterface represents all server handlers. +type ServerInterface interface { + // Get titles + // (GET /title) + GetTitle(c *gin.Context, params GetTitleParams) +} + +// ServerInterfaceWrapper converts contexts to parameters. +type ServerInterfaceWrapper struct { + Handler ServerInterface + HandlerMiddlewares []MiddlewareFunc + ErrorHandler func(*gin.Context, error, int) +} + +type MiddlewareFunc func(c *gin.Context) + +// GetTitle operation middleware +func (siw *ServerInterfaceWrapper) GetTitle(c *gin.Context) { + + var err error + + // Parameter object where we will unmarshal all parameters from the context + var params GetTitleParams + + // ------------- Optional query parameter "query" ------------- + + err = runtime.BindQueryParameter("form", true, false, "query", c.Request.URL.Query(), ¶ms.Query) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter query: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "limit" ------------- + + err = runtime.BindQueryParameter("form", true, false, "limit", c.Request.URL.Query(), ¶ms.Limit) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter limit: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "offset" ------------- + + err = runtime.BindQueryParameter("form", true, false, "offset", c.Request.URL.Query(), ¶ms.Offset) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter offset: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "fields" ------------- + + err = runtime.BindQueryParameter("form", true, false, "fields", c.Request.URL.Query(), ¶ms.Fields) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter fields: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.GetTitle(c, params) +} + +// GinServerOptions provides options for the Gin server. +type GinServerOptions struct { + BaseURL string + Middlewares []MiddlewareFunc + ErrorHandler func(*gin.Context, error, int) +} + +// RegisterHandlers creates http.Handler with routing matching OpenAPI spec. +func RegisterHandlers(router gin.IRouter, si ServerInterface) { + RegisterHandlersWithOptions(router, si, GinServerOptions{}) +} + +// RegisterHandlersWithOptions creates http.Handler with additional options +func RegisterHandlersWithOptions(router gin.IRouter, si ServerInterface, options GinServerOptions) { + errorHandler := options.ErrorHandler + if errorHandler == nil { + errorHandler = func(c *gin.Context, err error, statusCode int) { + c.JSON(statusCode, gin.H{"msg": err.Error()}) + } + } + + wrapper := ServerInterfaceWrapper{ + Handler: si, + HandlerMiddlewares: options.Middlewares, + ErrorHandler: errorHandler, + } + + router.GET(options.BaseURL+"/title", wrapper.GetTitle) +} + +type GetTitleRequestObject struct { + Params GetTitleParams +} + +type GetTitleResponseObject interface { + VisitGetTitleResponse(w http.ResponseWriter) error +} + +type GetTitle200JSONResponse []Title + +func (response GetTitle200JSONResponse) VisitGetTitleResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type GetTitle204Response struct { +} + +func (response GetTitle204Response) VisitGetTitleResponse(w http.ResponseWriter) error { + w.WriteHeader(204) + return nil +} + +// StrictServerInterface represents all server handlers. +type StrictServerInterface interface { + // Get titles + // (GET /title) + GetTitle(ctx context.Context, request GetTitleRequestObject) (GetTitleResponseObject, error) +} + +type StrictHandlerFunc = strictgin.StrictGinHandlerFunc +type StrictMiddlewareFunc = strictgin.StrictGinMiddlewareFunc + +func NewStrictHandler(ssi StrictServerInterface, middlewares []StrictMiddlewareFunc) ServerInterface { + return &strictHandler{ssi: ssi, middlewares: middlewares} +} + +type strictHandler struct { + ssi StrictServerInterface + middlewares []StrictMiddlewareFunc +} + +// GetTitle operation middleware +func (sh *strictHandler) GetTitle(ctx *gin.Context, params GetTitleParams) { + var request GetTitleRequestObject + + request.Params = params + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.GetTitle(ctx, request.(GetTitleRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "GetTitle") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(GetTitleResponseObject); ok { + if err := validResponse.VisitGetTitleResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} diff --git a/api/gen.go b/api/gen.go deleted file mode 100644 index 2dcb886..0000000 --- a/api/gen.go +++ /dev/null @@ -1,1958 +0,0 @@ -// Package api provides primitives to interact with the openapi HTTP API. -// -// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.5.0 DO NOT EDIT. -package api - -import ( - "context" - "encoding/json" - "fmt" - "net/http" - - "github.com/gin-gonic/gin" - "github.com/oapi-codegen/runtime" - strictgin "github.com/oapi-codegen/runtime/strictmiddleware/gin" -) - -// Review defines model for Review. -type Review map[string]interface{} - -// Tag defines model for Tag. -type Tag map[string]interface{} - -// Title defines model for Title. -type Title map[string]interface{} - -// User defines model for User. -type User map[string]interface{} - -// UserTitle defines model for UserTitle. -type UserTitle map[string]interface{} - -// GetMediaParams defines parameters for GetMedia. -type GetMediaParams struct { - ImageId string `form:"image_id" json:"image_id"` -} - -// GetTagsParams defines parameters for GetTags. -type GetTagsParams struct { - Limit *int `form:"limit,omitempty" json:"limit,omitempty"` - Offset *int `form:"offset,omitempty" json:"offset,omitempty"` - Fields *string `form:"fields,omitempty" json:"fields,omitempty"` -} - -// GetTitleParams defines parameters for GetTitle. -type GetTitleParams struct { - Query *string `form:"query,omitempty" json:"query,omitempty"` - Limit *int `form:"limit,omitempty" json:"limit,omitempty"` - Offset *int `form:"offset,omitempty" json:"offset,omitempty"` - Fields *string `form:"fields,omitempty" json:"fields,omitempty"` -} - -// GetTitleTitleIdParams defines parameters for GetTitleTitleId. -type GetTitleTitleIdParams struct { - Fields *string `form:"fields,omitempty" json:"fields,omitempty"` -} - -// GetTitleTitleIdReviewsParams defines parameters for GetTitleTitleIdReviews. -type GetTitleTitleIdReviewsParams struct { - Limit *int `form:"limit,omitempty" json:"limit,omitempty"` - Offset *int `form:"offset,omitempty" json:"offset,omitempty"` -} - -// GetUsersParams defines parameters for GetUsers. -type GetUsersParams struct { - Query *string `form:"query,omitempty" json:"query,omitempty"` - Fields *string `form:"fields,omitempty" json:"fields,omitempty"` -} - -// GetUsersUserIdParams defines parameters for GetUsersUserId. -type GetUsersUserIdParams struct { - Fields *string `form:"fields,omitempty" json:"fields,omitempty"` -} - -// GetUsersUserIdReviewsParams defines parameters for GetUsersUserIdReviews. -type GetUsersUserIdReviewsParams struct { - Limit *int `form:"limit,omitempty" json:"limit,omitempty"` - Offset *int `form:"offset,omitempty" json:"offset,omitempty"` -} - -// DeleteUsersUserIdTitlesParams defines parameters for DeleteUsersUserIdTitles. -type DeleteUsersUserIdTitlesParams struct { - TitleId *string `form:"title_id,omitempty" json:"title_id,omitempty"` -} - -// GetUsersUserIdTitlesParams defines parameters for GetUsersUserIdTitles. -type GetUsersUserIdTitlesParams struct { - Query *string `form:"query,omitempty" json:"query,omitempty"` - Limit *int `form:"limit,omitempty" json:"limit,omitempty"` - Offset *int `form:"offset,omitempty" json:"offset,omitempty"` - Fields *string `form:"fields,omitempty" json:"fields,omitempty"` -} - -// PostUsersUserIdTitlesJSONBody defines parameters for PostUsersUserIdTitles. -type PostUsersUserIdTitlesJSONBody struct { - Status *string `json:"status,omitempty"` - TitleId *string `json:"title_id,omitempty"` -} - -// PostReviewsJSONRequestBody defines body for PostReviews for application/json ContentType. -type PostReviewsJSONRequestBody = Review - -// PatchReviewsReviewIdJSONRequestBody defines body for PatchReviewsReviewId for application/json ContentType. -type PatchReviewsReviewIdJSONRequestBody = Review - -// PatchTitleTitleIdJSONRequestBody defines body for PatchTitleTitleId for application/json ContentType. -type PatchTitleTitleIdJSONRequestBody = Title - -// PostUsersJSONRequestBody defines body for PostUsers for application/json ContentType. -type PostUsersJSONRequestBody = User - -// PatchUsersUserIdJSONRequestBody defines body for PatchUsersUserId for application/json ContentType. -type PatchUsersUserIdJSONRequestBody = User - -// PatchUsersUserIdTitlesJSONRequestBody defines body for PatchUsersUserIdTitles for application/json ContentType. -type PatchUsersUserIdTitlesJSONRequestBody = UserTitle - -// PostUsersUserIdTitlesJSONRequestBody defines body for PostUsersUserIdTitles for application/json ContentType. -type PostUsersUserIdTitlesJSONRequestBody PostUsersUserIdTitlesJSONBody - -// ServerInterface represents all server handlers. -type ServerInterface interface { - // Get image path - // (GET /media) - GetMedia(c *gin.Context, params GetMediaParams) - // Upload image - // (POST /media) - PostMedia(c *gin.Context) - // Add review - // (POST /reviews) - PostReviews(c *gin.Context) - // Delete review - // (DELETE /reviews/{review_id}) - DeleteReviewsReviewId(c *gin.Context, reviewId string) - // Update review - // (PATCH /reviews/{review_id}) - PatchReviewsReviewId(c *gin.Context, reviewId string) - // Get tags - // (GET /tags) - GetTags(c *gin.Context, params GetTagsParams) - // Get titles - // (GET /title) - GetTitle(c *gin.Context, params GetTitleParams) - // Get title description - // (GET /title/{title_id}) - GetTitleTitleId(c *gin.Context, titleId string, params GetTitleTitleIdParams) - // Update title info - // (PATCH /title/{title_id}) - PatchTitleTitleId(c *gin.Context, titleId string) - // Get title reviews - // (GET /title/{title_id}/reviews) - GetTitleTitleIdReviews(c *gin.Context, titleId string, params GetTitleTitleIdReviewsParams) - // Search user - // (GET /users) - GetUsers(c *gin.Context, params GetUsersParams) - // Add new user - // (POST /users) - PostUsers(c *gin.Context) - // Delete user - // (DELETE /users/{user_id}) - DeleteUsersUserId(c *gin.Context, userId string) - // Get user info - // (GET /users/{user_id}) - GetUsersUserId(c *gin.Context, userId string, params GetUsersUserIdParams) - // Update user - // (PATCH /users/{user_id}) - PatchUsersUserId(c *gin.Context, userId string) - // Get user reviews - // (GET /users/{user_id}/reviews) - GetUsersUserIdReviews(c *gin.Context, userId string, params GetUsersUserIdReviewsParams) - // Delete user title - // (DELETE /users/{user_id}/titles) - DeleteUsersUserIdTitles(c *gin.Context, userId string, params DeleteUsersUserIdTitlesParams) - // Get user titles - // (GET /users/{user_id}/titles) - GetUsersUserIdTitles(c *gin.Context, userId string, params GetUsersUserIdTitlesParams) - // Update user title - // (PATCH /users/{user_id}/titles) - PatchUsersUserIdTitles(c *gin.Context, userId string) - // Add user title - // (POST /users/{user_id}/titles) - PostUsersUserIdTitles(c *gin.Context, userId string) -} - -// ServerInterfaceWrapper converts contexts to parameters. -type ServerInterfaceWrapper struct { - Handler ServerInterface - HandlerMiddlewares []MiddlewareFunc - ErrorHandler func(*gin.Context, error, int) -} - -type MiddlewareFunc func(c *gin.Context) - -// GetMedia operation middleware -func (siw *ServerInterfaceWrapper) GetMedia(c *gin.Context) { - - var err error - - // Parameter object where we will unmarshal all parameters from the context - var params GetMediaParams - - // ------------- Required query parameter "image_id" ------------- - - if paramValue := c.Query("image_id"); paramValue != "" { - - } else { - siw.ErrorHandler(c, fmt.Errorf("Query argument image_id is required, but not found"), http.StatusBadRequest) - return - } - - err = runtime.BindQueryParameter("form", true, true, "image_id", c.Request.URL.Query(), ¶ms.ImageId) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter image_id: %w", err), http.StatusBadRequest) - return - } - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.GetMedia(c, params) -} - -// PostMedia operation middleware -func (siw *ServerInterfaceWrapper) PostMedia(c *gin.Context) { - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.PostMedia(c) -} - -// PostReviews operation middleware -func (siw *ServerInterfaceWrapper) PostReviews(c *gin.Context) { - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.PostReviews(c) -} - -// DeleteReviewsReviewId operation middleware -func (siw *ServerInterfaceWrapper) DeleteReviewsReviewId(c *gin.Context) { - - var err error - - // ------------- Path parameter "review_id" ------------- - var reviewId string - - err = runtime.BindStyledParameterWithOptions("simple", "review_id", c.Param("review_id"), &reviewId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter review_id: %w", err), http.StatusBadRequest) - return - } - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.DeleteReviewsReviewId(c, reviewId) -} - -// PatchReviewsReviewId operation middleware -func (siw *ServerInterfaceWrapper) PatchReviewsReviewId(c *gin.Context) { - - var err error - - // ------------- Path parameter "review_id" ------------- - var reviewId string - - err = runtime.BindStyledParameterWithOptions("simple", "review_id", c.Param("review_id"), &reviewId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter review_id: %w", err), http.StatusBadRequest) - return - } - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.PatchReviewsReviewId(c, reviewId) -} - -// GetTags operation middleware -func (siw *ServerInterfaceWrapper) GetTags(c *gin.Context) { - - var err error - - // Parameter object where we will unmarshal all parameters from the context - var params GetTagsParams - - // ------------- Optional query parameter "limit" ------------- - - err = runtime.BindQueryParameter("form", true, false, "limit", c.Request.URL.Query(), ¶ms.Limit) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter limit: %w", err), http.StatusBadRequest) - return - } - - // ------------- Optional query parameter "offset" ------------- - - err = runtime.BindQueryParameter("form", true, false, "offset", c.Request.URL.Query(), ¶ms.Offset) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter offset: %w", err), http.StatusBadRequest) - return - } - - // ------------- Optional query parameter "fields" ------------- - - err = runtime.BindQueryParameter("form", true, false, "fields", c.Request.URL.Query(), ¶ms.Fields) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter fields: %w", err), http.StatusBadRequest) - return - } - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.GetTags(c, params) -} - -// GetTitle operation middleware -func (siw *ServerInterfaceWrapper) GetTitle(c *gin.Context) { - - var err error - - // Parameter object where we will unmarshal all parameters from the context - var params GetTitleParams - - // ------------- Optional query parameter "query" ------------- - - err = runtime.BindQueryParameter("form", true, false, "query", c.Request.URL.Query(), ¶ms.Query) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter query: %w", err), http.StatusBadRequest) - return - } - - // ------------- Optional query parameter "limit" ------------- - - err = runtime.BindQueryParameter("form", true, false, "limit", c.Request.URL.Query(), ¶ms.Limit) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter limit: %w", err), http.StatusBadRequest) - return - } - - // ------------- Optional query parameter "offset" ------------- - - err = runtime.BindQueryParameter("form", true, false, "offset", c.Request.URL.Query(), ¶ms.Offset) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter offset: %w", err), http.StatusBadRequest) - return - } - - // ------------- Optional query parameter "fields" ------------- - - err = runtime.BindQueryParameter("form", true, false, "fields", c.Request.URL.Query(), ¶ms.Fields) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter fields: %w", err), http.StatusBadRequest) - return - } - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.GetTitle(c, params) -} - -// GetTitleTitleId operation middleware -func (siw *ServerInterfaceWrapper) GetTitleTitleId(c *gin.Context) { - - var err error - - // ------------- Path parameter "title_id" ------------- - var titleId string - - err = runtime.BindStyledParameterWithOptions("simple", "title_id", c.Param("title_id"), &titleId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter title_id: %w", err), http.StatusBadRequest) - return - } - - // Parameter object where we will unmarshal all parameters from the context - var params GetTitleTitleIdParams - - // ------------- Optional query parameter "fields" ------------- - - err = runtime.BindQueryParameter("form", true, false, "fields", c.Request.URL.Query(), ¶ms.Fields) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter fields: %w", err), http.StatusBadRequest) - return - } - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.GetTitleTitleId(c, titleId, params) -} - -// PatchTitleTitleId operation middleware -func (siw *ServerInterfaceWrapper) PatchTitleTitleId(c *gin.Context) { - - var err error - - // ------------- Path parameter "title_id" ------------- - var titleId string - - err = runtime.BindStyledParameterWithOptions("simple", "title_id", c.Param("title_id"), &titleId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter title_id: %w", err), http.StatusBadRequest) - return - } - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.PatchTitleTitleId(c, titleId) -} - -// GetTitleTitleIdReviews operation middleware -func (siw *ServerInterfaceWrapper) GetTitleTitleIdReviews(c *gin.Context) { - - var err error - - // ------------- Path parameter "title_id" ------------- - var titleId string - - err = runtime.BindStyledParameterWithOptions("simple", "title_id", c.Param("title_id"), &titleId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter title_id: %w", err), http.StatusBadRequest) - return - } - - // Parameter object where we will unmarshal all parameters from the context - var params GetTitleTitleIdReviewsParams - - // ------------- Optional query parameter "limit" ------------- - - err = runtime.BindQueryParameter("form", true, false, "limit", c.Request.URL.Query(), ¶ms.Limit) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter limit: %w", err), http.StatusBadRequest) - return - } - - // ------------- Optional query parameter "offset" ------------- - - err = runtime.BindQueryParameter("form", true, false, "offset", c.Request.URL.Query(), ¶ms.Offset) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter offset: %w", err), http.StatusBadRequest) - return - } - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.GetTitleTitleIdReviews(c, titleId, params) -} - -// GetUsers operation middleware -func (siw *ServerInterfaceWrapper) GetUsers(c *gin.Context) { - - var err error - - // Parameter object where we will unmarshal all parameters from the context - var params GetUsersParams - - // ------------- Optional query parameter "query" ------------- - - err = runtime.BindQueryParameter("form", true, false, "query", c.Request.URL.Query(), ¶ms.Query) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter query: %w", err), http.StatusBadRequest) - return - } - - // ------------- Optional query parameter "fields" ------------- - - err = runtime.BindQueryParameter("form", true, false, "fields", c.Request.URL.Query(), ¶ms.Fields) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter fields: %w", err), http.StatusBadRequest) - return - } - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.GetUsers(c, params) -} - -// PostUsers operation middleware -func (siw *ServerInterfaceWrapper) PostUsers(c *gin.Context) { - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.PostUsers(c) -} - -// DeleteUsersUserId operation middleware -func (siw *ServerInterfaceWrapper) DeleteUsersUserId(c *gin.Context) { - - var err error - - // ------------- Path parameter "user_id" ------------- - var userId string - - err = runtime.BindStyledParameterWithOptions("simple", "user_id", c.Param("user_id"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter user_id: %w", err), http.StatusBadRequest) - return - } - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.DeleteUsersUserId(c, userId) -} - -// GetUsersUserId operation middleware -func (siw *ServerInterfaceWrapper) GetUsersUserId(c *gin.Context) { - - var err error - - // ------------- Path parameter "user_id" ------------- - var userId string - - err = runtime.BindStyledParameterWithOptions("simple", "user_id", c.Param("user_id"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter user_id: %w", err), http.StatusBadRequest) - return - } - - // Parameter object where we will unmarshal all parameters from the context - var params GetUsersUserIdParams - - // ------------- Optional query parameter "fields" ------------- - - err = runtime.BindQueryParameter("form", true, false, "fields", c.Request.URL.Query(), ¶ms.Fields) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter fields: %w", err), http.StatusBadRequest) - return - } - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.GetUsersUserId(c, userId, params) -} - -// PatchUsersUserId operation middleware -func (siw *ServerInterfaceWrapper) PatchUsersUserId(c *gin.Context) { - - var err error - - // ------------- Path parameter "user_id" ------------- - var userId string - - err = runtime.BindStyledParameterWithOptions("simple", "user_id", c.Param("user_id"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter user_id: %w", err), http.StatusBadRequest) - return - } - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.PatchUsersUserId(c, userId) -} - -// GetUsersUserIdReviews operation middleware -func (siw *ServerInterfaceWrapper) GetUsersUserIdReviews(c *gin.Context) { - - var err error - - // ------------- Path parameter "user_id" ------------- - var userId string - - err = runtime.BindStyledParameterWithOptions("simple", "user_id", c.Param("user_id"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter user_id: %w", err), http.StatusBadRequest) - return - } - - // Parameter object where we will unmarshal all parameters from the context - var params GetUsersUserIdReviewsParams - - // ------------- Optional query parameter "limit" ------------- - - err = runtime.BindQueryParameter("form", true, false, "limit", c.Request.URL.Query(), ¶ms.Limit) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter limit: %w", err), http.StatusBadRequest) - return - } - - // ------------- Optional query parameter "offset" ------------- - - err = runtime.BindQueryParameter("form", true, false, "offset", c.Request.URL.Query(), ¶ms.Offset) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter offset: %w", err), http.StatusBadRequest) - return - } - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.GetUsersUserIdReviews(c, userId, params) -} - -// DeleteUsersUserIdTitles operation middleware -func (siw *ServerInterfaceWrapper) DeleteUsersUserIdTitles(c *gin.Context) { - - var err error - - // ------------- Path parameter "user_id" ------------- - var userId string - - err = runtime.BindStyledParameterWithOptions("simple", "user_id", c.Param("user_id"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter user_id: %w", err), http.StatusBadRequest) - return - } - - // Parameter object where we will unmarshal all parameters from the context - var params DeleteUsersUserIdTitlesParams - - // ------------- Optional query parameter "title_id" ------------- - - err = runtime.BindQueryParameter("form", true, false, "title_id", c.Request.URL.Query(), ¶ms.TitleId) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter title_id: %w", err), http.StatusBadRequest) - return - } - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.DeleteUsersUserIdTitles(c, userId, params) -} - -// GetUsersUserIdTitles operation middleware -func (siw *ServerInterfaceWrapper) GetUsersUserIdTitles(c *gin.Context) { - - var err error - - // ------------- Path parameter "user_id" ------------- - var userId string - - err = runtime.BindStyledParameterWithOptions("simple", "user_id", c.Param("user_id"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter user_id: %w", err), http.StatusBadRequest) - return - } - - // Parameter object where we will unmarshal all parameters from the context - var params GetUsersUserIdTitlesParams - - // ------------- Optional query parameter "query" ------------- - - err = runtime.BindQueryParameter("form", true, false, "query", c.Request.URL.Query(), ¶ms.Query) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter query: %w", err), http.StatusBadRequest) - return - } - - // ------------- Optional query parameter "limit" ------------- - - err = runtime.BindQueryParameter("form", true, false, "limit", c.Request.URL.Query(), ¶ms.Limit) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter limit: %w", err), http.StatusBadRequest) - return - } - - // ------------- Optional query parameter "offset" ------------- - - err = runtime.BindQueryParameter("form", true, false, "offset", c.Request.URL.Query(), ¶ms.Offset) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter offset: %w", err), http.StatusBadRequest) - return - } - - // ------------- Optional query parameter "fields" ------------- - - err = runtime.BindQueryParameter("form", true, false, "fields", c.Request.URL.Query(), ¶ms.Fields) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter fields: %w", err), http.StatusBadRequest) - return - } - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.GetUsersUserIdTitles(c, userId, params) -} - -// PatchUsersUserIdTitles operation middleware -func (siw *ServerInterfaceWrapper) PatchUsersUserIdTitles(c *gin.Context) { - - var err error - - // ------------- Path parameter "user_id" ------------- - var userId string - - err = runtime.BindStyledParameterWithOptions("simple", "user_id", c.Param("user_id"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter user_id: %w", err), http.StatusBadRequest) - return - } - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.PatchUsersUserIdTitles(c, userId) -} - -// PostUsersUserIdTitles operation middleware -func (siw *ServerInterfaceWrapper) PostUsersUserIdTitles(c *gin.Context) { - - var err error - - // ------------- Path parameter "user_id" ------------- - var userId string - - err = runtime.BindStyledParameterWithOptions("simple", "user_id", c.Param("user_id"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter user_id: %w", err), http.StatusBadRequest) - return - } - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.PostUsersUserIdTitles(c, userId) -} - -// GinServerOptions provides options for the Gin server. -type GinServerOptions struct { - BaseURL string - Middlewares []MiddlewareFunc - ErrorHandler func(*gin.Context, error, int) -} - -// RegisterHandlers creates http.Handler with routing matching OpenAPI spec. -func RegisterHandlers(router gin.IRouter, si ServerInterface) { - RegisterHandlersWithOptions(router, si, GinServerOptions{}) -} - -// RegisterHandlersWithOptions creates http.Handler with additional options -func RegisterHandlersWithOptions(router gin.IRouter, si ServerInterface, options GinServerOptions) { - errorHandler := options.ErrorHandler - if errorHandler == nil { - errorHandler = func(c *gin.Context, err error, statusCode int) { - c.JSON(statusCode, gin.H{"msg": err.Error()}) - } - } - - wrapper := ServerInterfaceWrapper{ - Handler: si, - HandlerMiddlewares: options.Middlewares, - ErrorHandler: errorHandler, - } - - router.GET(options.BaseURL+"/media", wrapper.GetMedia) - router.POST(options.BaseURL+"/media", wrapper.PostMedia) - router.POST(options.BaseURL+"/reviews", wrapper.PostReviews) - router.DELETE(options.BaseURL+"/reviews/:review_id", wrapper.DeleteReviewsReviewId) - router.PATCH(options.BaseURL+"/reviews/:review_id", wrapper.PatchReviewsReviewId) - router.GET(options.BaseURL+"/tags", wrapper.GetTags) - router.GET(options.BaseURL+"/title", wrapper.GetTitle) - router.GET(options.BaseURL+"/title/:title_id", wrapper.GetTitleTitleId) - router.PATCH(options.BaseURL+"/title/:title_id", wrapper.PatchTitleTitleId) - router.GET(options.BaseURL+"/title/:title_id/reviews", wrapper.GetTitleTitleIdReviews) - router.GET(options.BaseURL+"/users", wrapper.GetUsers) - router.POST(options.BaseURL+"/users", wrapper.PostUsers) - router.DELETE(options.BaseURL+"/users/:user_id", wrapper.DeleteUsersUserId) - router.GET(options.BaseURL+"/users/:user_id", wrapper.GetUsersUserId) - router.PATCH(options.BaseURL+"/users/:user_id", wrapper.PatchUsersUserId) - router.GET(options.BaseURL+"/users/:user_id/reviews", wrapper.GetUsersUserIdReviews) - router.DELETE(options.BaseURL+"/users/:user_id/titles", wrapper.DeleteUsersUserIdTitles) - router.GET(options.BaseURL+"/users/:user_id/titles", wrapper.GetUsersUserIdTitles) - router.PATCH(options.BaseURL+"/users/:user_id/titles", wrapper.PatchUsersUserIdTitles) - router.POST(options.BaseURL+"/users/:user_id/titles", wrapper.PostUsersUserIdTitles) -} - -type GetMediaRequestObject struct { - Params GetMediaParams -} - -type GetMediaResponseObject interface { - VisitGetMediaResponse(w http.ResponseWriter) error -} - -type GetMedia200JSONResponse struct { - Error *string `json:"error,omitempty"` - ImagePath *string `json:"image_path,omitempty"` - Success *bool `json:"success,omitempty"` -} - -func (response GetMedia200JSONResponse) VisitGetMediaResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type PostMediaRequestObject struct { -} - -type PostMediaResponseObject interface { - VisitPostMediaResponse(w http.ResponseWriter) error -} - -type PostMedia200JSONResponse struct { - Error *string `json:"error,omitempty"` - ImageId *string `json:"image_id,omitempty"` - Success *bool `json:"success,omitempty"` -} - -func (response PostMedia200JSONResponse) VisitPostMediaResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type PostReviewsRequestObject struct { - Body *PostReviewsJSONRequestBody -} - -type PostReviewsResponseObject interface { - VisitPostReviewsResponse(w http.ResponseWriter) error -} - -type PostReviews200JSONResponse struct { - Error *string `json:"error,omitempty"` - Success *bool `json:"success,omitempty"` -} - -func (response PostReviews200JSONResponse) VisitPostReviewsResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type DeleteReviewsReviewIdRequestObject struct { - ReviewId string `json:"review_id"` -} - -type DeleteReviewsReviewIdResponseObject interface { - VisitDeleteReviewsReviewIdResponse(w http.ResponseWriter) error -} - -type DeleteReviewsReviewId200JSONResponse struct { - Error *string `json:"error,omitempty"` - Success *bool `json:"success,omitempty"` -} - -func (response DeleteReviewsReviewId200JSONResponse) VisitDeleteReviewsReviewIdResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type PatchReviewsReviewIdRequestObject struct { - ReviewId string `json:"review_id"` - Body *PatchReviewsReviewIdJSONRequestBody -} - -type PatchReviewsReviewIdResponseObject interface { - VisitPatchReviewsReviewIdResponse(w http.ResponseWriter) error -} - -type PatchReviewsReviewId200JSONResponse struct { - Error *string `json:"error,omitempty"` - Success *bool `json:"success,omitempty"` -} - -func (response PatchReviewsReviewId200JSONResponse) VisitPatchReviewsReviewIdResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type GetTagsRequestObject struct { - Params GetTagsParams -} - -type GetTagsResponseObject interface { - VisitGetTagsResponse(w http.ResponseWriter) error -} - -type GetTags200JSONResponse []Tag - -func (response GetTags200JSONResponse) VisitGetTagsResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type GetTitleRequestObject struct { - Params GetTitleParams -} - -type GetTitleResponseObject interface { - VisitGetTitleResponse(w http.ResponseWriter) error -} - -type GetTitle200JSONResponse []Title - -func (response GetTitle200JSONResponse) VisitGetTitleResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type GetTitle204Response struct { -} - -func (response GetTitle204Response) VisitGetTitleResponse(w http.ResponseWriter) error { - w.WriteHeader(204) - return nil -} - -type GetTitleTitleIdRequestObject struct { - TitleId string `json:"title_id"` - Params GetTitleTitleIdParams -} - -type GetTitleTitleIdResponseObject interface { - VisitGetTitleTitleIdResponse(w http.ResponseWriter) error -} - -type GetTitleTitleId200JSONResponse Title - -func (response GetTitleTitleId200JSONResponse) VisitGetTitleTitleIdResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type GetTitleTitleId404Response struct { -} - -func (response GetTitleTitleId404Response) VisitGetTitleTitleIdResponse(w http.ResponseWriter) error { - w.WriteHeader(404) - return nil -} - -type PatchTitleTitleIdRequestObject struct { - TitleId string `json:"title_id"` - Body *PatchTitleTitleIdJSONRequestBody -} - -type PatchTitleTitleIdResponseObject interface { - VisitPatchTitleTitleIdResponse(w http.ResponseWriter) error -} - -type PatchTitleTitleId200JSONResponse struct { - Error *string `json:"error,omitempty"` - Success *bool `json:"success,omitempty"` - UserJson *User `json:"user_json,omitempty"` -} - -func (response PatchTitleTitleId200JSONResponse) VisitPatchTitleTitleIdResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type GetTitleTitleIdReviewsRequestObject struct { - TitleId string `json:"title_id"` - Params GetTitleTitleIdReviewsParams -} - -type GetTitleTitleIdReviewsResponseObject interface { - VisitGetTitleTitleIdReviewsResponse(w http.ResponseWriter) error -} - -type GetTitleTitleIdReviews200JSONResponse []Review - -func (response GetTitleTitleIdReviews200JSONResponse) VisitGetTitleTitleIdReviewsResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type GetTitleTitleIdReviews204Response struct { -} - -func (response GetTitleTitleIdReviews204Response) VisitGetTitleTitleIdReviewsResponse(w http.ResponseWriter) error { - w.WriteHeader(204) - return nil -} - -type GetUsersRequestObject struct { - Params GetUsersParams -} - -type GetUsersResponseObject interface { - VisitGetUsersResponse(w http.ResponseWriter) error -} - -type GetUsers200JSONResponse []User - -func (response GetUsers200JSONResponse) VisitGetUsersResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type PostUsersRequestObject struct { - Body *PostUsersJSONRequestBody -} - -type PostUsersResponseObject interface { - VisitPostUsersResponse(w http.ResponseWriter) error -} - -type PostUsers200JSONResponse struct { - Error *string `json:"error,omitempty"` - Success *bool `json:"success,omitempty"` - UserJson *User `json:"user_json,omitempty"` -} - -func (response PostUsers200JSONResponse) VisitPostUsersResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type DeleteUsersUserIdRequestObject struct { - UserId string `json:"user_id"` -} - -type DeleteUsersUserIdResponseObject interface { - VisitDeleteUsersUserIdResponse(w http.ResponseWriter) error -} - -type DeleteUsersUserId200JSONResponse struct { - Error *string `json:"error,omitempty"` - Success *bool `json:"success,omitempty"` -} - -func (response DeleteUsersUserId200JSONResponse) VisitDeleteUsersUserIdResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type GetUsersUserIdRequestObject struct { - UserId string `json:"user_id"` - Params GetUsersUserIdParams -} - -type GetUsersUserIdResponseObject interface { - VisitGetUsersUserIdResponse(w http.ResponseWriter) error -} - -type GetUsersUserId200JSONResponse User - -func (response GetUsersUserId200JSONResponse) VisitGetUsersUserIdResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type GetUsersUserId404Response struct { -} - -func (response GetUsersUserId404Response) VisitGetUsersUserIdResponse(w http.ResponseWriter) error { - w.WriteHeader(404) - return nil -} - -type PatchUsersUserIdRequestObject struct { - UserId string `json:"user_id"` - Body *PatchUsersUserIdJSONRequestBody -} - -type PatchUsersUserIdResponseObject interface { - VisitPatchUsersUserIdResponse(w http.ResponseWriter) error -} - -type PatchUsersUserId200JSONResponse struct { - Error *string `json:"error,omitempty"` - Success *bool `json:"success,omitempty"` -} - -func (response PatchUsersUserId200JSONResponse) VisitPatchUsersUserIdResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type GetUsersUserIdReviewsRequestObject struct { - UserId string `json:"user_id"` - Params GetUsersUserIdReviewsParams -} - -type GetUsersUserIdReviewsResponseObject interface { - VisitGetUsersUserIdReviewsResponse(w http.ResponseWriter) error -} - -type GetUsersUserIdReviews200JSONResponse []Review - -func (response GetUsersUserIdReviews200JSONResponse) VisitGetUsersUserIdReviewsResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type DeleteUsersUserIdTitlesRequestObject struct { - UserId string `json:"user_id"` - Params DeleteUsersUserIdTitlesParams -} - -type DeleteUsersUserIdTitlesResponseObject interface { - VisitDeleteUsersUserIdTitlesResponse(w http.ResponseWriter) error -} - -type DeleteUsersUserIdTitles200JSONResponse struct { - Error *string `json:"error,omitempty"` - Success *bool `json:"success,omitempty"` -} - -func (response DeleteUsersUserIdTitles200JSONResponse) VisitDeleteUsersUserIdTitlesResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type GetUsersUserIdTitlesRequestObject struct { - UserId string `json:"user_id"` - Params GetUsersUserIdTitlesParams -} - -type GetUsersUserIdTitlesResponseObject interface { - VisitGetUsersUserIdTitlesResponse(w http.ResponseWriter) error -} - -type GetUsersUserIdTitles200JSONResponse []UserTitle - -func (response GetUsersUserIdTitles200JSONResponse) VisitGetUsersUserIdTitlesResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type GetUsersUserIdTitles204Response struct { -} - -func (response GetUsersUserIdTitles204Response) VisitGetUsersUserIdTitlesResponse(w http.ResponseWriter) error { - w.WriteHeader(204) - return nil -} - -type PatchUsersUserIdTitlesRequestObject struct { - UserId string `json:"user_id"` - Body *PatchUsersUserIdTitlesJSONRequestBody -} - -type PatchUsersUserIdTitlesResponseObject interface { - VisitPatchUsersUserIdTitlesResponse(w http.ResponseWriter) error -} - -type PatchUsersUserIdTitles200JSONResponse struct { - Error *string `json:"error,omitempty"` - Success *bool `json:"success,omitempty"` -} - -func (response PatchUsersUserIdTitles200JSONResponse) VisitPatchUsersUserIdTitlesResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type PostUsersUserIdTitlesRequestObject struct { - UserId string `json:"user_id"` - Body *PostUsersUserIdTitlesJSONRequestBody -} - -type PostUsersUserIdTitlesResponseObject interface { - VisitPostUsersUserIdTitlesResponse(w http.ResponseWriter) error -} - -type PostUsersUserIdTitles200JSONResponse struct { - Error *string `json:"error,omitempty"` - Success *bool `json:"success,omitempty"` -} - -func (response PostUsersUserIdTitles200JSONResponse) VisitPostUsersUserIdTitlesResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -// StrictServerInterface represents all server handlers. -type StrictServerInterface interface { - // Get image path - // (GET /media) - GetMedia(ctx context.Context, request GetMediaRequestObject) (GetMediaResponseObject, error) - // Upload image - // (POST /media) - PostMedia(ctx context.Context, request PostMediaRequestObject) (PostMediaResponseObject, error) - // Add review - // (POST /reviews) - PostReviews(ctx context.Context, request PostReviewsRequestObject) (PostReviewsResponseObject, error) - // Delete review - // (DELETE /reviews/{review_id}) - DeleteReviewsReviewId(ctx context.Context, request DeleteReviewsReviewIdRequestObject) (DeleteReviewsReviewIdResponseObject, error) - // Update review - // (PATCH /reviews/{review_id}) - PatchReviewsReviewId(ctx context.Context, request PatchReviewsReviewIdRequestObject) (PatchReviewsReviewIdResponseObject, error) - // Get tags - // (GET /tags) - GetTags(ctx context.Context, request GetTagsRequestObject) (GetTagsResponseObject, error) - // Get titles - // (GET /title) - GetTitle(ctx context.Context, request GetTitleRequestObject) (GetTitleResponseObject, error) - // Get title description - // (GET /title/{title_id}) - GetTitleTitleId(ctx context.Context, request GetTitleTitleIdRequestObject) (GetTitleTitleIdResponseObject, error) - // Update title info - // (PATCH /title/{title_id}) - PatchTitleTitleId(ctx context.Context, request PatchTitleTitleIdRequestObject) (PatchTitleTitleIdResponseObject, error) - // Get title reviews - // (GET /title/{title_id}/reviews) - GetTitleTitleIdReviews(ctx context.Context, request GetTitleTitleIdReviewsRequestObject) (GetTitleTitleIdReviewsResponseObject, error) - // Search user - // (GET /users) - GetUsers(ctx context.Context, request GetUsersRequestObject) (GetUsersResponseObject, error) - // Add new user - // (POST /users) - PostUsers(ctx context.Context, request PostUsersRequestObject) (PostUsersResponseObject, error) - // Delete user - // (DELETE /users/{user_id}) - DeleteUsersUserId(ctx context.Context, request DeleteUsersUserIdRequestObject) (DeleteUsersUserIdResponseObject, error) - // Get user info - // (GET /users/{user_id}) - GetUsersUserId(ctx context.Context, request GetUsersUserIdRequestObject) (GetUsersUserIdResponseObject, error) - // Update user - // (PATCH /users/{user_id}) - PatchUsersUserId(ctx context.Context, request PatchUsersUserIdRequestObject) (PatchUsersUserIdResponseObject, error) - // Get user reviews - // (GET /users/{user_id}/reviews) - GetUsersUserIdReviews(ctx context.Context, request GetUsersUserIdReviewsRequestObject) (GetUsersUserIdReviewsResponseObject, error) - // Delete user title - // (DELETE /users/{user_id}/titles) - DeleteUsersUserIdTitles(ctx context.Context, request DeleteUsersUserIdTitlesRequestObject) (DeleteUsersUserIdTitlesResponseObject, error) - // Get user titles - // (GET /users/{user_id}/titles) - GetUsersUserIdTitles(ctx context.Context, request GetUsersUserIdTitlesRequestObject) (GetUsersUserIdTitlesResponseObject, error) - // Update user title - // (PATCH /users/{user_id}/titles) - PatchUsersUserIdTitles(ctx context.Context, request PatchUsersUserIdTitlesRequestObject) (PatchUsersUserIdTitlesResponseObject, error) - // Add user title - // (POST /users/{user_id}/titles) - PostUsersUserIdTitles(ctx context.Context, request PostUsersUserIdTitlesRequestObject) (PostUsersUserIdTitlesResponseObject, error) -} - -type StrictHandlerFunc = strictgin.StrictGinHandlerFunc -type StrictMiddlewareFunc = strictgin.StrictGinMiddlewareFunc - -func NewStrictHandler(ssi StrictServerInterface, middlewares []StrictMiddlewareFunc) ServerInterface { - return &strictHandler{ssi: ssi, middlewares: middlewares} -} - -type strictHandler struct { - ssi StrictServerInterface - middlewares []StrictMiddlewareFunc -} - -// GetMedia operation middleware -func (sh *strictHandler) GetMedia(ctx *gin.Context, params GetMediaParams) { - var request GetMediaRequestObject - - request.Params = params - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.GetMedia(ctx, request.(GetMediaRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "GetMedia") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(GetMediaResponseObject); ok { - if err := validResponse.VisitGetMediaResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// PostMedia operation middleware -func (sh *strictHandler) PostMedia(ctx *gin.Context) { - var request PostMediaRequestObject - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.PostMedia(ctx, request.(PostMediaRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "PostMedia") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(PostMediaResponseObject); ok { - if err := validResponse.VisitPostMediaResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// PostReviews operation middleware -func (sh *strictHandler) PostReviews(ctx *gin.Context) { - var request PostReviewsRequestObject - - var body PostReviewsJSONRequestBody - if err := ctx.ShouldBindJSON(&body); err != nil { - ctx.Status(http.StatusBadRequest) - ctx.Error(err) - return - } - request.Body = &body - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.PostReviews(ctx, request.(PostReviewsRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "PostReviews") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(PostReviewsResponseObject); ok { - if err := validResponse.VisitPostReviewsResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// DeleteReviewsReviewId operation middleware -func (sh *strictHandler) DeleteReviewsReviewId(ctx *gin.Context, reviewId string) { - var request DeleteReviewsReviewIdRequestObject - - request.ReviewId = reviewId - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.DeleteReviewsReviewId(ctx, request.(DeleteReviewsReviewIdRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "DeleteReviewsReviewId") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(DeleteReviewsReviewIdResponseObject); ok { - if err := validResponse.VisitDeleteReviewsReviewIdResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// PatchReviewsReviewId operation middleware -func (sh *strictHandler) PatchReviewsReviewId(ctx *gin.Context, reviewId string) { - var request PatchReviewsReviewIdRequestObject - - request.ReviewId = reviewId - - var body PatchReviewsReviewIdJSONRequestBody - if err := ctx.ShouldBindJSON(&body); err != nil { - ctx.Status(http.StatusBadRequest) - ctx.Error(err) - return - } - request.Body = &body - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.PatchReviewsReviewId(ctx, request.(PatchReviewsReviewIdRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "PatchReviewsReviewId") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(PatchReviewsReviewIdResponseObject); ok { - if err := validResponse.VisitPatchReviewsReviewIdResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// GetTags operation middleware -func (sh *strictHandler) GetTags(ctx *gin.Context, params GetTagsParams) { - var request GetTagsRequestObject - - request.Params = params - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.GetTags(ctx, request.(GetTagsRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "GetTags") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(GetTagsResponseObject); ok { - if err := validResponse.VisitGetTagsResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// GetTitle operation middleware -func (sh *strictHandler) GetTitle(ctx *gin.Context, params GetTitleParams) { - var request GetTitleRequestObject - - request.Params = params - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.GetTitle(ctx, request.(GetTitleRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "GetTitle") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(GetTitleResponseObject); ok { - if err := validResponse.VisitGetTitleResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// GetTitleTitleId operation middleware -func (sh *strictHandler) GetTitleTitleId(ctx *gin.Context, titleId string, params GetTitleTitleIdParams) { - var request GetTitleTitleIdRequestObject - - request.TitleId = titleId - request.Params = params - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.GetTitleTitleId(ctx, request.(GetTitleTitleIdRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "GetTitleTitleId") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(GetTitleTitleIdResponseObject); ok { - if err := validResponse.VisitGetTitleTitleIdResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// PatchTitleTitleId operation middleware -func (sh *strictHandler) PatchTitleTitleId(ctx *gin.Context, titleId string) { - var request PatchTitleTitleIdRequestObject - - request.TitleId = titleId - - var body PatchTitleTitleIdJSONRequestBody - if err := ctx.ShouldBindJSON(&body); err != nil { - ctx.Status(http.StatusBadRequest) - ctx.Error(err) - return - } - request.Body = &body - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.PatchTitleTitleId(ctx, request.(PatchTitleTitleIdRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "PatchTitleTitleId") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(PatchTitleTitleIdResponseObject); ok { - if err := validResponse.VisitPatchTitleTitleIdResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// GetTitleTitleIdReviews operation middleware -func (sh *strictHandler) GetTitleTitleIdReviews(ctx *gin.Context, titleId string, params GetTitleTitleIdReviewsParams) { - var request GetTitleTitleIdReviewsRequestObject - - request.TitleId = titleId - request.Params = params - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.GetTitleTitleIdReviews(ctx, request.(GetTitleTitleIdReviewsRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "GetTitleTitleIdReviews") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(GetTitleTitleIdReviewsResponseObject); ok { - if err := validResponse.VisitGetTitleTitleIdReviewsResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// GetUsers operation middleware -func (sh *strictHandler) GetUsers(ctx *gin.Context, params GetUsersParams) { - var request GetUsersRequestObject - - request.Params = params - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.GetUsers(ctx, request.(GetUsersRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "GetUsers") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(GetUsersResponseObject); ok { - if err := validResponse.VisitGetUsersResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// PostUsers operation middleware -func (sh *strictHandler) PostUsers(ctx *gin.Context) { - var request PostUsersRequestObject - - var body PostUsersJSONRequestBody - if err := ctx.ShouldBindJSON(&body); err != nil { - ctx.Status(http.StatusBadRequest) - ctx.Error(err) - return - } - request.Body = &body - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.PostUsers(ctx, request.(PostUsersRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "PostUsers") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(PostUsersResponseObject); ok { - if err := validResponse.VisitPostUsersResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// DeleteUsersUserId operation middleware -func (sh *strictHandler) DeleteUsersUserId(ctx *gin.Context, userId string) { - var request DeleteUsersUserIdRequestObject - - request.UserId = userId - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.DeleteUsersUserId(ctx, request.(DeleteUsersUserIdRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "DeleteUsersUserId") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(DeleteUsersUserIdResponseObject); ok { - if err := validResponse.VisitDeleteUsersUserIdResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// GetUsersUserId operation middleware -func (sh *strictHandler) GetUsersUserId(ctx *gin.Context, userId string, params GetUsersUserIdParams) { - var request GetUsersUserIdRequestObject - - request.UserId = userId - request.Params = params - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.GetUsersUserId(ctx, request.(GetUsersUserIdRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "GetUsersUserId") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(GetUsersUserIdResponseObject); ok { - if err := validResponse.VisitGetUsersUserIdResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// PatchUsersUserId operation middleware -func (sh *strictHandler) PatchUsersUserId(ctx *gin.Context, userId string) { - var request PatchUsersUserIdRequestObject - - request.UserId = userId - - var body PatchUsersUserIdJSONRequestBody - if err := ctx.ShouldBindJSON(&body); err != nil { - ctx.Status(http.StatusBadRequest) - ctx.Error(err) - return - } - request.Body = &body - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.PatchUsersUserId(ctx, request.(PatchUsersUserIdRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "PatchUsersUserId") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(PatchUsersUserIdResponseObject); ok { - if err := validResponse.VisitPatchUsersUserIdResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// GetUsersUserIdReviews operation middleware -func (sh *strictHandler) GetUsersUserIdReviews(ctx *gin.Context, userId string, params GetUsersUserIdReviewsParams) { - var request GetUsersUserIdReviewsRequestObject - - request.UserId = userId - request.Params = params - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.GetUsersUserIdReviews(ctx, request.(GetUsersUserIdReviewsRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "GetUsersUserIdReviews") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(GetUsersUserIdReviewsResponseObject); ok { - if err := validResponse.VisitGetUsersUserIdReviewsResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// DeleteUsersUserIdTitles operation middleware -func (sh *strictHandler) DeleteUsersUserIdTitles(ctx *gin.Context, userId string, params DeleteUsersUserIdTitlesParams) { - var request DeleteUsersUserIdTitlesRequestObject - - request.UserId = userId - request.Params = params - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.DeleteUsersUserIdTitles(ctx, request.(DeleteUsersUserIdTitlesRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "DeleteUsersUserIdTitles") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(DeleteUsersUserIdTitlesResponseObject); ok { - if err := validResponse.VisitDeleteUsersUserIdTitlesResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// GetUsersUserIdTitles operation middleware -func (sh *strictHandler) GetUsersUserIdTitles(ctx *gin.Context, userId string, params GetUsersUserIdTitlesParams) { - var request GetUsersUserIdTitlesRequestObject - - request.UserId = userId - request.Params = params - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.GetUsersUserIdTitles(ctx, request.(GetUsersUserIdTitlesRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "GetUsersUserIdTitles") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(GetUsersUserIdTitlesResponseObject); ok { - if err := validResponse.VisitGetUsersUserIdTitlesResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// PatchUsersUserIdTitles operation middleware -func (sh *strictHandler) PatchUsersUserIdTitles(ctx *gin.Context, userId string) { - var request PatchUsersUserIdTitlesRequestObject - - request.UserId = userId - - var body PatchUsersUserIdTitlesJSONRequestBody - if err := ctx.ShouldBindJSON(&body); err != nil { - ctx.Status(http.StatusBadRequest) - ctx.Error(err) - return - } - request.Body = &body - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.PatchUsersUserIdTitles(ctx, request.(PatchUsersUserIdTitlesRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "PatchUsersUserIdTitles") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(PatchUsersUserIdTitlesResponseObject); ok { - if err := validResponse.VisitPatchUsersUserIdTitlesResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// PostUsersUserIdTitles operation middleware -func (sh *strictHandler) PostUsersUserIdTitles(ctx *gin.Context, userId string) { - var request PostUsersUserIdTitlesRequestObject - - request.UserId = userId - - var body PostUsersUserIdTitlesJSONRequestBody - if err := ctx.ShouldBindJSON(&body); err != nil { - ctx.Status(http.StatusBadRequest) - ctx.Error(err) - return - } - request.Body = &body - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.PostUsersUserIdTitles(ctx, request.(PostUsersUserIdTitlesRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "PostUsersUserIdTitles") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(PostUsersUserIdTitlesResponseObject); ok { - if err := validResponse.VisitPostUsersUserIdTitlesResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} diff --git a/api/oapi-codegen.yaml b/api/oapi-codegen.yaml index 1d470ac..32e029a 100644 --- a/api/oapi-codegen.yaml +++ b/api/oapi-codegen.yaml @@ -1,6 +1,6 @@ -package: api +package: oapi generate: strict-server: true gin-server: true models: true -output: gen.go \ No newline at end of file +output: api/api.gen.go \ No newline at end of file diff --git a/api/openapi.yaml b/api/openapi.yaml index ca6099f..b2a2df0 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -40,498 +40,498 @@ paths: '204': description: No titles found - /title/{title_id}: - get: - summary: Get title description - parameters: - - in: path - name: title_id - required: true - schema: - type: string - - in: query - name: fields - schema: - type: string - default: all - responses: - '200': - description: Title description - content: - application/json: - schema: - $ref: '#/components/schemas/Title' - '404': - description: Title not found +# /title/{title_id}: +# get: +# summary: Get title description +# parameters: +# - in: path +# name: title_id +# required: true +# schema: +# type: string +# - in: query +# name: fields +# schema: +# type: string +# default: all +# responses: +# '200': +# description: Title description +# content: +# application/json: +# schema: +# $ref: '#/components/schemas/Title' +# '404': +# description: Title not found - patch: - summary: Update title info - parameters: - - in: path - name: title_id - required: true - schema: - type: string - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/Title' - responses: - '200': - description: Update result - content: - application/json: - schema: - type: object - properties: - success: - type: boolean - error: - type: string - user_json: - $ref: '#/components/schemas/User' +# patch: +# summary: Update title info +# parameters: +# - in: path +# name: title_id +# required: true +# schema: +# type: string +# requestBody: +# required: true +# content: +# application/json: +# schema: +# $ref: '#/components/schemas/Title' +# responses: +# '200': +# description: Update result +# content: +# application/json: +# schema: +# type: object +# properties: +# success: +# type: boolean +# error: +# type: string +# user_json: +# $ref: '#/components/schemas/User' - /title/{title_id}/reviews: - get: - summary: Get title reviews - parameters: - - in: path - name: title_id - required: true - schema: - type: string - - in: query - name: limit - schema: - type: integer - default: 10 - - in: query - name: offset - schema: - type: integer - default: 0 - responses: - '200': - description: List of reviews - content: - application/json: - schema: - type: array - items: - $ref: '#/components/schemas/Review' - '204': - description: No reviews found +# /title/{title_id}/reviews: +# get: +# summary: Get title reviews +# parameters: +# - in: path +# name: title_id +# required: true +# schema: +# type: string +# - in: query +# name: limit +# schema: +# type: integer +# default: 10 +# - in: query +# name: offset +# schema: +# type: integer +# default: 0 +# responses: +# '200': +# description: List of reviews +# content: +# application/json: +# schema: +# type: array +# items: +# $ref: '#/components/schemas/Review' +# '204': +# description: No reviews found - /users/{user_id}: - get: - summary: Get user info - parameters: - - in: path - name: user_id - required: true - schema: - type: string - - in: query - name: fields - schema: - type: string - default: all - responses: - '200': - description: User info - content: - application/json: - schema: - $ref: '#/components/schemas/User' - '404': - description: User not found +# /users/{user_id}: +# get: +# summary: Get user info +# parameters: +# - in: path +# name: user_id +# required: true +# schema: +# type: string +# - in: query +# name: fields +# schema: +# type: string +# default: all +# responses: +# '200': +# description: User info +# content: +# application/json: +# schema: +# $ref: '#/components/schemas/User' +# '404': +# description: User not found - patch: - summary: Update user - parameters: - - in: path - name: user_id - required: true - schema: - type: string - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/User' - responses: - '200': - description: Update result - content: - application/json: - schema: - type: object - properties: - success: - type: boolean - error: - type: string +# patch: +# summary: Update user +# parameters: +# - in: path +# name: user_id +# required: true +# schema: +# type: string +# requestBody: +# required: true +# content: +# application/json: +# schema: +# $ref: '#/components/schemas/User' +# responses: +# '200': +# description: Update result +# content: +# application/json: +# schema: +# type: object +# properties: +# success: +# type: boolean +# error: +# type: string - delete: - summary: Delete user - parameters: - - in: path - name: user_id - required: true - schema: - type: string - responses: - '200': - description: Delete result - content: - application/json: - schema: - type: object - properties: - success: - type: boolean - error: - type: string +# delete: +# summary: Delete user +# parameters: +# - in: path +# name: user_id +# required: true +# schema: +# type: string +# responses: +# '200': +# description: Delete result +# content: +# application/json: +# schema: +# type: object +# properties: +# success: +# type: boolean +# error: +# type: string - /users: - get: - summary: Search user - parameters: - - in: query - name: query - schema: - type: string - - in: query - name: fields - schema: - type: string - responses: - '200': - description: List of users - content: - application/json: - schema: - type: array - items: - $ref: '#/components/schemas/User' +# /users: +# get: +# summary: Search user +# parameters: +# - in: query +# name: query +# schema: +# type: string +# - in: query +# name: fields +# schema: +# type: string +# responses: +# '200': +# description: List of users +# content: +# application/json: +# schema: +# type: array +# items: +# $ref: '#/components/schemas/User' - post: - summary: Add new user - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/User' - responses: - '200': - description: Add result - content: - application/json: - schema: - type: object - properties: - success: - type: boolean - error: - type: string - user_json: - $ref: '#/components/schemas/User' +# post: +# summary: Add new user +# requestBody: +# required: true +# content: +# application/json: +# schema: +# $ref: '#/components/schemas/User' +# responses: +# '200': +# description: Add result +# content: +# application/json: +# schema: +# type: object +# properties: +# success: +# type: boolean +# error: +# type: string +# user_json: +# $ref: '#/components/schemas/User' - /users/{user_id}/titles: - get: - summary: Get user titles - parameters: - - in: path - name: user_id - required: true - schema: - type: string - - in: query - name: query - schema: - type: string - - in: query - name: limit - schema: - type: integer - default: 10 - - in: query - name: offset - schema: - type: integer - default: 0 - - in: query - name: fields - schema: - type: string - default: all - responses: - '200': - description: List of user titles - content: - application/json: - schema: - type: array - items: - $ref: '#/components/schemas/UserTitle' - '204': - description: No titles found +# /users/{user_id}/titles: +# get: +# summary: Get user titles +# parameters: +# - in: path +# name: user_id +# required: true +# schema: +# type: string +# - in: query +# name: query +# schema: +# type: string +# - in: query +# name: limit +# schema: +# type: integer +# default: 10 +# - in: query +# name: offset +# schema: +# type: integer +# default: 0 +# - in: query +# name: fields +# schema: +# type: string +# default: all +# responses: +# '200': +# description: List of user titles +# content: +# application/json: +# schema: +# type: array +# items: +# $ref: '#/components/schemas/UserTitle' +# '204': +# description: No titles found - post: - summary: Add user title - parameters: - - in: path - name: user_id - required: true - schema: - type: string - requestBody: - required: true - content: - application/json: - schema: - type: object - properties: - title_id: - type: string - status: - type: string - responses: - '200': - description: Add result - content: - application/json: - schema: - type: object - properties: - success: - type: boolean - error: - type: string +# post: +# summary: Add user title +# parameters: +# - in: path +# name: user_id +# required: true +# schema: +# type: string +# requestBody: +# required: true +# content: +# application/json: +# schema: +# type: object +# properties: +# title_id: +# type: string +# status: +# type: string +# responses: +# '200': +# description: Add result +# content: +# application/json: +# schema: +# type: object +# properties: +# success: +# type: boolean +# error: +# type: string - patch: - summary: Update user title - parameters: - - in: path - name: user_id - required: true - schema: - type: string - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/UserTitle' - responses: - '200': - description: Update result - content: - application/json: - schema: - type: object - properties: - success: - type: boolean - error: - type: string +# patch: +# summary: Update user title +# parameters: +# - in: path +# name: user_id +# required: true +# schema: +# type: string +# requestBody: +# required: true +# content: +# application/json: +# schema: +# $ref: '#/components/schemas/UserTitle' +# responses: +# '200': +# description: Update result +# content: +# application/json: +# schema: +# type: object +# properties: +# success: +# type: boolean +# error: +# type: string - delete: - summary: Delete user title - parameters: - - in: path - name: user_id - required: true - schema: - type: string - - in: query - name: title_id - schema: - type: string - responses: - '200': - description: Delete result - content: - application/json: - schema: - type: object - properties: - success: - type: boolean - error: - type: string +# delete: +# summary: Delete user title +# parameters: +# - in: path +# name: user_id +# required: true +# schema: +# type: string +# - in: query +# name: title_id +# schema: +# type: string +# responses: +# '200': +# description: Delete result +# content: +# application/json: +# schema: +# type: object +# properties: +# success: +# type: boolean +# error: +# type: string - /users/{user_id}/reviews: - get: - summary: Get user reviews - parameters: - - in: path - name: user_id - required: true - schema: - type: string - - in: query - name: limit - schema: - type: integer - default: 10 - - in: query - name: offset - schema: - type: integer - default: 0 - responses: - '200': - description: List of reviews - content: - application/json: - schema: - type: array - items: - $ref: '#/components/schemas/Review' +# /users/{user_id}/reviews: +# get: +# summary: Get user reviews +# parameters: +# - in: path +# name: user_id +# required: true +# schema: +# type: string +# - in: query +# name: limit +# schema: +# type: integer +# default: 10 +# - in: query +# name: offset +# schema: +# type: integer +# default: 0 +# responses: +# '200': +# description: List of reviews +# content: +# application/json: +# schema: +# type: array +# items: +# $ref: '#/components/schemas/Review' - /reviews: - post: - summary: Add review - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/Review' - responses: - '200': - description: Add result - content: - application/json: - schema: - type: object - properties: - success: - type: boolean - error: - type: string +# /reviews: +# post: +# summary: Add review +# requestBody: +# required: true +# content: +# application/json: +# schema: +# $ref: '#/components/schemas/Review' +# responses: +# '200': +# description: Add result +# content: +# application/json: +# schema: +# type: object +# properties: +# success: +# type: boolean +# error: +# type: string - /reviews/{review_id}: - patch: - summary: Update review - parameters: - - in: path - name: review_id - required: true - schema: - type: string - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/Review' - responses: - '200': - description: Update result - content: - application/json: - schema: - type: object - properties: - success: - type: boolean - error: - type: string - delete: - summary: Delete review - parameters: - - in: path - name: review_id - required: true - schema: - type: string - responses: - '200': - description: Delete result - content: - application/json: - schema: - type: object - properties: - success: - type: boolean - error: - type: string +# /reviews/{review_id}: +# patch: +# summary: Update review +# parameters: +# - in: path +# name: review_id +# required: true +# schema: +# type: string +# requestBody: +# required: true +# content: +# application/json: +# schema: +# $ref: '#/components/schemas/Review' +# responses: +# '200': +# description: Update result +# content: +# application/json: +# schema: +# type: object +# properties: +# success: +# type: boolean +# error: +# type: string +# delete: +# summary: Delete review +# parameters: +# - in: path +# name: review_id +# required: true +# schema: +# type: string +# responses: +# '200': +# description: Delete result +# content: +# application/json: +# schema: +# type: object +# properties: +# success: +# type: boolean +# error: +# type: string - /tags: - get: - summary: Get tags - parameters: - - in: query - name: limit - schema: - type: integer - default: 10 - - in: query - name: offset - schema: - type: integer - default: 0 - - in: query - name: fields - schema: - type: string - responses: - '200': - description: List of tags - content: - application/json: - schema: - type: array - items: - $ref: '#/components/schemas/Tag' +# /tags: +# get: +# summary: Get tags +# parameters: +# - in: query +# name: limit +# schema: +# type: integer +# default: 10 +# - in: query +# name: offset +# schema: +# type: integer +# default: 0 +# - in: query +# name: fields +# schema: +# type: string +# responses: +# '200': +# description: List of tags +# content: +# application/json: +# schema: +# type: array +# items: +# $ref: '#/components/schemas/Tag' - /media: - post: - summary: Upload image - responses: - '200': - description: Upload result - content: - application/json: - schema: - type: object - properties: - success: - type: boolean - error: - type: string - image_id: - type: string +# /media: +# post: +# summary: Upload image +# responses: +# '200': +# description: Upload result +# content: +# application/json: +# schema: +# type: object +# properties: +# success: +# type: boolean +# error: +# type: string +# image_id: +# type: string - get: - summary: Get image path - parameters: - - in: query - name: image_id - required: true - schema: - type: string - responses: - '200': - description: Image path - content: - application/json: - schema: - type: object - properties: - success: - type: boolean - error: - type: string - image_path: - type: string +# get: +# summary: Get image path +# parameters: +# - in: query +# name: image_id +# required: true +# schema: +# type: string +# responses: +# '200': +# description: Image path +# content: +# application/json: +# schema: +# type: object +# properties: +# success: +# type: boolean +# error: +# type: string +# image_path: +# type: string components: schemas: diff --git a/deploy/generate.sh b/deploy/generate.sh new file mode 100644 index 0000000..d7d94a2 --- /dev/null +++ b/deploy/generate.sh @@ -0,0 +1,3 @@ +npx openapi-typescript-codegen --input ..\..\api\openapi.yaml --output ./src/api --client axios +oapi-codegen --config=api/oapi-codegen.yaml .\api\openapi.yaml +sqlc generate -f .\sql\sqlc.yaml \ No newline at end of file diff --git a/modules/backend/go.mod b/go.mod similarity index 82% rename from modules/backend/go.mod rename to go.mod index d8e0cb3..b7a66f2 100644 --- a/modules/backend/go.mod +++ b/go.mod @@ -1,16 +1,23 @@ -module nyanimedb-server +module nyanimedb go 1.25.0 +require ( + github.com/gin-contrib/cors v1.7.6 + github.com/gin-gonic/gin v1.11.0 + github.com/jackc/pgx/v5 v5.7.6 + github.com/oapi-codegen/runtime v1.1.2 + github.com/pelletier/go-toml/v2 v2.2.4 + golang.org/x/crypto v0.40.0 +) + require ( github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/bytedance/sonic v1.14.0 // indirect github.com/bytedance/sonic/loader v0.3.0 // indirect github.com/cloudwego/base64x v0.1.6 // indirect github.com/gabriel-vasile/mimetype v1.4.9 // indirect - github.com/gin-contrib/cors v1.7.6 // indirect github.com/gin-contrib/sse v1.1.0 // indirect - github.com/gin-gonic/gin v1.11.0 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-playground/validator/v10 v10.27.0 // indirect @@ -19,23 +26,18 @@ require ( github.com/google/uuid v1.5.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect - github.com/jackc/pgx/v5 v5.7.6 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/cpuid/v2 v2.3.0 // indirect github.com/leodido/go-urn v1.4.0 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/oapi-codegen/runtime v1.1.2 // indirect - github.com/pelletier/go-toml/v2 v2.2.4 // indirect github.com/quic-go/qpack v0.5.1 // indirect github.com/quic-go/quic-go v0.54.0 // indirect - github.com/sirupsen/logrus v1.9.3 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.3.0 // indirect go.uber.org/mock v0.5.0 // indirect golang.org/x/arch v0.20.0 // indirect - golang.org/x/crypto v0.40.0 // indirect golang.org/x/mod v0.25.0 // indirect golang.org/x/net v0.42.0 // indirect golang.org/x/sync v0.16.0 // indirect diff --git a/modules/backend/go.sum b/go.sum similarity index 90% rename from modules/backend/go.sum rename to go.sum index a08eb1d..1af1a7c 100644 --- a/modules/backend/go.sum +++ b/go.sum @@ -9,9 +9,8 @@ github.com/bytedance/sonic/loader v0.3.0/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFos github.com/cloudwego/base64x v0.1.6 h1:t11wG9AECkCDk5fMSoxmufanudBtJ+/HemLstXDLI2M= github.com/cloudwego/base64x v0.1.6/go.mod h1:OFcloc187FXDaYHvrNIjxSe8ncn0OOM8gEHfghB2IPU= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM= -github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8= github.com/gabriel-vasile/mimetype v1.4.9 h1:5k+WDwEsD9eTLL8Tz3L0VnmVh9QxGjRmjBvAG7U/oYY= github.com/gabriel-vasile/mimetype v1.4.9/go.mod h1:WnSQhFKJuBlRyLiKohA/2DtIlPFAbguNaG7QCHcyGok= github.com/gin-contrib/cors v1.7.6 h1:3gQ8GMzs1Ylpf70y8bMw4fVpycXIeX1ZemuSQIsnQQY= @@ -20,18 +19,20 @@ github.com/gin-contrib/sse v1.1.0 h1:n0w2GMuUpWDVp7qSpvze6fAu9iRxJY4Hmj6AmBOU05w github.com/gin-contrib/sse v1.1.0/go.mod h1:hxRZ5gVpWMT7Z0B0gSNYqqsSCNIJMjzvm6fqCz9vjwM= github.com/gin-gonic/gin v1.11.0 h1:OW/6PLjyusp2PPXtyxKHU0RbX6I/l28FTdDlae5ueWk= github.com/gin-gonic/gin v1.11.0/go.mod h1:+iq/FyxlGzII0KHiBGjuNn4UNENUlKbGlNmc+W50Dls= +github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= +github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= github.com/go-playground/validator/v10 v10.27.0 h1:w8+XrWVMhGkxOaaowyKH35gFydVHOvC0/uWoy2Fzwn4= github.com/go-playground/validator/v10 v10.27.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo= -github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= -github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4= github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw= github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= +github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -41,6 +42,8 @@ github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7Ulw github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= github.com/jackc/pgx/v5 v5.7.6 h1:rWQc5FwZSPX58r1OQmkuaNicxdmExaEz5A2DO2hUuTk= github.com/jackc/pgx/v5 v5.7.6/go.mod h1:aruU7o91Tc2q2cFp5h4uP3f6ztExVpyVv88Xl/8Vl8M= +github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo= +github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d/go.mod h1:2PavIy+JPciBPrBUjwbNvtwB6RQlve+hkpll6QSNmOE= @@ -50,7 +53,6 @@ github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -60,13 +62,12 @@ github.com/oapi-codegen/runtime v1.1.2 h1:P2+CubHq8fO4Q6fV1tqDBZHCwpVpvPg7oKiYzQ github.com/oapi-codegen/runtime v1.1.2/go.mod h1:SK9X900oXmPWilYR5/WKPzt3Kqxn/uS/+lbpREv+eCg= github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4= github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI= github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg= github.com/quic-go/quic-go v0.54.0 h1:6s1YB9QotYI6Ospeiguknbp2Znb/jZYjZLRXn9kMQBg= github.com/quic-go/quic-go v0.54.0/go.mod h1:e68ZEaCdyviluZmy44P6Iey98v/Wfz6HCjQEm+l8zTY= -github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= -github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= @@ -76,6 +77,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= +github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v1.3.0 h1:Qd2W2sQawAfG8XSvzwhBeoGq71zXOC/Q1E9y/wUcsUA= @@ -92,8 +95,6 @@ golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs= golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8= golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw= golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= -golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ= -golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI= golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= @@ -105,4 +106,5 @@ google.golang.org/protobuf v1.36.9 h1:w2gp2mA27hUeUzj9Ex9FBjsBm40zfaDtEWow293U7I google.golang.org/protobuf v1.36.9/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/modules/backend/api/gen.go b/modules/backend/api/gen.go deleted file mode 100644 index 2dcb886..0000000 --- a/modules/backend/api/gen.go +++ /dev/null @@ -1,1958 +0,0 @@ -// Package api provides primitives to interact with the openapi HTTP API. -// -// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.5.0 DO NOT EDIT. -package api - -import ( - "context" - "encoding/json" - "fmt" - "net/http" - - "github.com/gin-gonic/gin" - "github.com/oapi-codegen/runtime" - strictgin "github.com/oapi-codegen/runtime/strictmiddleware/gin" -) - -// Review defines model for Review. -type Review map[string]interface{} - -// Tag defines model for Tag. -type Tag map[string]interface{} - -// Title defines model for Title. -type Title map[string]interface{} - -// User defines model for User. -type User map[string]interface{} - -// UserTitle defines model for UserTitle. -type UserTitle map[string]interface{} - -// GetMediaParams defines parameters for GetMedia. -type GetMediaParams struct { - ImageId string `form:"image_id" json:"image_id"` -} - -// GetTagsParams defines parameters for GetTags. -type GetTagsParams struct { - Limit *int `form:"limit,omitempty" json:"limit,omitempty"` - Offset *int `form:"offset,omitempty" json:"offset,omitempty"` - Fields *string `form:"fields,omitempty" json:"fields,omitempty"` -} - -// GetTitleParams defines parameters for GetTitle. -type GetTitleParams struct { - Query *string `form:"query,omitempty" json:"query,omitempty"` - Limit *int `form:"limit,omitempty" json:"limit,omitempty"` - Offset *int `form:"offset,omitempty" json:"offset,omitempty"` - Fields *string `form:"fields,omitempty" json:"fields,omitempty"` -} - -// GetTitleTitleIdParams defines parameters for GetTitleTitleId. -type GetTitleTitleIdParams struct { - Fields *string `form:"fields,omitempty" json:"fields,omitempty"` -} - -// GetTitleTitleIdReviewsParams defines parameters for GetTitleTitleIdReviews. -type GetTitleTitleIdReviewsParams struct { - Limit *int `form:"limit,omitempty" json:"limit,omitempty"` - Offset *int `form:"offset,omitempty" json:"offset,omitempty"` -} - -// GetUsersParams defines parameters for GetUsers. -type GetUsersParams struct { - Query *string `form:"query,omitempty" json:"query,omitempty"` - Fields *string `form:"fields,omitempty" json:"fields,omitempty"` -} - -// GetUsersUserIdParams defines parameters for GetUsersUserId. -type GetUsersUserIdParams struct { - Fields *string `form:"fields,omitempty" json:"fields,omitempty"` -} - -// GetUsersUserIdReviewsParams defines parameters for GetUsersUserIdReviews. -type GetUsersUserIdReviewsParams struct { - Limit *int `form:"limit,omitempty" json:"limit,omitempty"` - Offset *int `form:"offset,omitempty" json:"offset,omitempty"` -} - -// DeleteUsersUserIdTitlesParams defines parameters for DeleteUsersUserIdTitles. -type DeleteUsersUserIdTitlesParams struct { - TitleId *string `form:"title_id,omitempty" json:"title_id,omitempty"` -} - -// GetUsersUserIdTitlesParams defines parameters for GetUsersUserIdTitles. -type GetUsersUserIdTitlesParams struct { - Query *string `form:"query,omitempty" json:"query,omitempty"` - Limit *int `form:"limit,omitempty" json:"limit,omitempty"` - Offset *int `form:"offset,omitempty" json:"offset,omitempty"` - Fields *string `form:"fields,omitempty" json:"fields,omitempty"` -} - -// PostUsersUserIdTitlesJSONBody defines parameters for PostUsersUserIdTitles. -type PostUsersUserIdTitlesJSONBody struct { - Status *string `json:"status,omitempty"` - TitleId *string `json:"title_id,omitempty"` -} - -// PostReviewsJSONRequestBody defines body for PostReviews for application/json ContentType. -type PostReviewsJSONRequestBody = Review - -// PatchReviewsReviewIdJSONRequestBody defines body for PatchReviewsReviewId for application/json ContentType. -type PatchReviewsReviewIdJSONRequestBody = Review - -// PatchTitleTitleIdJSONRequestBody defines body for PatchTitleTitleId for application/json ContentType. -type PatchTitleTitleIdJSONRequestBody = Title - -// PostUsersJSONRequestBody defines body for PostUsers for application/json ContentType. -type PostUsersJSONRequestBody = User - -// PatchUsersUserIdJSONRequestBody defines body for PatchUsersUserId for application/json ContentType. -type PatchUsersUserIdJSONRequestBody = User - -// PatchUsersUserIdTitlesJSONRequestBody defines body for PatchUsersUserIdTitles for application/json ContentType. -type PatchUsersUserIdTitlesJSONRequestBody = UserTitle - -// PostUsersUserIdTitlesJSONRequestBody defines body for PostUsersUserIdTitles for application/json ContentType. -type PostUsersUserIdTitlesJSONRequestBody PostUsersUserIdTitlesJSONBody - -// ServerInterface represents all server handlers. -type ServerInterface interface { - // Get image path - // (GET /media) - GetMedia(c *gin.Context, params GetMediaParams) - // Upload image - // (POST /media) - PostMedia(c *gin.Context) - // Add review - // (POST /reviews) - PostReviews(c *gin.Context) - // Delete review - // (DELETE /reviews/{review_id}) - DeleteReviewsReviewId(c *gin.Context, reviewId string) - // Update review - // (PATCH /reviews/{review_id}) - PatchReviewsReviewId(c *gin.Context, reviewId string) - // Get tags - // (GET /tags) - GetTags(c *gin.Context, params GetTagsParams) - // Get titles - // (GET /title) - GetTitle(c *gin.Context, params GetTitleParams) - // Get title description - // (GET /title/{title_id}) - GetTitleTitleId(c *gin.Context, titleId string, params GetTitleTitleIdParams) - // Update title info - // (PATCH /title/{title_id}) - PatchTitleTitleId(c *gin.Context, titleId string) - // Get title reviews - // (GET /title/{title_id}/reviews) - GetTitleTitleIdReviews(c *gin.Context, titleId string, params GetTitleTitleIdReviewsParams) - // Search user - // (GET /users) - GetUsers(c *gin.Context, params GetUsersParams) - // Add new user - // (POST /users) - PostUsers(c *gin.Context) - // Delete user - // (DELETE /users/{user_id}) - DeleteUsersUserId(c *gin.Context, userId string) - // Get user info - // (GET /users/{user_id}) - GetUsersUserId(c *gin.Context, userId string, params GetUsersUserIdParams) - // Update user - // (PATCH /users/{user_id}) - PatchUsersUserId(c *gin.Context, userId string) - // Get user reviews - // (GET /users/{user_id}/reviews) - GetUsersUserIdReviews(c *gin.Context, userId string, params GetUsersUserIdReviewsParams) - // Delete user title - // (DELETE /users/{user_id}/titles) - DeleteUsersUserIdTitles(c *gin.Context, userId string, params DeleteUsersUserIdTitlesParams) - // Get user titles - // (GET /users/{user_id}/titles) - GetUsersUserIdTitles(c *gin.Context, userId string, params GetUsersUserIdTitlesParams) - // Update user title - // (PATCH /users/{user_id}/titles) - PatchUsersUserIdTitles(c *gin.Context, userId string) - // Add user title - // (POST /users/{user_id}/titles) - PostUsersUserIdTitles(c *gin.Context, userId string) -} - -// ServerInterfaceWrapper converts contexts to parameters. -type ServerInterfaceWrapper struct { - Handler ServerInterface - HandlerMiddlewares []MiddlewareFunc - ErrorHandler func(*gin.Context, error, int) -} - -type MiddlewareFunc func(c *gin.Context) - -// GetMedia operation middleware -func (siw *ServerInterfaceWrapper) GetMedia(c *gin.Context) { - - var err error - - // Parameter object where we will unmarshal all parameters from the context - var params GetMediaParams - - // ------------- Required query parameter "image_id" ------------- - - if paramValue := c.Query("image_id"); paramValue != "" { - - } else { - siw.ErrorHandler(c, fmt.Errorf("Query argument image_id is required, but not found"), http.StatusBadRequest) - return - } - - err = runtime.BindQueryParameter("form", true, true, "image_id", c.Request.URL.Query(), ¶ms.ImageId) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter image_id: %w", err), http.StatusBadRequest) - return - } - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.GetMedia(c, params) -} - -// PostMedia operation middleware -func (siw *ServerInterfaceWrapper) PostMedia(c *gin.Context) { - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.PostMedia(c) -} - -// PostReviews operation middleware -func (siw *ServerInterfaceWrapper) PostReviews(c *gin.Context) { - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.PostReviews(c) -} - -// DeleteReviewsReviewId operation middleware -func (siw *ServerInterfaceWrapper) DeleteReviewsReviewId(c *gin.Context) { - - var err error - - // ------------- Path parameter "review_id" ------------- - var reviewId string - - err = runtime.BindStyledParameterWithOptions("simple", "review_id", c.Param("review_id"), &reviewId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter review_id: %w", err), http.StatusBadRequest) - return - } - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.DeleteReviewsReviewId(c, reviewId) -} - -// PatchReviewsReviewId operation middleware -func (siw *ServerInterfaceWrapper) PatchReviewsReviewId(c *gin.Context) { - - var err error - - // ------------- Path parameter "review_id" ------------- - var reviewId string - - err = runtime.BindStyledParameterWithOptions("simple", "review_id", c.Param("review_id"), &reviewId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter review_id: %w", err), http.StatusBadRequest) - return - } - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.PatchReviewsReviewId(c, reviewId) -} - -// GetTags operation middleware -func (siw *ServerInterfaceWrapper) GetTags(c *gin.Context) { - - var err error - - // Parameter object where we will unmarshal all parameters from the context - var params GetTagsParams - - // ------------- Optional query parameter "limit" ------------- - - err = runtime.BindQueryParameter("form", true, false, "limit", c.Request.URL.Query(), ¶ms.Limit) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter limit: %w", err), http.StatusBadRequest) - return - } - - // ------------- Optional query parameter "offset" ------------- - - err = runtime.BindQueryParameter("form", true, false, "offset", c.Request.URL.Query(), ¶ms.Offset) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter offset: %w", err), http.StatusBadRequest) - return - } - - // ------------- Optional query parameter "fields" ------------- - - err = runtime.BindQueryParameter("form", true, false, "fields", c.Request.URL.Query(), ¶ms.Fields) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter fields: %w", err), http.StatusBadRequest) - return - } - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.GetTags(c, params) -} - -// GetTitle operation middleware -func (siw *ServerInterfaceWrapper) GetTitle(c *gin.Context) { - - var err error - - // Parameter object where we will unmarshal all parameters from the context - var params GetTitleParams - - // ------------- Optional query parameter "query" ------------- - - err = runtime.BindQueryParameter("form", true, false, "query", c.Request.URL.Query(), ¶ms.Query) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter query: %w", err), http.StatusBadRequest) - return - } - - // ------------- Optional query parameter "limit" ------------- - - err = runtime.BindQueryParameter("form", true, false, "limit", c.Request.URL.Query(), ¶ms.Limit) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter limit: %w", err), http.StatusBadRequest) - return - } - - // ------------- Optional query parameter "offset" ------------- - - err = runtime.BindQueryParameter("form", true, false, "offset", c.Request.URL.Query(), ¶ms.Offset) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter offset: %w", err), http.StatusBadRequest) - return - } - - // ------------- Optional query parameter "fields" ------------- - - err = runtime.BindQueryParameter("form", true, false, "fields", c.Request.URL.Query(), ¶ms.Fields) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter fields: %w", err), http.StatusBadRequest) - return - } - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.GetTitle(c, params) -} - -// GetTitleTitleId operation middleware -func (siw *ServerInterfaceWrapper) GetTitleTitleId(c *gin.Context) { - - var err error - - // ------------- Path parameter "title_id" ------------- - var titleId string - - err = runtime.BindStyledParameterWithOptions("simple", "title_id", c.Param("title_id"), &titleId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter title_id: %w", err), http.StatusBadRequest) - return - } - - // Parameter object where we will unmarshal all parameters from the context - var params GetTitleTitleIdParams - - // ------------- Optional query parameter "fields" ------------- - - err = runtime.BindQueryParameter("form", true, false, "fields", c.Request.URL.Query(), ¶ms.Fields) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter fields: %w", err), http.StatusBadRequest) - return - } - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.GetTitleTitleId(c, titleId, params) -} - -// PatchTitleTitleId operation middleware -func (siw *ServerInterfaceWrapper) PatchTitleTitleId(c *gin.Context) { - - var err error - - // ------------- Path parameter "title_id" ------------- - var titleId string - - err = runtime.BindStyledParameterWithOptions("simple", "title_id", c.Param("title_id"), &titleId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter title_id: %w", err), http.StatusBadRequest) - return - } - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.PatchTitleTitleId(c, titleId) -} - -// GetTitleTitleIdReviews operation middleware -func (siw *ServerInterfaceWrapper) GetTitleTitleIdReviews(c *gin.Context) { - - var err error - - // ------------- Path parameter "title_id" ------------- - var titleId string - - err = runtime.BindStyledParameterWithOptions("simple", "title_id", c.Param("title_id"), &titleId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter title_id: %w", err), http.StatusBadRequest) - return - } - - // Parameter object where we will unmarshal all parameters from the context - var params GetTitleTitleIdReviewsParams - - // ------------- Optional query parameter "limit" ------------- - - err = runtime.BindQueryParameter("form", true, false, "limit", c.Request.URL.Query(), ¶ms.Limit) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter limit: %w", err), http.StatusBadRequest) - return - } - - // ------------- Optional query parameter "offset" ------------- - - err = runtime.BindQueryParameter("form", true, false, "offset", c.Request.URL.Query(), ¶ms.Offset) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter offset: %w", err), http.StatusBadRequest) - return - } - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.GetTitleTitleIdReviews(c, titleId, params) -} - -// GetUsers operation middleware -func (siw *ServerInterfaceWrapper) GetUsers(c *gin.Context) { - - var err error - - // Parameter object where we will unmarshal all parameters from the context - var params GetUsersParams - - // ------------- Optional query parameter "query" ------------- - - err = runtime.BindQueryParameter("form", true, false, "query", c.Request.URL.Query(), ¶ms.Query) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter query: %w", err), http.StatusBadRequest) - return - } - - // ------------- Optional query parameter "fields" ------------- - - err = runtime.BindQueryParameter("form", true, false, "fields", c.Request.URL.Query(), ¶ms.Fields) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter fields: %w", err), http.StatusBadRequest) - return - } - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.GetUsers(c, params) -} - -// PostUsers operation middleware -func (siw *ServerInterfaceWrapper) PostUsers(c *gin.Context) { - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.PostUsers(c) -} - -// DeleteUsersUserId operation middleware -func (siw *ServerInterfaceWrapper) DeleteUsersUserId(c *gin.Context) { - - var err error - - // ------------- Path parameter "user_id" ------------- - var userId string - - err = runtime.BindStyledParameterWithOptions("simple", "user_id", c.Param("user_id"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter user_id: %w", err), http.StatusBadRequest) - return - } - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.DeleteUsersUserId(c, userId) -} - -// GetUsersUserId operation middleware -func (siw *ServerInterfaceWrapper) GetUsersUserId(c *gin.Context) { - - var err error - - // ------------- Path parameter "user_id" ------------- - var userId string - - err = runtime.BindStyledParameterWithOptions("simple", "user_id", c.Param("user_id"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter user_id: %w", err), http.StatusBadRequest) - return - } - - // Parameter object where we will unmarshal all parameters from the context - var params GetUsersUserIdParams - - // ------------- Optional query parameter "fields" ------------- - - err = runtime.BindQueryParameter("form", true, false, "fields", c.Request.URL.Query(), ¶ms.Fields) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter fields: %w", err), http.StatusBadRequest) - return - } - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.GetUsersUserId(c, userId, params) -} - -// PatchUsersUserId operation middleware -func (siw *ServerInterfaceWrapper) PatchUsersUserId(c *gin.Context) { - - var err error - - // ------------- Path parameter "user_id" ------------- - var userId string - - err = runtime.BindStyledParameterWithOptions("simple", "user_id", c.Param("user_id"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter user_id: %w", err), http.StatusBadRequest) - return - } - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.PatchUsersUserId(c, userId) -} - -// GetUsersUserIdReviews operation middleware -func (siw *ServerInterfaceWrapper) GetUsersUserIdReviews(c *gin.Context) { - - var err error - - // ------------- Path parameter "user_id" ------------- - var userId string - - err = runtime.BindStyledParameterWithOptions("simple", "user_id", c.Param("user_id"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter user_id: %w", err), http.StatusBadRequest) - return - } - - // Parameter object where we will unmarshal all parameters from the context - var params GetUsersUserIdReviewsParams - - // ------------- Optional query parameter "limit" ------------- - - err = runtime.BindQueryParameter("form", true, false, "limit", c.Request.URL.Query(), ¶ms.Limit) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter limit: %w", err), http.StatusBadRequest) - return - } - - // ------------- Optional query parameter "offset" ------------- - - err = runtime.BindQueryParameter("form", true, false, "offset", c.Request.URL.Query(), ¶ms.Offset) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter offset: %w", err), http.StatusBadRequest) - return - } - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.GetUsersUserIdReviews(c, userId, params) -} - -// DeleteUsersUserIdTitles operation middleware -func (siw *ServerInterfaceWrapper) DeleteUsersUserIdTitles(c *gin.Context) { - - var err error - - // ------------- Path parameter "user_id" ------------- - var userId string - - err = runtime.BindStyledParameterWithOptions("simple", "user_id", c.Param("user_id"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter user_id: %w", err), http.StatusBadRequest) - return - } - - // Parameter object where we will unmarshal all parameters from the context - var params DeleteUsersUserIdTitlesParams - - // ------------- Optional query parameter "title_id" ------------- - - err = runtime.BindQueryParameter("form", true, false, "title_id", c.Request.URL.Query(), ¶ms.TitleId) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter title_id: %w", err), http.StatusBadRequest) - return - } - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.DeleteUsersUserIdTitles(c, userId, params) -} - -// GetUsersUserIdTitles operation middleware -func (siw *ServerInterfaceWrapper) GetUsersUserIdTitles(c *gin.Context) { - - var err error - - // ------------- Path parameter "user_id" ------------- - var userId string - - err = runtime.BindStyledParameterWithOptions("simple", "user_id", c.Param("user_id"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter user_id: %w", err), http.StatusBadRequest) - return - } - - // Parameter object where we will unmarshal all parameters from the context - var params GetUsersUserIdTitlesParams - - // ------------- Optional query parameter "query" ------------- - - err = runtime.BindQueryParameter("form", true, false, "query", c.Request.URL.Query(), ¶ms.Query) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter query: %w", err), http.StatusBadRequest) - return - } - - // ------------- Optional query parameter "limit" ------------- - - err = runtime.BindQueryParameter("form", true, false, "limit", c.Request.URL.Query(), ¶ms.Limit) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter limit: %w", err), http.StatusBadRequest) - return - } - - // ------------- Optional query parameter "offset" ------------- - - err = runtime.BindQueryParameter("form", true, false, "offset", c.Request.URL.Query(), ¶ms.Offset) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter offset: %w", err), http.StatusBadRequest) - return - } - - // ------------- Optional query parameter "fields" ------------- - - err = runtime.BindQueryParameter("form", true, false, "fields", c.Request.URL.Query(), ¶ms.Fields) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter fields: %w", err), http.StatusBadRequest) - return - } - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.GetUsersUserIdTitles(c, userId, params) -} - -// PatchUsersUserIdTitles operation middleware -func (siw *ServerInterfaceWrapper) PatchUsersUserIdTitles(c *gin.Context) { - - var err error - - // ------------- Path parameter "user_id" ------------- - var userId string - - err = runtime.BindStyledParameterWithOptions("simple", "user_id", c.Param("user_id"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter user_id: %w", err), http.StatusBadRequest) - return - } - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.PatchUsersUserIdTitles(c, userId) -} - -// PostUsersUserIdTitles operation middleware -func (siw *ServerInterfaceWrapper) PostUsersUserIdTitles(c *gin.Context) { - - var err error - - // ------------- Path parameter "user_id" ------------- - var userId string - - err = runtime.BindStyledParameterWithOptions("simple", "user_id", c.Param("user_id"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter user_id: %w", err), http.StatusBadRequest) - return - } - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.PostUsersUserIdTitles(c, userId) -} - -// GinServerOptions provides options for the Gin server. -type GinServerOptions struct { - BaseURL string - Middlewares []MiddlewareFunc - ErrorHandler func(*gin.Context, error, int) -} - -// RegisterHandlers creates http.Handler with routing matching OpenAPI spec. -func RegisterHandlers(router gin.IRouter, si ServerInterface) { - RegisterHandlersWithOptions(router, si, GinServerOptions{}) -} - -// RegisterHandlersWithOptions creates http.Handler with additional options -func RegisterHandlersWithOptions(router gin.IRouter, si ServerInterface, options GinServerOptions) { - errorHandler := options.ErrorHandler - if errorHandler == nil { - errorHandler = func(c *gin.Context, err error, statusCode int) { - c.JSON(statusCode, gin.H{"msg": err.Error()}) - } - } - - wrapper := ServerInterfaceWrapper{ - Handler: si, - HandlerMiddlewares: options.Middlewares, - ErrorHandler: errorHandler, - } - - router.GET(options.BaseURL+"/media", wrapper.GetMedia) - router.POST(options.BaseURL+"/media", wrapper.PostMedia) - router.POST(options.BaseURL+"/reviews", wrapper.PostReviews) - router.DELETE(options.BaseURL+"/reviews/:review_id", wrapper.DeleteReviewsReviewId) - router.PATCH(options.BaseURL+"/reviews/:review_id", wrapper.PatchReviewsReviewId) - router.GET(options.BaseURL+"/tags", wrapper.GetTags) - router.GET(options.BaseURL+"/title", wrapper.GetTitle) - router.GET(options.BaseURL+"/title/:title_id", wrapper.GetTitleTitleId) - router.PATCH(options.BaseURL+"/title/:title_id", wrapper.PatchTitleTitleId) - router.GET(options.BaseURL+"/title/:title_id/reviews", wrapper.GetTitleTitleIdReviews) - router.GET(options.BaseURL+"/users", wrapper.GetUsers) - router.POST(options.BaseURL+"/users", wrapper.PostUsers) - router.DELETE(options.BaseURL+"/users/:user_id", wrapper.DeleteUsersUserId) - router.GET(options.BaseURL+"/users/:user_id", wrapper.GetUsersUserId) - router.PATCH(options.BaseURL+"/users/:user_id", wrapper.PatchUsersUserId) - router.GET(options.BaseURL+"/users/:user_id/reviews", wrapper.GetUsersUserIdReviews) - router.DELETE(options.BaseURL+"/users/:user_id/titles", wrapper.DeleteUsersUserIdTitles) - router.GET(options.BaseURL+"/users/:user_id/titles", wrapper.GetUsersUserIdTitles) - router.PATCH(options.BaseURL+"/users/:user_id/titles", wrapper.PatchUsersUserIdTitles) - router.POST(options.BaseURL+"/users/:user_id/titles", wrapper.PostUsersUserIdTitles) -} - -type GetMediaRequestObject struct { - Params GetMediaParams -} - -type GetMediaResponseObject interface { - VisitGetMediaResponse(w http.ResponseWriter) error -} - -type GetMedia200JSONResponse struct { - Error *string `json:"error,omitempty"` - ImagePath *string `json:"image_path,omitempty"` - Success *bool `json:"success,omitempty"` -} - -func (response GetMedia200JSONResponse) VisitGetMediaResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type PostMediaRequestObject struct { -} - -type PostMediaResponseObject interface { - VisitPostMediaResponse(w http.ResponseWriter) error -} - -type PostMedia200JSONResponse struct { - Error *string `json:"error,omitempty"` - ImageId *string `json:"image_id,omitempty"` - Success *bool `json:"success,omitempty"` -} - -func (response PostMedia200JSONResponse) VisitPostMediaResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type PostReviewsRequestObject struct { - Body *PostReviewsJSONRequestBody -} - -type PostReviewsResponseObject interface { - VisitPostReviewsResponse(w http.ResponseWriter) error -} - -type PostReviews200JSONResponse struct { - Error *string `json:"error,omitempty"` - Success *bool `json:"success,omitempty"` -} - -func (response PostReviews200JSONResponse) VisitPostReviewsResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type DeleteReviewsReviewIdRequestObject struct { - ReviewId string `json:"review_id"` -} - -type DeleteReviewsReviewIdResponseObject interface { - VisitDeleteReviewsReviewIdResponse(w http.ResponseWriter) error -} - -type DeleteReviewsReviewId200JSONResponse struct { - Error *string `json:"error,omitempty"` - Success *bool `json:"success,omitempty"` -} - -func (response DeleteReviewsReviewId200JSONResponse) VisitDeleteReviewsReviewIdResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type PatchReviewsReviewIdRequestObject struct { - ReviewId string `json:"review_id"` - Body *PatchReviewsReviewIdJSONRequestBody -} - -type PatchReviewsReviewIdResponseObject interface { - VisitPatchReviewsReviewIdResponse(w http.ResponseWriter) error -} - -type PatchReviewsReviewId200JSONResponse struct { - Error *string `json:"error,omitempty"` - Success *bool `json:"success,omitempty"` -} - -func (response PatchReviewsReviewId200JSONResponse) VisitPatchReviewsReviewIdResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type GetTagsRequestObject struct { - Params GetTagsParams -} - -type GetTagsResponseObject interface { - VisitGetTagsResponse(w http.ResponseWriter) error -} - -type GetTags200JSONResponse []Tag - -func (response GetTags200JSONResponse) VisitGetTagsResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type GetTitleRequestObject struct { - Params GetTitleParams -} - -type GetTitleResponseObject interface { - VisitGetTitleResponse(w http.ResponseWriter) error -} - -type GetTitle200JSONResponse []Title - -func (response GetTitle200JSONResponse) VisitGetTitleResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type GetTitle204Response struct { -} - -func (response GetTitle204Response) VisitGetTitleResponse(w http.ResponseWriter) error { - w.WriteHeader(204) - return nil -} - -type GetTitleTitleIdRequestObject struct { - TitleId string `json:"title_id"` - Params GetTitleTitleIdParams -} - -type GetTitleTitleIdResponseObject interface { - VisitGetTitleTitleIdResponse(w http.ResponseWriter) error -} - -type GetTitleTitleId200JSONResponse Title - -func (response GetTitleTitleId200JSONResponse) VisitGetTitleTitleIdResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type GetTitleTitleId404Response struct { -} - -func (response GetTitleTitleId404Response) VisitGetTitleTitleIdResponse(w http.ResponseWriter) error { - w.WriteHeader(404) - return nil -} - -type PatchTitleTitleIdRequestObject struct { - TitleId string `json:"title_id"` - Body *PatchTitleTitleIdJSONRequestBody -} - -type PatchTitleTitleIdResponseObject interface { - VisitPatchTitleTitleIdResponse(w http.ResponseWriter) error -} - -type PatchTitleTitleId200JSONResponse struct { - Error *string `json:"error,omitempty"` - Success *bool `json:"success,omitempty"` - UserJson *User `json:"user_json,omitempty"` -} - -func (response PatchTitleTitleId200JSONResponse) VisitPatchTitleTitleIdResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type GetTitleTitleIdReviewsRequestObject struct { - TitleId string `json:"title_id"` - Params GetTitleTitleIdReviewsParams -} - -type GetTitleTitleIdReviewsResponseObject interface { - VisitGetTitleTitleIdReviewsResponse(w http.ResponseWriter) error -} - -type GetTitleTitleIdReviews200JSONResponse []Review - -func (response GetTitleTitleIdReviews200JSONResponse) VisitGetTitleTitleIdReviewsResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type GetTitleTitleIdReviews204Response struct { -} - -func (response GetTitleTitleIdReviews204Response) VisitGetTitleTitleIdReviewsResponse(w http.ResponseWriter) error { - w.WriteHeader(204) - return nil -} - -type GetUsersRequestObject struct { - Params GetUsersParams -} - -type GetUsersResponseObject interface { - VisitGetUsersResponse(w http.ResponseWriter) error -} - -type GetUsers200JSONResponse []User - -func (response GetUsers200JSONResponse) VisitGetUsersResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type PostUsersRequestObject struct { - Body *PostUsersJSONRequestBody -} - -type PostUsersResponseObject interface { - VisitPostUsersResponse(w http.ResponseWriter) error -} - -type PostUsers200JSONResponse struct { - Error *string `json:"error,omitempty"` - Success *bool `json:"success,omitempty"` - UserJson *User `json:"user_json,omitempty"` -} - -func (response PostUsers200JSONResponse) VisitPostUsersResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type DeleteUsersUserIdRequestObject struct { - UserId string `json:"user_id"` -} - -type DeleteUsersUserIdResponseObject interface { - VisitDeleteUsersUserIdResponse(w http.ResponseWriter) error -} - -type DeleteUsersUserId200JSONResponse struct { - Error *string `json:"error,omitempty"` - Success *bool `json:"success,omitempty"` -} - -func (response DeleteUsersUserId200JSONResponse) VisitDeleteUsersUserIdResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type GetUsersUserIdRequestObject struct { - UserId string `json:"user_id"` - Params GetUsersUserIdParams -} - -type GetUsersUserIdResponseObject interface { - VisitGetUsersUserIdResponse(w http.ResponseWriter) error -} - -type GetUsersUserId200JSONResponse User - -func (response GetUsersUserId200JSONResponse) VisitGetUsersUserIdResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type GetUsersUserId404Response struct { -} - -func (response GetUsersUserId404Response) VisitGetUsersUserIdResponse(w http.ResponseWriter) error { - w.WriteHeader(404) - return nil -} - -type PatchUsersUserIdRequestObject struct { - UserId string `json:"user_id"` - Body *PatchUsersUserIdJSONRequestBody -} - -type PatchUsersUserIdResponseObject interface { - VisitPatchUsersUserIdResponse(w http.ResponseWriter) error -} - -type PatchUsersUserId200JSONResponse struct { - Error *string `json:"error,omitempty"` - Success *bool `json:"success,omitempty"` -} - -func (response PatchUsersUserId200JSONResponse) VisitPatchUsersUserIdResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type GetUsersUserIdReviewsRequestObject struct { - UserId string `json:"user_id"` - Params GetUsersUserIdReviewsParams -} - -type GetUsersUserIdReviewsResponseObject interface { - VisitGetUsersUserIdReviewsResponse(w http.ResponseWriter) error -} - -type GetUsersUserIdReviews200JSONResponse []Review - -func (response GetUsersUserIdReviews200JSONResponse) VisitGetUsersUserIdReviewsResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type DeleteUsersUserIdTitlesRequestObject struct { - UserId string `json:"user_id"` - Params DeleteUsersUserIdTitlesParams -} - -type DeleteUsersUserIdTitlesResponseObject interface { - VisitDeleteUsersUserIdTitlesResponse(w http.ResponseWriter) error -} - -type DeleteUsersUserIdTitles200JSONResponse struct { - Error *string `json:"error,omitempty"` - Success *bool `json:"success,omitempty"` -} - -func (response DeleteUsersUserIdTitles200JSONResponse) VisitDeleteUsersUserIdTitlesResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type GetUsersUserIdTitlesRequestObject struct { - UserId string `json:"user_id"` - Params GetUsersUserIdTitlesParams -} - -type GetUsersUserIdTitlesResponseObject interface { - VisitGetUsersUserIdTitlesResponse(w http.ResponseWriter) error -} - -type GetUsersUserIdTitles200JSONResponse []UserTitle - -func (response GetUsersUserIdTitles200JSONResponse) VisitGetUsersUserIdTitlesResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type GetUsersUserIdTitles204Response struct { -} - -func (response GetUsersUserIdTitles204Response) VisitGetUsersUserIdTitlesResponse(w http.ResponseWriter) error { - w.WriteHeader(204) - return nil -} - -type PatchUsersUserIdTitlesRequestObject struct { - UserId string `json:"user_id"` - Body *PatchUsersUserIdTitlesJSONRequestBody -} - -type PatchUsersUserIdTitlesResponseObject interface { - VisitPatchUsersUserIdTitlesResponse(w http.ResponseWriter) error -} - -type PatchUsersUserIdTitles200JSONResponse struct { - Error *string `json:"error,omitempty"` - Success *bool `json:"success,omitempty"` -} - -func (response PatchUsersUserIdTitles200JSONResponse) VisitPatchUsersUserIdTitlesResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -type PostUsersUserIdTitlesRequestObject struct { - UserId string `json:"user_id"` - Body *PostUsersUserIdTitlesJSONRequestBody -} - -type PostUsersUserIdTitlesResponseObject interface { - VisitPostUsersUserIdTitlesResponse(w http.ResponseWriter) error -} - -type PostUsersUserIdTitles200JSONResponse struct { - Error *string `json:"error,omitempty"` - Success *bool `json:"success,omitempty"` -} - -func (response PostUsersUserIdTitles200JSONResponse) VisitPostUsersUserIdTitlesResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - -// StrictServerInterface represents all server handlers. -type StrictServerInterface interface { - // Get image path - // (GET /media) - GetMedia(ctx context.Context, request GetMediaRequestObject) (GetMediaResponseObject, error) - // Upload image - // (POST /media) - PostMedia(ctx context.Context, request PostMediaRequestObject) (PostMediaResponseObject, error) - // Add review - // (POST /reviews) - PostReviews(ctx context.Context, request PostReviewsRequestObject) (PostReviewsResponseObject, error) - // Delete review - // (DELETE /reviews/{review_id}) - DeleteReviewsReviewId(ctx context.Context, request DeleteReviewsReviewIdRequestObject) (DeleteReviewsReviewIdResponseObject, error) - // Update review - // (PATCH /reviews/{review_id}) - PatchReviewsReviewId(ctx context.Context, request PatchReviewsReviewIdRequestObject) (PatchReviewsReviewIdResponseObject, error) - // Get tags - // (GET /tags) - GetTags(ctx context.Context, request GetTagsRequestObject) (GetTagsResponseObject, error) - // Get titles - // (GET /title) - GetTitle(ctx context.Context, request GetTitleRequestObject) (GetTitleResponseObject, error) - // Get title description - // (GET /title/{title_id}) - GetTitleTitleId(ctx context.Context, request GetTitleTitleIdRequestObject) (GetTitleTitleIdResponseObject, error) - // Update title info - // (PATCH /title/{title_id}) - PatchTitleTitleId(ctx context.Context, request PatchTitleTitleIdRequestObject) (PatchTitleTitleIdResponseObject, error) - // Get title reviews - // (GET /title/{title_id}/reviews) - GetTitleTitleIdReviews(ctx context.Context, request GetTitleTitleIdReviewsRequestObject) (GetTitleTitleIdReviewsResponseObject, error) - // Search user - // (GET /users) - GetUsers(ctx context.Context, request GetUsersRequestObject) (GetUsersResponseObject, error) - // Add new user - // (POST /users) - PostUsers(ctx context.Context, request PostUsersRequestObject) (PostUsersResponseObject, error) - // Delete user - // (DELETE /users/{user_id}) - DeleteUsersUserId(ctx context.Context, request DeleteUsersUserIdRequestObject) (DeleteUsersUserIdResponseObject, error) - // Get user info - // (GET /users/{user_id}) - GetUsersUserId(ctx context.Context, request GetUsersUserIdRequestObject) (GetUsersUserIdResponseObject, error) - // Update user - // (PATCH /users/{user_id}) - PatchUsersUserId(ctx context.Context, request PatchUsersUserIdRequestObject) (PatchUsersUserIdResponseObject, error) - // Get user reviews - // (GET /users/{user_id}/reviews) - GetUsersUserIdReviews(ctx context.Context, request GetUsersUserIdReviewsRequestObject) (GetUsersUserIdReviewsResponseObject, error) - // Delete user title - // (DELETE /users/{user_id}/titles) - DeleteUsersUserIdTitles(ctx context.Context, request DeleteUsersUserIdTitlesRequestObject) (DeleteUsersUserIdTitlesResponseObject, error) - // Get user titles - // (GET /users/{user_id}/titles) - GetUsersUserIdTitles(ctx context.Context, request GetUsersUserIdTitlesRequestObject) (GetUsersUserIdTitlesResponseObject, error) - // Update user title - // (PATCH /users/{user_id}/titles) - PatchUsersUserIdTitles(ctx context.Context, request PatchUsersUserIdTitlesRequestObject) (PatchUsersUserIdTitlesResponseObject, error) - // Add user title - // (POST /users/{user_id}/titles) - PostUsersUserIdTitles(ctx context.Context, request PostUsersUserIdTitlesRequestObject) (PostUsersUserIdTitlesResponseObject, error) -} - -type StrictHandlerFunc = strictgin.StrictGinHandlerFunc -type StrictMiddlewareFunc = strictgin.StrictGinMiddlewareFunc - -func NewStrictHandler(ssi StrictServerInterface, middlewares []StrictMiddlewareFunc) ServerInterface { - return &strictHandler{ssi: ssi, middlewares: middlewares} -} - -type strictHandler struct { - ssi StrictServerInterface - middlewares []StrictMiddlewareFunc -} - -// GetMedia operation middleware -func (sh *strictHandler) GetMedia(ctx *gin.Context, params GetMediaParams) { - var request GetMediaRequestObject - - request.Params = params - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.GetMedia(ctx, request.(GetMediaRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "GetMedia") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(GetMediaResponseObject); ok { - if err := validResponse.VisitGetMediaResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// PostMedia operation middleware -func (sh *strictHandler) PostMedia(ctx *gin.Context) { - var request PostMediaRequestObject - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.PostMedia(ctx, request.(PostMediaRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "PostMedia") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(PostMediaResponseObject); ok { - if err := validResponse.VisitPostMediaResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// PostReviews operation middleware -func (sh *strictHandler) PostReviews(ctx *gin.Context) { - var request PostReviewsRequestObject - - var body PostReviewsJSONRequestBody - if err := ctx.ShouldBindJSON(&body); err != nil { - ctx.Status(http.StatusBadRequest) - ctx.Error(err) - return - } - request.Body = &body - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.PostReviews(ctx, request.(PostReviewsRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "PostReviews") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(PostReviewsResponseObject); ok { - if err := validResponse.VisitPostReviewsResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// DeleteReviewsReviewId operation middleware -func (sh *strictHandler) DeleteReviewsReviewId(ctx *gin.Context, reviewId string) { - var request DeleteReviewsReviewIdRequestObject - - request.ReviewId = reviewId - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.DeleteReviewsReviewId(ctx, request.(DeleteReviewsReviewIdRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "DeleteReviewsReviewId") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(DeleteReviewsReviewIdResponseObject); ok { - if err := validResponse.VisitDeleteReviewsReviewIdResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// PatchReviewsReviewId operation middleware -func (sh *strictHandler) PatchReviewsReviewId(ctx *gin.Context, reviewId string) { - var request PatchReviewsReviewIdRequestObject - - request.ReviewId = reviewId - - var body PatchReviewsReviewIdJSONRequestBody - if err := ctx.ShouldBindJSON(&body); err != nil { - ctx.Status(http.StatusBadRequest) - ctx.Error(err) - return - } - request.Body = &body - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.PatchReviewsReviewId(ctx, request.(PatchReviewsReviewIdRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "PatchReviewsReviewId") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(PatchReviewsReviewIdResponseObject); ok { - if err := validResponse.VisitPatchReviewsReviewIdResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// GetTags operation middleware -func (sh *strictHandler) GetTags(ctx *gin.Context, params GetTagsParams) { - var request GetTagsRequestObject - - request.Params = params - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.GetTags(ctx, request.(GetTagsRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "GetTags") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(GetTagsResponseObject); ok { - if err := validResponse.VisitGetTagsResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// GetTitle operation middleware -func (sh *strictHandler) GetTitle(ctx *gin.Context, params GetTitleParams) { - var request GetTitleRequestObject - - request.Params = params - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.GetTitle(ctx, request.(GetTitleRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "GetTitle") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(GetTitleResponseObject); ok { - if err := validResponse.VisitGetTitleResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// GetTitleTitleId operation middleware -func (sh *strictHandler) GetTitleTitleId(ctx *gin.Context, titleId string, params GetTitleTitleIdParams) { - var request GetTitleTitleIdRequestObject - - request.TitleId = titleId - request.Params = params - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.GetTitleTitleId(ctx, request.(GetTitleTitleIdRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "GetTitleTitleId") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(GetTitleTitleIdResponseObject); ok { - if err := validResponse.VisitGetTitleTitleIdResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// PatchTitleTitleId operation middleware -func (sh *strictHandler) PatchTitleTitleId(ctx *gin.Context, titleId string) { - var request PatchTitleTitleIdRequestObject - - request.TitleId = titleId - - var body PatchTitleTitleIdJSONRequestBody - if err := ctx.ShouldBindJSON(&body); err != nil { - ctx.Status(http.StatusBadRequest) - ctx.Error(err) - return - } - request.Body = &body - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.PatchTitleTitleId(ctx, request.(PatchTitleTitleIdRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "PatchTitleTitleId") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(PatchTitleTitleIdResponseObject); ok { - if err := validResponse.VisitPatchTitleTitleIdResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// GetTitleTitleIdReviews operation middleware -func (sh *strictHandler) GetTitleTitleIdReviews(ctx *gin.Context, titleId string, params GetTitleTitleIdReviewsParams) { - var request GetTitleTitleIdReviewsRequestObject - - request.TitleId = titleId - request.Params = params - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.GetTitleTitleIdReviews(ctx, request.(GetTitleTitleIdReviewsRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "GetTitleTitleIdReviews") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(GetTitleTitleIdReviewsResponseObject); ok { - if err := validResponse.VisitGetTitleTitleIdReviewsResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// GetUsers operation middleware -func (sh *strictHandler) GetUsers(ctx *gin.Context, params GetUsersParams) { - var request GetUsersRequestObject - - request.Params = params - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.GetUsers(ctx, request.(GetUsersRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "GetUsers") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(GetUsersResponseObject); ok { - if err := validResponse.VisitGetUsersResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// PostUsers operation middleware -func (sh *strictHandler) PostUsers(ctx *gin.Context) { - var request PostUsersRequestObject - - var body PostUsersJSONRequestBody - if err := ctx.ShouldBindJSON(&body); err != nil { - ctx.Status(http.StatusBadRequest) - ctx.Error(err) - return - } - request.Body = &body - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.PostUsers(ctx, request.(PostUsersRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "PostUsers") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(PostUsersResponseObject); ok { - if err := validResponse.VisitPostUsersResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// DeleteUsersUserId operation middleware -func (sh *strictHandler) DeleteUsersUserId(ctx *gin.Context, userId string) { - var request DeleteUsersUserIdRequestObject - - request.UserId = userId - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.DeleteUsersUserId(ctx, request.(DeleteUsersUserIdRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "DeleteUsersUserId") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(DeleteUsersUserIdResponseObject); ok { - if err := validResponse.VisitDeleteUsersUserIdResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// GetUsersUserId operation middleware -func (sh *strictHandler) GetUsersUserId(ctx *gin.Context, userId string, params GetUsersUserIdParams) { - var request GetUsersUserIdRequestObject - - request.UserId = userId - request.Params = params - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.GetUsersUserId(ctx, request.(GetUsersUserIdRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "GetUsersUserId") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(GetUsersUserIdResponseObject); ok { - if err := validResponse.VisitGetUsersUserIdResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// PatchUsersUserId operation middleware -func (sh *strictHandler) PatchUsersUserId(ctx *gin.Context, userId string) { - var request PatchUsersUserIdRequestObject - - request.UserId = userId - - var body PatchUsersUserIdJSONRequestBody - if err := ctx.ShouldBindJSON(&body); err != nil { - ctx.Status(http.StatusBadRequest) - ctx.Error(err) - return - } - request.Body = &body - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.PatchUsersUserId(ctx, request.(PatchUsersUserIdRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "PatchUsersUserId") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(PatchUsersUserIdResponseObject); ok { - if err := validResponse.VisitPatchUsersUserIdResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// GetUsersUserIdReviews operation middleware -func (sh *strictHandler) GetUsersUserIdReviews(ctx *gin.Context, userId string, params GetUsersUserIdReviewsParams) { - var request GetUsersUserIdReviewsRequestObject - - request.UserId = userId - request.Params = params - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.GetUsersUserIdReviews(ctx, request.(GetUsersUserIdReviewsRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "GetUsersUserIdReviews") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(GetUsersUserIdReviewsResponseObject); ok { - if err := validResponse.VisitGetUsersUserIdReviewsResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// DeleteUsersUserIdTitles operation middleware -func (sh *strictHandler) DeleteUsersUserIdTitles(ctx *gin.Context, userId string, params DeleteUsersUserIdTitlesParams) { - var request DeleteUsersUserIdTitlesRequestObject - - request.UserId = userId - request.Params = params - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.DeleteUsersUserIdTitles(ctx, request.(DeleteUsersUserIdTitlesRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "DeleteUsersUserIdTitles") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(DeleteUsersUserIdTitlesResponseObject); ok { - if err := validResponse.VisitDeleteUsersUserIdTitlesResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// GetUsersUserIdTitles operation middleware -func (sh *strictHandler) GetUsersUserIdTitles(ctx *gin.Context, userId string, params GetUsersUserIdTitlesParams) { - var request GetUsersUserIdTitlesRequestObject - - request.UserId = userId - request.Params = params - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.GetUsersUserIdTitles(ctx, request.(GetUsersUserIdTitlesRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "GetUsersUserIdTitles") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(GetUsersUserIdTitlesResponseObject); ok { - if err := validResponse.VisitGetUsersUserIdTitlesResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// PatchUsersUserIdTitles operation middleware -func (sh *strictHandler) PatchUsersUserIdTitles(ctx *gin.Context, userId string) { - var request PatchUsersUserIdTitlesRequestObject - - request.UserId = userId - - var body PatchUsersUserIdTitlesJSONRequestBody - if err := ctx.ShouldBindJSON(&body); err != nil { - ctx.Status(http.StatusBadRequest) - ctx.Error(err) - return - } - request.Body = &body - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.PatchUsersUserIdTitles(ctx, request.(PatchUsersUserIdTitlesRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "PatchUsersUserIdTitles") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(PatchUsersUserIdTitlesResponseObject); ok { - if err := validResponse.VisitPatchUsersUserIdTitlesResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - -// PostUsersUserIdTitles operation middleware -func (sh *strictHandler) PostUsersUserIdTitles(ctx *gin.Context, userId string) { - var request PostUsersUserIdTitlesRequestObject - - request.UserId = userId - - var body PostUsersUserIdTitlesJSONRequestBody - if err := ctx.ShouldBindJSON(&body); err != nil { - ctx.Status(http.StatusBadRequest) - ctx.Error(err) - return - } - request.Body = &body - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.PostUsersUserIdTitles(ctx, request.(PostUsersUserIdTitlesRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "PostUsersUserIdTitles") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(PostUsersUserIdTitlesResponseObject); ok { - if err := validResponse.VisitPostUsersUserIdTitlesResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} diff --git a/modules/backend/db/query.sql.go b/modules/backend/db/query.sql.go deleted file mode 100644 index 1fc06ac..0000000 --- a/modules/backend/db/query.sql.go +++ /dev/null @@ -1,712 +0,0 @@ -// Code generated by sqlc. DO NOT EDIT. -// versions: -// sqlc v1.30.0 -// source: query.sql - -package db - -import ( - "context" - - "github.com/jackc/pgx/v5/pgtype" -) - -const createImage = `-- name: CreateImage :one -INSERT INTO images (storage_type, image_path) -VALUES ($1, $2) -RETURNING image_id, storage_type, image_path -` - -type CreateImageParams struct { - StorageType StorageTypeT `db:"storage_type" json:"storage_type"` - ImagePath string `db:"image_path" json:"image_path"` -} - -func (q *Queries) CreateImage(ctx context.Context, arg CreateImageParams) (Images, error) { - row := q.db.QueryRow(ctx, createImage, arg.StorageType, arg.ImagePath) - var i Images - err := row.Scan(&i.ImageID, &i.StorageType, &i.ImagePath) - return i, err -} - -const createReview = `-- name: CreateReview :one -INSERT INTO reviews (user_id, title_id, image_ids, review_text, creation_date) -VALUES ($1, $2, $3, $4, $5) -RETURNING review_id, user_id, title_id, image_ids, review_text, creation_date -` - -type CreateReviewParams struct { - UserID int32 `db:"user_id" json:"user_id"` - TitleID int32 `db:"title_id" json:"title_id"` - ImageIds []int32 `db:"image_ids" json:"image_ids"` - ReviewText string `db:"review_text" json:"review_text"` - CreationDate pgtype.Timestamp `db:"creation_date" json:"creation_date"` -} - -func (q *Queries) CreateReview(ctx context.Context, arg CreateReviewParams) (Reviews, error) { - row := q.db.QueryRow(ctx, createReview, - arg.UserID, - arg.TitleID, - arg.ImageIds, - arg.ReviewText, - arg.CreationDate, - ) - var i Reviews - err := row.Scan( - &i.ReviewID, - &i.UserID, - &i.TitleID, - &i.ImageIds, - &i.ReviewText, - &i.CreationDate, - ) - return i, err -} - -const createUser = `-- name: CreateUser :one -INSERT INTO users (avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date) -VALUES ($1, $2, $3, $4, $5, $6, $7) -RETURNING user_id, avatar_id, nickname, disp_name, user_desc, creation_date -` - -type CreateUserParams struct { - AvatarID pgtype.Int4 `db:"avatar_id" json:"avatar_id"` - Passhash string `db:"passhash" json:"passhash"` - Mail pgtype.Text `db:"mail" json:"mail"` - Nickname string `db:"nickname" json:"nickname"` - DispName pgtype.Text `db:"disp_name" json:"disp_name"` - UserDesc pgtype.Text `db:"user_desc" json:"user_desc"` - CreationDate pgtype.Timestamp `db:"creation_date" json:"creation_date"` -} - -type CreateUserRow struct { - UserID int32 `db:"user_id" json:"user_id"` - AvatarID pgtype.Int4 `db:"avatar_id" json:"avatar_id"` - Nickname string `db:"nickname" json:"nickname"` - DispName pgtype.Text `db:"disp_name" json:"disp_name"` - UserDesc pgtype.Text `db:"user_desc" json:"user_desc"` - CreationDate pgtype.Timestamp `db:"creation_date" json:"creation_date"` -} - -func (q *Queries) CreateUser(ctx context.Context, arg CreateUserParams) (CreateUserRow, error) { - row := q.db.QueryRow(ctx, createUser, - arg.AvatarID, - arg.Passhash, - arg.Mail, - arg.Nickname, - arg.DispName, - arg.UserDesc, - arg.CreationDate, - ) - var i CreateUserRow - err := row.Scan( - &i.UserID, - &i.AvatarID, - &i.Nickname, - &i.DispName, - &i.UserDesc, - &i.CreationDate, - ) - return i, err -} - -const createUserTitle = `-- name: CreateUserTitle :one -INSERT INTO usertitles (user_id, title_id, status, rate, review_id) -VALUES ($1, $2, $3, $4, $5) -RETURNING usertitle_id, user_id, title_id, status, rate, review_id -` - -type CreateUserTitleParams struct { - UserID int32 `db:"user_id" json:"user_id"` - TitleID int32 `db:"title_id" json:"title_id"` - Status UsertitleStatusT `db:"status" json:"status"` - Rate pgtype.Int4 `db:"rate" json:"rate"` - ReviewID pgtype.Int4 `db:"review_id" json:"review_id"` -} - -func (q *Queries) CreateUserTitle(ctx context.Context, arg CreateUserTitleParams) (Usertitles, error) { - row := q.db.QueryRow(ctx, createUserTitle, - arg.UserID, - arg.TitleID, - arg.Status, - arg.Rate, - arg.ReviewID, - ) - var i Usertitles - err := row.Scan( - &i.UsertitleID, - &i.UserID, - &i.TitleID, - &i.Status, - &i.Rate, - &i.ReviewID, - ) - return i, err -} - -const deleteReview = `-- name: DeleteReview :exec -DELETE FROM reviews -WHERE review_id = $1 -` - -func (q *Queries) DeleteReview(ctx context.Context, reviewID int32) error { - _, err := q.db.Exec(ctx, deleteReview, reviewID) - return err -} - -const deleteUser = `-- name: DeleteUser :exec -DELETE FROM users -WHERE user_id = $1 -` - -func (q *Queries) DeleteUser(ctx context.Context, userID int32) error { - _, err := q.db.Exec(ctx, deleteUser, userID) - return err -} - -const deleteUserTitle = `-- name: DeleteUserTitle :exec -DELETE FROM usertitles -WHERE user_id = $1 AND ($2::int IS NULL OR title_id = $2) -` - -type DeleteUserTitleParams struct { - UserID int32 `db:"user_id" json:"user_id"` - Column2 int32 `db:"column_2" json:"column_2"` -} - -func (q *Queries) DeleteUserTitle(ctx context.Context, arg DeleteUserTitleParams) error { - _, err := q.db.Exec(ctx, deleteUserTitle, arg.UserID, arg.Column2) - return err -} - -const getImageByID = `-- name: GetImageByID :one -SELECT image_id, storage_type, image_path -FROM images -WHERE image_id = $1 -` - -func (q *Queries) GetImageByID(ctx context.Context, imageID int32) (Images, error) { - row := q.db.QueryRow(ctx, getImageByID, imageID) - var i Images - err := row.Scan(&i.ImageID, &i.StorageType, &i.ImagePath) - return i, err -} - -const getReviewByID = `-- name: GetReviewByID :one -SELECT review_id, user_id, title_id, image_ids, review_text, creation_date -FROM reviews -WHERE review_id = $1 -` - -func (q *Queries) GetReviewByID(ctx context.Context, reviewID int32) (Reviews, error) { - row := q.db.QueryRow(ctx, getReviewByID, reviewID) - var i Reviews - err := row.Scan( - &i.ReviewID, - &i.UserID, - &i.TitleID, - &i.ImageIds, - &i.ReviewText, - &i.CreationDate, - ) - return i, err -} - -const getTitleByID = `-- name: GetTitleByID :one -SELECT title_id, title_names, studio_id, poster_id, signal_ids, - title_status, rating, rating_count, release_year, release_season, - season, episodes_aired, episodes_all, episodes_len -FROM titles -WHERE title_id = $1 -` - -func (q *Queries) GetTitleByID(ctx context.Context, titleID int32) (Titles, error) { - row := q.db.QueryRow(ctx, getTitleByID, titleID) - var i Titles - err := row.Scan( - &i.TitleID, - &i.TitleNames, - &i.StudioID, - &i.PosterID, - &i.SignalIds, - &i.TitleStatus, - &i.Rating, - &i.RatingCount, - &i.ReleaseYear, - &i.ReleaseSeason, - &i.Season, - &i.EpisodesAired, - &i.EpisodesAll, - &i.EpisodesLen, - ) - return i, err -} - -const getUserByID = `-- name: GetUserByID :one -SELECT user_id, avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date -FROM users -WHERE user_id = $1 -` - -func (q *Queries) GetUserByID(ctx context.Context, userID int32) (Users, error) { - row := q.db.QueryRow(ctx, getUserByID, userID) - var i Users - err := row.Scan( - &i.UserID, - &i.AvatarID, - &i.Passhash, - &i.Mail, - &i.Nickname, - &i.DispName, - &i.UserDesc, - &i.CreationDate, - ) - return i, err -} - -const getUserTitle = `-- name: GetUserTitle :one -SELECT usertitle_id, user_id, title_id, status, rate, review_id -FROM usertitles -WHERE user_id = $1 AND title_id = $2 -` - -type GetUserTitleParams struct { - UserID int32 `db:"user_id" json:"user_id"` - TitleID int32 `db:"title_id" json:"title_id"` -} - -func (q *Queries) GetUserTitle(ctx context.Context, arg GetUserTitleParams) (Usertitles, error) { - row := q.db.QueryRow(ctx, getUserTitle, arg.UserID, arg.TitleID) - var i Usertitles - err := row.Scan( - &i.UsertitleID, - &i.UserID, - &i.TitleID, - &i.Status, - &i.Rate, - &i.ReviewID, - ) - return i, err -} - -const listReviewsByTitle = `-- name: ListReviewsByTitle :many -SELECT review_id, user_id, title_id, image_ids, review_text, creation_date -FROM reviews -WHERE title_id = $1 -ORDER BY creation_date DESC -LIMIT $2 OFFSET $3 -` - -type ListReviewsByTitleParams struct { - TitleID int32 `db:"title_id" json:"title_id"` - Limit int32 `db:"limit" json:"limit"` - Offset int32 `db:"offset" json:"offset"` -} - -func (q *Queries) ListReviewsByTitle(ctx context.Context, arg ListReviewsByTitleParams) ([]Reviews, error) { - rows, err := q.db.Query(ctx, listReviewsByTitle, arg.TitleID, arg.Limit, arg.Offset) - if err != nil { - return nil, err - } - defer rows.Close() - var items []Reviews - for rows.Next() { - var i Reviews - if err := rows.Scan( - &i.ReviewID, - &i.UserID, - &i.TitleID, - &i.ImageIds, - &i.ReviewText, - &i.CreationDate, - ); err != nil { - return nil, err - } - items = append(items, i) - } - if err := rows.Err(); err != nil { - return nil, err - } - return items, nil -} - -const listReviewsByUser = `-- name: ListReviewsByUser :many -SELECT review_id, user_id, title_id, image_ids, review_text, creation_date -FROM reviews -WHERE user_id = $1 -ORDER BY creation_date DESC -LIMIT $2 OFFSET $3 -` - -type ListReviewsByUserParams struct { - UserID int32 `db:"user_id" json:"user_id"` - Limit int32 `db:"limit" json:"limit"` - Offset int32 `db:"offset" json:"offset"` -} - -func (q *Queries) ListReviewsByUser(ctx context.Context, arg ListReviewsByUserParams) ([]Reviews, error) { - rows, err := q.db.Query(ctx, listReviewsByUser, arg.UserID, arg.Limit, arg.Offset) - if err != nil { - return nil, err - } - defer rows.Close() - var items []Reviews - for rows.Next() { - var i Reviews - if err := rows.Scan( - &i.ReviewID, - &i.UserID, - &i.TitleID, - &i.ImageIds, - &i.ReviewText, - &i.CreationDate, - ); err != nil { - return nil, err - } - items = append(items, i) - } - if err := rows.Err(); err != nil { - return nil, err - } - return items, nil -} - -const listTags = `-- name: ListTags :many -SELECT tag_id, tag_names -FROM tags -ORDER BY tag_id -LIMIT $1 OFFSET $2 -` - -type ListTagsParams struct { - Limit int32 `db:"limit" json:"limit"` - Offset int32 `db:"offset" json:"offset"` -} - -func (q *Queries) ListTags(ctx context.Context, arg ListTagsParams) ([]Tags, error) { - rows, err := q.db.Query(ctx, listTags, arg.Limit, arg.Offset) - if err != nil { - return nil, err - } - defer rows.Close() - var items []Tags - for rows.Next() { - var i Tags - if err := rows.Scan(&i.TagID, &i.TagNames); err != nil { - return nil, err - } - items = append(items, i) - } - if err := rows.Err(); err != nil { - return nil, err - } - return items, nil -} - -const listTitles = `-- name: ListTitles :many -SELECT title_id, title_names, studio_id, poster_id, signal_ids, - title_status, rating, rating_count, release_year, release_season, - season, episodes_aired, episodes_all, episodes_len -FROM titles -ORDER BY title_id -LIMIT $1 OFFSET $2 -` - -type ListTitlesParams struct { - Limit int32 `db:"limit" json:"limit"` - Offset int32 `db:"offset" json:"offset"` -} - -func (q *Queries) ListTitles(ctx context.Context, arg ListTitlesParams) ([]Titles, error) { - rows, err := q.db.Query(ctx, listTitles, arg.Limit, arg.Offset) - if err != nil { - return nil, err - } - defer rows.Close() - var items []Titles - for rows.Next() { - var i Titles - if err := rows.Scan( - &i.TitleID, - &i.TitleNames, - &i.StudioID, - &i.PosterID, - &i.SignalIds, - &i.TitleStatus, - &i.Rating, - &i.RatingCount, - &i.ReleaseYear, - &i.ReleaseSeason, - &i.Season, - &i.EpisodesAired, - &i.EpisodesAll, - &i.EpisodesLen, - ); err != nil { - return nil, err - } - items = append(items, i) - } - if err := rows.Err(); err != nil { - return nil, err - } - return items, nil -} - -const listUserTitles = `-- name: ListUserTitles :many -SELECT usertitle_id, user_id, title_id, status, rate, review_id -FROM usertitles -WHERE user_id = $1 -ORDER BY usertitle_id -LIMIT $2 OFFSET $3 -` - -type ListUserTitlesParams struct { - UserID int32 `db:"user_id" json:"user_id"` - Limit int32 `db:"limit" json:"limit"` - Offset int32 `db:"offset" json:"offset"` -} - -func (q *Queries) ListUserTitles(ctx context.Context, arg ListUserTitlesParams) ([]Usertitles, error) { - rows, err := q.db.Query(ctx, listUserTitles, arg.UserID, arg.Limit, arg.Offset) - if err != nil { - return nil, err - } - defer rows.Close() - var items []Usertitles - for rows.Next() { - var i Usertitles - if err := rows.Scan( - &i.UsertitleID, - &i.UserID, - &i.TitleID, - &i.Status, - &i.Rate, - &i.ReviewID, - ); err != nil { - return nil, err - } - items = append(items, i) - } - if err := rows.Err(); err != nil { - return nil, err - } - return items, nil -} - -const listUsers = `-- name: ListUsers :many -SELECT user_id, avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date -FROM users -ORDER BY user_id -LIMIT $1 OFFSET $2 -` - -type ListUsersParams struct { - Limit int32 `db:"limit" json:"limit"` - Offset int32 `db:"offset" json:"offset"` -} - -func (q *Queries) ListUsers(ctx context.Context, arg ListUsersParams) ([]Users, error) { - rows, err := q.db.Query(ctx, listUsers, arg.Limit, arg.Offset) - if err != nil { - return nil, err - } - defer rows.Close() - var items []Users - for rows.Next() { - var i Users - if err := rows.Scan( - &i.UserID, - &i.AvatarID, - &i.Passhash, - &i.Mail, - &i.Nickname, - &i.DispName, - &i.UserDesc, - &i.CreationDate, - ); err != nil { - return nil, err - } - items = append(items, i) - } - if err := rows.Err(); err != nil { - return nil, err - } - return items, nil -} - -const updateReview = `-- name: UpdateReview :one -UPDATE reviews -SET - image_ids = COALESCE($1, image_ids), - review_text = COALESCE($2, review_text) -WHERE review_id = $3 -RETURNING review_id, user_id, title_id, image_ids, review_text, creation_date -` - -type UpdateReviewParams struct { - ImageIds []int32 `db:"image_ids" json:"image_ids"` - ReviewText pgtype.Text `db:"review_text" json:"review_text"` - ReviewID int32 `db:"review_id" json:"review_id"` -} - -func (q *Queries) UpdateReview(ctx context.Context, arg UpdateReviewParams) (Reviews, error) { - row := q.db.QueryRow(ctx, updateReview, arg.ImageIds, arg.ReviewText, arg.ReviewID) - var i Reviews - err := row.Scan( - &i.ReviewID, - &i.UserID, - &i.TitleID, - &i.ImageIds, - &i.ReviewText, - &i.CreationDate, - ) - return i, err -} - -const updateTitle = `-- name: UpdateTitle :one -UPDATE titles -SET - title_names = COALESCE($1, title_names), - studio_id = COALESCE($2, studio_id), - poster_id = COALESCE($3, poster_id), - signal_ids = COALESCE($4, signal_ids), - title_status = COALESCE($5, title_status), - release_year = COALESCE($6, release_year), - release_season = COALESCE($7, release_season), - episodes_aired = COALESCE($8, episodes_aired), - episodes_all = COALESCE($9, episodes_all), - episodes_len = COALESCE($10, episodes_len) -WHERE title_id = $11 -RETURNING title_id, title_names, studio_id, poster_id, signal_ids, title_status, rating, rating_count, release_year, release_season, season, episodes_aired, episodes_all, episodes_len -` - -type UpdateTitleParams struct { - TitleNames []byte `db:"title_names" json:"title_names"` - StudioID pgtype.Int4 `db:"studio_id" json:"studio_id"` - PosterID pgtype.Int4 `db:"poster_id" json:"poster_id"` - SignalIds []int32 `db:"signal_ids" json:"signal_ids"` - TitleStatus NullTitleStatusT `db:"title_status" json:"title_status"` - ReleaseYear pgtype.Int4 `db:"release_year" json:"release_year"` - ReleaseSeason NullReleaseSeasonT `db:"release_season" json:"release_season"` - EpisodesAired pgtype.Int4 `db:"episodes_aired" json:"episodes_aired"` - EpisodesAll pgtype.Int4 `db:"episodes_all" json:"episodes_all"` - EpisodesLen []byte `db:"episodes_len" json:"episodes_len"` - TitleID int32 `db:"title_id" json:"title_id"` -} - -func (q *Queries) UpdateTitle(ctx context.Context, arg UpdateTitleParams) (Titles, error) { - row := q.db.QueryRow(ctx, updateTitle, - arg.TitleNames, - arg.StudioID, - arg.PosterID, - arg.SignalIds, - arg.TitleStatus, - arg.ReleaseYear, - arg.ReleaseSeason, - arg.EpisodesAired, - arg.EpisodesAll, - arg.EpisodesLen, - arg.TitleID, - ) - var i Titles - err := row.Scan( - &i.TitleID, - &i.TitleNames, - &i.StudioID, - &i.PosterID, - &i.SignalIds, - &i.TitleStatus, - &i.Rating, - &i.RatingCount, - &i.ReleaseYear, - &i.ReleaseSeason, - &i.Season, - &i.EpisodesAired, - &i.EpisodesAll, - &i.EpisodesLen, - ) - return i, err -} - -const updateUser = `-- name: UpdateUser :one -UPDATE users -SET - avatar_id = COALESCE($1, avatar_id), - disp_name = COALESCE($2, disp_name), - user_desc = COALESCE($3, user_desc) -WHERE user_id = $4 -RETURNING user_id, avatar_id, nickname, disp_name, user_desc, creation_date -` - -type UpdateUserParams struct { - AvatarID pgtype.Int4 `db:"avatar_id" json:"avatar_id"` - DispName pgtype.Text `db:"disp_name" json:"disp_name"` - UserDesc pgtype.Text `db:"user_desc" json:"user_desc"` - UserID int32 `db:"user_id" json:"user_id"` -} - -type UpdateUserRow struct { - UserID int32 `db:"user_id" json:"user_id"` - AvatarID pgtype.Int4 `db:"avatar_id" json:"avatar_id"` - Nickname string `db:"nickname" json:"nickname"` - DispName pgtype.Text `db:"disp_name" json:"disp_name"` - UserDesc pgtype.Text `db:"user_desc" json:"user_desc"` - CreationDate pgtype.Timestamp `db:"creation_date" json:"creation_date"` -} - -func (q *Queries) UpdateUser(ctx context.Context, arg UpdateUserParams) (UpdateUserRow, error) { - row := q.db.QueryRow(ctx, updateUser, - arg.AvatarID, - arg.DispName, - arg.UserDesc, - arg.UserID, - ) - var i UpdateUserRow - err := row.Scan( - &i.UserID, - &i.AvatarID, - &i.Nickname, - &i.DispName, - &i.UserDesc, - &i.CreationDate, - ) - return i, err -} - -const updateUserTitle = `-- name: UpdateUserTitle :one -UPDATE usertitles -SET - status = COALESCE($3, status), - rate = COALESCE($4, rate), - review_id = COALESCE($5, review_id) -WHERE user_id = $1 AND title_id = $2 -RETURNING usertitle_id, user_id, title_id, status, rate, review_id -` - -type UpdateUserTitleParams struct { - UserID int32 `db:"user_id" json:"user_id"` - TitleID int32 `db:"title_id" json:"title_id"` - Status NullUsertitleStatusT `db:"status" json:"status"` - Rate pgtype.Int4 `db:"rate" json:"rate"` - ReviewID pgtype.Int4 `db:"review_id" json:"review_id"` -} - -func (q *Queries) UpdateUserTitle(ctx context.Context, arg UpdateUserTitleParams) (Usertitles, error) { - row := q.db.QueryRow(ctx, updateUserTitle, - arg.UserID, - arg.TitleID, - arg.Status, - arg.Rate, - arg.ReviewID, - ) - var i Usertitles - err := row.Scan( - &i.UsertitleID, - &i.UserID, - &i.TitleID, - &i.Status, - &i.Rate, - &i.ReviewID, - ) - return i, err -} diff --git a/modules/backend/api/impl.go b/modules/backend/handlers.go similarity index 99% rename from modules/backend/api/impl.go rename to modules/backend/handlers.go index 5783f47..366f298 100644 --- a/modules/backend/api/impl.go +++ b/modules/backend/handlers.go @@ -1,9 +1,10 @@ -package api +package main import ( "context" "encoding/json" - "nyanimedb-server/db" + "nyanimedb/modules/backend/db" + sqlc "nyanimedb/sql" "strconv" "time" @@ -13,7 +14,7 @@ import ( ) type Server struct { - db *db.Queries + db *sqlc.Queries } func NewServer(db *db.Queries) Server { diff --git a/modules/backend/main.go b/modules/backend/main.go index 5a61226..a9e8db0 100644 --- a/modules/backend/main.go +++ b/modules/backend/main.go @@ -3,12 +3,13 @@ package main import ( "context" "fmt" - "nyanimedb-server/api" - "nyanimedb-server/db" + sqlc "nyanimedb/sql" "os" "reflect" "time" + oapi "nyanimedb/api" + "github.com/gin-contrib/cors" "github.com/gin-gonic/gin" "github.com/jackc/pgx/v5" @@ -39,9 +40,9 @@ func main() { r := gin.Default() - queries := db.New(conn) + queries := sqlc.New(conn) - server := api.NewServer(queries) + server := NewServer(queries) // r.LoadHTMLGlob("templates/*") r.Use(cors.New(cors.Config{ @@ -53,10 +54,10 @@ func main() { MaxAge: 12 * time.Hour, })) - api.RegisterHandlers(r, api.NewStrictHandler( + oapi.RegisterHandlers(r, oapi.NewStrictHandler( server, // сюда можно добавить middlewares, если нужно - []api.StrictMiddlewareFunc{}, + []oapi.StrictMiddlewareFunc{}, )) // r.GET("/", func(c *gin.Context) { // c.HTML(http.StatusOK, "index.html", gin.H{ diff --git a/modules/backend/queries.sql b/modules/backend/queries.sql new file mode 100644 index 0000000..7c9c197 --- /dev/null +++ b/modules/backend/queries.sql @@ -0,0 +1,142 @@ +-- name: GetImageByID :one +SELECT image_id, storage_type, image_path +FROM images +WHERE image_id = $1; + +-- -- name: CreateImage :one +-- INSERT INTO images (storage_type, image_path) +-- VALUES ($1, $2) +-- RETURNING image_id, storage_type, image_path; + +-- -- name: GetUserByID :one +-- SELECT user_id, avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date +-- FROM users +-- WHERE user_id = $1; + +-- -- name: ListUsers :many +-- SELECT user_id, avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date +-- FROM users +-- ORDER BY user_id +-- LIMIT $1 OFFSET $2; + +-- -- name: CreateUser :one +-- INSERT INTO users (avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date) +-- VALUES ($1, $2, $3, $4, $5, $6, $7) +-- RETURNING user_id, avatar_id, nickname, disp_name, user_desc, creation_date; + +-- -- name: UpdateUser :one +-- UPDATE users +-- SET +-- avatar_id = COALESCE(sqlc.narg('avatar_id'), avatar_id), +-- disp_name = COALESCE(sqlc.narg('disp_name'), disp_name), +-- user_desc = COALESCE(sqlc.narg('user_desc'), user_desc), +-- passhash = COALESCE(sqlc.narg('passhash'), passhash) +-- WHERE user_id = sqlc.arg('user_id') +-- RETURNING user_id, avatar_id, nickname, disp_name, user_desc, creation_date; + +-- -- name: DeleteUser :exec +-- DELETE FROM users +-- WHERE user_id = $1; + +-- -- name: GetTitleByID :one +-- SELECT title_id, title_names, studio_id, poster_id, signal_ids, +-- title_status, rating, rating_count, release_year, release_season, +-- season, episodes_aired, episodes_all, episodes_len +-- FROM titles +-- WHERE title_id = $1; + +-- -- name: ListTitles :many +-- SELECT title_id, title_names, studio_id, poster_id, signal_ids, +-- title_status, rating, rating_count, release_year, release_season, +-- season, episodes_aired, episodes_all, episodes_len +-- FROM titles +-- ORDER BY title_id +-- LIMIT $1 OFFSET $2; + +-- -- name: UpdateTitle :one +-- UPDATE titles +-- SET +-- title_names = COALESCE(sqlc.narg('title_names'), title_names), +-- studio_id = COALESCE(sqlc.narg('studio_id'), studio_id), +-- poster_id = COALESCE(sqlc.narg('poster_id'), poster_id), +-- signal_ids = COALESCE(sqlc.narg('signal_ids'), signal_ids), +-- title_status = COALESCE(sqlc.narg('title_status'), title_status), +-- release_year = COALESCE(sqlc.narg('release_year'), release_year), +-- release_season = COALESCE(sqlc.narg('release_season'), release_season), +-- episodes_aired = COALESCE(sqlc.narg('episodes_aired'), episodes_aired), +-- episodes_all = COALESCE(sqlc.narg('episodes_all'), episodes_all), +-- episodes_len = COALESCE(sqlc.narg('episodes_len'), episodes_len) +-- WHERE title_id = sqlc.arg('title_id') +-- RETURNING *; + +-- -- name: GetReviewByID :one +-- SELECT review_id, user_id, title_id, image_ids, review_text, creation_date +-- FROM reviews +-- WHERE review_id = $1; + +-- -- name: CreateReview :one +-- INSERT INTO reviews (user_id, title_id, image_ids, review_text, creation_date) +-- VALUES ($1, $2, $3, $4, $5) +-- RETURNING review_id, user_id, title_id, image_ids, review_text, creation_date; + +-- -- name: UpdateReview :one +-- UPDATE reviews +-- SET +-- image_ids = COALESCE(sqlc.narg('image_ids'), image_ids), +-- review_text = COALESCE(sqlc.narg('review_text'), review_text) +-- WHERE review_id = sqlc.arg('review_id') +-- RETURNING *; + +-- -- name: DeleteReview :exec +-- DELETE FROM reviews +-- WHERE review_id = $1; + +-- -- name: ListReviewsByTitle :many +-- SELECT review_id, user_id, title_id, image_ids, review_text, creation_date +-- FROM reviews +-- WHERE title_id = $1 +-- ORDER BY creation_date DESC +-- LIMIT $2 OFFSET $3; + +-- -- name: ListReviewsByUser :many +-- SELECT review_id, user_id, title_id, image_ids, review_text, creation_date +-- FROM reviews +-- WHERE user_id = $1 +-- ORDER BY creation_date DESC +-- LIMIT $2 OFFSET $3; + +-- -- name: GetUserTitle :one +-- SELECT usertitle_id, user_id, title_id, status, rate, review_id +-- FROM usertitles +-- WHERE user_id = $1 AND title_id = $2; + +-- -- name: ListUserTitles :many +-- SELECT usertitle_id, user_id, title_id, status, rate, review_id +-- FROM usertitles +-- WHERE user_id = $1 +-- ORDER BY usertitle_id +-- LIMIT $2 OFFSET $3; + +-- -- name: CreateUserTitle :one +-- INSERT INTO usertitles (user_id, title_id, status, rate, review_id) +-- VALUES ($1, $2, $3, $4, $5) +-- RETURNING usertitle_id, user_id, title_id, status, rate, review_id; + +-- -- name: UpdateUserTitle :one +-- UPDATE usertitles +-- SET +-- status = COALESCE(sqlc.narg('status'), status), +-- rate = COALESCE(sqlc.narg('rate'), rate), +-- review_id = COALESCE(sqlc.narg('review_id'), review_id) +-- WHERE user_id = $1 AND title_id = $2 +-- RETURNING *; + +-- -- name: DeleteUserTitle :exec +-- DELETE FROM usertitles +-- WHERE user_id = $1 AND ($2::int IS NULL OR title_id = $2); + +-- -- name: ListTags :many +-- SELECT tag_id, tag_names +-- FROM tags +-- ORDER BY tag_id +-- LIMIT $1 OFFSET $2; \ No newline at end of file diff --git a/modules/backend/templates/index.html b/modules/backend/templates/index.html deleted file mode 100644 index 9f7bd75..0000000 --- a/modules/backend/templates/index.html +++ /dev/null @@ -1,10 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="UTF-8"> - <title>{{ .title }} - - -

{{ .message }}

- - \ No newline at end of file diff --git a/modules/sql/go.mod b/modules/sql/go.mod deleted file mode 100644 index 9508b28..0000000 --- a/modules/sql/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module tutorial.sqlc.dev/app - -go 1.25.2 diff --git a/modules/sql/query.sql b/modules/sql/query.sql deleted file mode 100644 index 4b85e7e..0000000 --- a/modules/sql/query.sql +++ /dev/null @@ -1,142 +0,0 @@ --- name: GetImageByID :one -SELECT image_id, storage_type, image_path -FROM images -WHERE image_id = $1; - --- name: CreateImage :one -INSERT INTO images (storage_type, image_path) -VALUES ($1, $2) -RETURNING image_id, storage_type, image_path; - --- name: GetUserByID :one -SELECT user_id, avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date -FROM users -WHERE user_id = $1; - --- name: ListUsers :many -SELECT user_id, avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date -FROM users -ORDER BY user_id -LIMIT $1 OFFSET $2; - --- name: CreateUser :one -INSERT INTO users (avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date) -VALUES ($1, $2, $3, $4, $5, $6, $7) -RETURNING user_id, avatar_id, nickname, disp_name, user_desc, creation_date; - --- name: UpdateUser :one -UPDATE users -SET - avatar_id = COALESCE(sqlc.narg('avatar_id'), avatar_id), - disp_name = COALESCE(sqlc.narg('disp_name'), disp_name), - user_desc = COALESCE(sqlc.narg('user_desc'), user_desc), - passhash = COALESCE(sqlc.narg('passhash'), passhash), -WHERE user_id = sqlc.arg('user_id') -RETURNING user_id, avatar_id, nickname, disp_name, user_desc, creation_date; - --- name: DeleteUser :exec -DELETE FROM users -WHERE user_id = $1; - --- name: GetTitleByID :one -SELECT title_id, title_names, studio_id, poster_id, signal_ids, - title_status, rating, rating_count, release_year, release_season, - season, episodes_aired, episodes_all, episodes_len -FROM titles -WHERE title_id = $1; - --- name: ListTitles :many -SELECT title_id, title_names, studio_id, poster_id, signal_ids, - title_status, rating, rating_count, release_year, release_season, - season, episodes_aired, episodes_all, episodes_len -FROM titles -ORDER BY title_id -LIMIT $1 OFFSET $2; - --- name: UpdateTitle :one -UPDATE titles -SET - title_names = COALESCE(sqlc.narg('title_names'), title_names), - studio_id = COALESCE(sqlc.narg('studio_id'), studio_id), - poster_id = COALESCE(sqlc.narg('poster_id'), poster_id), - signal_ids = COALESCE(sqlc.narg('signal_ids'), signal_ids), - title_status = COALESCE(sqlc.narg('title_status'), title_status), - release_year = COALESCE(sqlc.narg('release_year'), release_year), - release_season = COALESCE(sqlc.narg('release_season'), release_season), - episodes_aired = COALESCE(sqlc.narg('episodes_aired'), episodes_aired), - episodes_all = COALESCE(sqlc.narg('episodes_all'), episodes_all), - episodes_len = COALESCE(sqlc.narg('episodes_len'), episodes_len) -WHERE title_id = sqlc.arg('title_id') -RETURNING *; - --- name: GetReviewByID :one -SELECT review_id, user_id, title_id, image_ids, review_text, creation_date -FROM reviews -WHERE review_id = $1; - --- name: CreateReview :one -INSERT INTO reviews (user_id, title_id, image_ids, review_text, creation_date) -VALUES ($1, $2, $3, $4, $5) -RETURNING review_id, user_id, title_id, image_ids, review_text, creation_date; - --- name: UpdateReview :one -UPDATE reviews -SET - image_ids = COALESCE(sqlc.narg('image_ids'), image_ids), - review_text = COALESCE(sqlc.narg('review_text'), review_text) -WHERE review_id = sqlc.arg('review_id') -RETURNING *; - --- name: DeleteReview :exec -DELETE FROM reviews -WHERE review_id = $1; - --- name: ListReviewsByTitle :many -SELECT review_id, user_id, title_id, image_ids, review_text, creation_date -FROM reviews -WHERE title_id = $1 -ORDER BY creation_date DESC -LIMIT $2 OFFSET $3; - --- name: ListReviewsByUser :many -SELECT review_id, user_id, title_id, image_ids, review_text, creation_date -FROM reviews -WHERE user_id = $1 -ORDER BY creation_date DESC -LIMIT $2 OFFSET $3; - --- name: GetUserTitle :one -SELECT usertitle_id, user_id, title_id, status, rate, review_id -FROM usertitles -WHERE user_id = $1 AND title_id = $2; - --- name: ListUserTitles :many -SELECT usertitle_id, user_id, title_id, status, rate, review_id -FROM usertitles -WHERE user_id = $1 -ORDER BY usertitle_id -LIMIT $2 OFFSET $3; - --- name: CreateUserTitle :one -INSERT INTO usertitles (user_id, title_id, status, rate, review_id) -VALUES ($1, $2, $3, $4, $5) -RETURNING usertitle_id, user_id, title_id, status, rate, review_id; - --- name: UpdateUserTitle :one -UPDATE usertitles -SET - status = COALESCE(sqlc.narg('status'), status), - rate = COALESCE(sqlc.narg('rate'), rate), - review_id = COALESCE(sqlc.narg('review_id'), review_id) -WHERE user_id = $1 AND title_id = $2 -RETURNING *; - --- name: DeleteUserTitle :exec -DELETE FROM usertitles -WHERE user_id = $1 AND ($2::int IS NULL OR title_id = $2); - --- name: ListTags :many -SELECT tag_id, tag_names -FROM tags -ORDER BY tag_id -LIMIT $1 OFFSET $2; \ No newline at end of file diff --git a/modules/sql/sqlc-generate.yaml b/modules/sql/sqlc-generate.yaml deleted file mode 100644 index 8a625de..0000000 --- a/modules/sql/sqlc-generate.yaml +++ /dev/null @@ -1,13 +0,0 @@ -version: "2" -sql: - - engine: "postgresql" - queries: "query.sql" - schema: "scheme.sql" - gen: - go: - package: "nyanimedb.backend" - out: "sqlc" - sql_package: "pgx/v5" - sql_driver: "github.com/lib/pq" - emit_db_tags: true - emit_exact_table_names: true \ No newline at end of file diff --git a/modules/sql/sqlc.yaml b/modules/sql/sqlc.yaml deleted file mode 100644 index 079626a..0000000 --- a/modules/sql/sqlc.yaml +++ /dev/null @@ -1,14 +0,0 @@ -version: "2" -sql: - - engine: "postgresql" - queries: "query.sql" - schema: "scheme.sql" - gen: - go: - package: "nyanimedb_backend" - out: "sqlc" - sql_package: "pgx/v5" - sql_driver: "github.com/lib/pq" - emit_db_tags: true - emit_exact_table_names: true - emit_json_tags: true \ No newline at end of file diff --git a/modules/sql/sqlc/db.go b/modules/sql/sqlc/db.go deleted file mode 100644 index cdbc865..0000000 --- a/modules/sql/sqlc/db.go +++ /dev/null @@ -1,32 +0,0 @@ -// Code generated by sqlc. DO NOT EDIT. -// versions: -// sqlc v1.30.0 - -package nyanimedb_backend - -import ( - "context" - - "github.com/jackc/pgx/v5" - "github.com/jackc/pgx/v5/pgconn" -) - -type DBTX interface { - Exec(context.Context, string, ...interface{}) (pgconn.CommandTag, error) - Query(context.Context, string, ...interface{}) (pgx.Rows, error) - QueryRow(context.Context, string, ...interface{}) pgx.Row -} - -func New(db DBTX) *Queries { - return &Queries{db: db} -} - -type Queries struct { - db DBTX -} - -func (q *Queries) WithTx(tx pgx.Tx) *Queries { - return &Queries{ - db: tx, - } -} diff --git a/modules/sql/sqlc/models.go b/modules/sql/sqlc/models.go deleted file mode 100644 index e7aeb3c..0000000 --- a/modules/sql/sqlc/models.go +++ /dev/null @@ -1,266 +0,0 @@ -// Code generated by sqlc. DO NOT EDIT. -// versions: -// sqlc v1.30.0 - -package nyanimedb_backend - -import ( - "database/sql/driver" - "fmt" - - "github.com/jackc/pgx/v5/pgtype" -) - -type ReleaseSeasonT string - -const ( - ReleaseSeasonTWinter ReleaseSeasonT = "winter" - ReleaseSeasonTSpring ReleaseSeasonT = "spring" - ReleaseSeasonTSummer ReleaseSeasonT = "summer" - ReleaseSeasonTFall ReleaseSeasonT = "fall" -) - -func (e *ReleaseSeasonT) Scan(src interface{}) error { - switch s := src.(type) { - case []byte: - *e = ReleaseSeasonT(s) - case string: - *e = ReleaseSeasonT(s) - default: - return fmt.Errorf("unsupported scan type for ReleaseSeasonT: %T", src) - } - return nil -} - -type NullReleaseSeasonT struct { - ReleaseSeasonT ReleaseSeasonT `json:"release_season_t"` - Valid bool `json:"valid"` // Valid is true if ReleaseSeasonT is not NULL -} - -// Scan implements the Scanner interface. -func (ns *NullReleaseSeasonT) Scan(value interface{}) error { - if value == nil { - ns.ReleaseSeasonT, ns.Valid = "", false - return nil - } - ns.Valid = true - return ns.ReleaseSeasonT.Scan(value) -} - -// Value implements the driver Valuer interface. -func (ns NullReleaseSeasonT) Value() (driver.Value, error) { - if !ns.Valid { - return nil, nil - } - return string(ns.ReleaseSeasonT), nil -} - -type StorageTypeT string - -const ( - StorageTypeTLocal StorageTypeT = "local" - StorageTypeTS3 StorageTypeT = "s3" -) - -func (e *StorageTypeT) Scan(src interface{}) error { - switch s := src.(type) { - case []byte: - *e = StorageTypeT(s) - case string: - *e = StorageTypeT(s) - default: - return fmt.Errorf("unsupported scan type for StorageTypeT: %T", src) - } - return nil -} - -type NullStorageTypeT struct { - StorageTypeT StorageTypeT `json:"storage_type_t"` - Valid bool `json:"valid"` // Valid is true if StorageTypeT is not NULL -} - -// Scan implements the Scanner interface. -func (ns *NullStorageTypeT) Scan(value interface{}) error { - if value == nil { - ns.StorageTypeT, ns.Valid = "", false - return nil - } - ns.Valid = true - return ns.StorageTypeT.Scan(value) -} - -// Value implements the driver Valuer interface. -func (ns NullStorageTypeT) Value() (driver.Value, error) { - if !ns.Valid { - return nil, nil - } - return string(ns.StorageTypeT), nil -} - -type TitleStatusT string - -const ( - TitleStatusTFinished TitleStatusT = "finished" - TitleStatusTOngoing TitleStatusT = "ongoing" - TitleStatusTPlanned TitleStatusT = "planned" -) - -func (e *TitleStatusT) Scan(src interface{}) error { - switch s := src.(type) { - case []byte: - *e = TitleStatusT(s) - case string: - *e = TitleStatusT(s) - default: - return fmt.Errorf("unsupported scan type for TitleStatusT: %T", src) - } - return nil -} - -type NullTitleStatusT struct { - TitleStatusT TitleStatusT `json:"title_status_t"` - Valid bool `json:"valid"` // Valid is true if TitleStatusT is not NULL -} - -// Scan implements the Scanner interface. -func (ns *NullTitleStatusT) Scan(value interface{}) error { - if value == nil { - ns.TitleStatusT, ns.Valid = "", false - return nil - } - ns.Valid = true - return ns.TitleStatusT.Scan(value) -} - -// Value implements the driver Valuer interface. -func (ns NullTitleStatusT) Value() (driver.Value, error) { - if !ns.Valid { - return nil, nil - } - return string(ns.TitleStatusT), nil -} - -type UsertitleStatusT string - -const ( - UsertitleStatusTFinished UsertitleStatusT = "finished" - UsertitleStatusTPlanned UsertitleStatusT = "planned" - UsertitleStatusTDropped UsertitleStatusT = "dropped" - UsertitleStatusTInProgress UsertitleStatusT = "in-progress" -) - -func (e *UsertitleStatusT) Scan(src interface{}) error { - switch s := src.(type) { - case []byte: - *e = UsertitleStatusT(s) - case string: - *e = UsertitleStatusT(s) - default: - return fmt.Errorf("unsupported scan type for UsertitleStatusT: %T", src) - } - return nil -} - -type NullUsertitleStatusT struct { - UsertitleStatusT UsertitleStatusT `json:"usertitle_status_t"` - Valid bool `json:"valid"` // Valid is true if UsertitleStatusT is not NULL -} - -// Scan implements the Scanner interface. -func (ns *NullUsertitleStatusT) Scan(value interface{}) error { - if value == nil { - ns.UsertitleStatusT, ns.Valid = "", false - return nil - } - ns.Valid = true - return ns.UsertitleStatusT.Scan(value) -} - -// Value implements the driver Valuer interface. -func (ns NullUsertitleStatusT) Value() (driver.Value, error) { - if !ns.Valid { - return nil, nil - } - return string(ns.UsertitleStatusT), nil -} - -type Images struct { - ImageID int32 `db:"image_id" json:"image_id"` - StorageType StorageTypeT `db:"storage_type" json:"storage_type"` - ImagePath string `db:"image_path" json:"image_path"` -} - -type Providers struct { - ProviderID int32 `db:"provider_id" json:"provider_id"` - ProviderName string `db:"provider_name" json:"provider_name"` -} - -type Reviews struct { - ReviewID int32 `db:"review_id" json:"review_id"` - UserID int32 `db:"user_id" json:"user_id"` - TitleID int32 `db:"title_id" json:"title_id"` - ImageIds []int32 `db:"image_ids" json:"image_ids"` - ReviewText string `db:"review_text" json:"review_text"` - CreationDate pgtype.Timestamp `db:"creation_date" json:"creation_date"` -} - -type Signals struct { - SignalID int32 `db:"signal_id" json:"signal_id"` - RawData []byte `db:"raw_data" json:"raw_data"` - ProviderID int32 `db:"provider_id" json:"provider_id"` - Dirty bool `db:"dirty" json:"dirty"` -} - -type Studios struct { - StudioID int32 `db:"studio_id" json:"studio_id"` - StudioName pgtype.Text `db:"studio_name" json:"studio_name"` - IllustID pgtype.Int4 `db:"illust_id" json:"illust_id"` - StudioDesc pgtype.Text `db:"studio_desc" json:"studio_desc"` -} - -type Tags struct { - TagID int32 `db:"tag_id" json:"tag_id"` - TagNames []byte `db:"tag_names" json:"tag_names"` -} - -type TitleTags struct { - TitleID int32 `db:"title_id" json:"title_id"` - TagID int32 `db:"tag_id" json:"tag_id"` -} - -type Titles struct { - TitleID int32 `db:"title_id" json:"title_id"` - TitleNames []byte `db:"title_names" json:"title_names"` - StudioID int32 `db:"studio_id" json:"studio_id"` - PosterID pgtype.Int4 `db:"poster_id" json:"poster_id"` - SignalIds []int32 `db:"signal_ids" json:"signal_ids"` - TitleStatus TitleStatusT `db:"title_status" json:"title_status"` - Rating pgtype.Float8 `db:"rating" json:"rating"` - RatingCount pgtype.Int4 `db:"rating_count" json:"rating_count"` - ReleaseYear pgtype.Int4 `db:"release_year" json:"release_year"` - ReleaseSeason NullReleaseSeasonT `db:"release_season" json:"release_season"` - Season pgtype.Int4 `db:"season" json:"season"` - EpisodesAired pgtype.Int4 `db:"episodes_aired" json:"episodes_aired"` - EpisodesAll pgtype.Int4 `db:"episodes_all" json:"episodes_all"` - EpisodesLen []byte `db:"episodes_len" json:"episodes_len"` -} - -type Users struct { - UserID int32 `db:"user_id" json:"user_id"` - AvatarID pgtype.Int4 `db:"avatar_id" json:"avatar_id"` - Passhash string `db:"passhash" json:"passhash"` - Mail pgtype.Text `db:"mail" json:"mail"` - Nickname string `db:"nickname" json:"nickname"` - DispName pgtype.Text `db:"disp_name" json:"disp_name"` - UserDesc pgtype.Text `db:"user_desc" json:"user_desc"` - CreationDate pgtype.Timestamp `db:"creation_date" json:"creation_date"` -} - -type Usertitles struct { - UsertitleID int32 `db:"usertitle_id" json:"usertitle_id"` - UserID int32 `db:"user_id" json:"user_id"` - TitleID int32 `db:"title_id" json:"title_id"` - Status UsertitleStatusT `db:"status" json:"status"` - Rate pgtype.Int4 `db:"rate" json:"rate"` - ReviewID pgtype.Int4 `db:"review_id" json:"review_id"` -} diff --git a/modules/sql/sqlc/query.sql.go b/modules/sql/sqlc/query.sql.go deleted file mode 100644 index 1fc06ac..0000000 --- a/modules/sql/sqlc/query.sql.go +++ /dev/null @@ -1,712 +0,0 @@ -// Code generated by sqlc. DO NOT EDIT. -// versions: -// sqlc v1.30.0 -// source: query.sql - -package db - -import ( - "context" - - "github.com/jackc/pgx/v5/pgtype" -) - -const createImage = `-- name: CreateImage :one -INSERT INTO images (storage_type, image_path) -VALUES ($1, $2) -RETURNING image_id, storage_type, image_path -` - -type CreateImageParams struct { - StorageType StorageTypeT `db:"storage_type" json:"storage_type"` - ImagePath string `db:"image_path" json:"image_path"` -} - -func (q *Queries) CreateImage(ctx context.Context, arg CreateImageParams) (Images, error) { - row := q.db.QueryRow(ctx, createImage, arg.StorageType, arg.ImagePath) - var i Images - err := row.Scan(&i.ImageID, &i.StorageType, &i.ImagePath) - return i, err -} - -const createReview = `-- name: CreateReview :one -INSERT INTO reviews (user_id, title_id, image_ids, review_text, creation_date) -VALUES ($1, $2, $3, $4, $5) -RETURNING review_id, user_id, title_id, image_ids, review_text, creation_date -` - -type CreateReviewParams struct { - UserID int32 `db:"user_id" json:"user_id"` - TitleID int32 `db:"title_id" json:"title_id"` - ImageIds []int32 `db:"image_ids" json:"image_ids"` - ReviewText string `db:"review_text" json:"review_text"` - CreationDate pgtype.Timestamp `db:"creation_date" json:"creation_date"` -} - -func (q *Queries) CreateReview(ctx context.Context, arg CreateReviewParams) (Reviews, error) { - row := q.db.QueryRow(ctx, createReview, - arg.UserID, - arg.TitleID, - arg.ImageIds, - arg.ReviewText, - arg.CreationDate, - ) - var i Reviews - err := row.Scan( - &i.ReviewID, - &i.UserID, - &i.TitleID, - &i.ImageIds, - &i.ReviewText, - &i.CreationDate, - ) - return i, err -} - -const createUser = `-- name: CreateUser :one -INSERT INTO users (avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date) -VALUES ($1, $2, $3, $4, $5, $6, $7) -RETURNING user_id, avatar_id, nickname, disp_name, user_desc, creation_date -` - -type CreateUserParams struct { - AvatarID pgtype.Int4 `db:"avatar_id" json:"avatar_id"` - Passhash string `db:"passhash" json:"passhash"` - Mail pgtype.Text `db:"mail" json:"mail"` - Nickname string `db:"nickname" json:"nickname"` - DispName pgtype.Text `db:"disp_name" json:"disp_name"` - UserDesc pgtype.Text `db:"user_desc" json:"user_desc"` - CreationDate pgtype.Timestamp `db:"creation_date" json:"creation_date"` -} - -type CreateUserRow struct { - UserID int32 `db:"user_id" json:"user_id"` - AvatarID pgtype.Int4 `db:"avatar_id" json:"avatar_id"` - Nickname string `db:"nickname" json:"nickname"` - DispName pgtype.Text `db:"disp_name" json:"disp_name"` - UserDesc pgtype.Text `db:"user_desc" json:"user_desc"` - CreationDate pgtype.Timestamp `db:"creation_date" json:"creation_date"` -} - -func (q *Queries) CreateUser(ctx context.Context, arg CreateUserParams) (CreateUserRow, error) { - row := q.db.QueryRow(ctx, createUser, - arg.AvatarID, - arg.Passhash, - arg.Mail, - arg.Nickname, - arg.DispName, - arg.UserDesc, - arg.CreationDate, - ) - var i CreateUserRow - err := row.Scan( - &i.UserID, - &i.AvatarID, - &i.Nickname, - &i.DispName, - &i.UserDesc, - &i.CreationDate, - ) - return i, err -} - -const createUserTitle = `-- name: CreateUserTitle :one -INSERT INTO usertitles (user_id, title_id, status, rate, review_id) -VALUES ($1, $2, $3, $4, $5) -RETURNING usertitle_id, user_id, title_id, status, rate, review_id -` - -type CreateUserTitleParams struct { - UserID int32 `db:"user_id" json:"user_id"` - TitleID int32 `db:"title_id" json:"title_id"` - Status UsertitleStatusT `db:"status" json:"status"` - Rate pgtype.Int4 `db:"rate" json:"rate"` - ReviewID pgtype.Int4 `db:"review_id" json:"review_id"` -} - -func (q *Queries) CreateUserTitle(ctx context.Context, arg CreateUserTitleParams) (Usertitles, error) { - row := q.db.QueryRow(ctx, createUserTitle, - arg.UserID, - arg.TitleID, - arg.Status, - arg.Rate, - arg.ReviewID, - ) - var i Usertitles - err := row.Scan( - &i.UsertitleID, - &i.UserID, - &i.TitleID, - &i.Status, - &i.Rate, - &i.ReviewID, - ) - return i, err -} - -const deleteReview = `-- name: DeleteReview :exec -DELETE FROM reviews -WHERE review_id = $1 -` - -func (q *Queries) DeleteReview(ctx context.Context, reviewID int32) error { - _, err := q.db.Exec(ctx, deleteReview, reviewID) - return err -} - -const deleteUser = `-- name: DeleteUser :exec -DELETE FROM users -WHERE user_id = $1 -` - -func (q *Queries) DeleteUser(ctx context.Context, userID int32) error { - _, err := q.db.Exec(ctx, deleteUser, userID) - return err -} - -const deleteUserTitle = `-- name: DeleteUserTitle :exec -DELETE FROM usertitles -WHERE user_id = $1 AND ($2::int IS NULL OR title_id = $2) -` - -type DeleteUserTitleParams struct { - UserID int32 `db:"user_id" json:"user_id"` - Column2 int32 `db:"column_2" json:"column_2"` -} - -func (q *Queries) DeleteUserTitle(ctx context.Context, arg DeleteUserTitleParams) error { - _, err := q.db.Exec(ctx, deleteUserTitle, arg.UserID, arg.Column2) - return err -} - -const getImageByID = `-- name: GetImageByID :one -SELECT image_id, storage_type, image_path -FROM images -WHERE image_id = $1 -` - -func (q *Queries) GetImageByID(ctx context.Context, imageID int32) (Images, error) { - row := q.db.QueryRow(ctx, getImageByID, imageID) - var i Images - err := row.Scan(&i.ImageID, &i.StorageType, &i.ImagePath) - return i, err -} - -const getReviewByID = `-- name: GetReviewByID :one -SELECT review_id, user_id, title_id, image_ids, review_text, creation_date -FROM reviews -WHERE review_id = $1 -` - -func (q *Queries) GetReviewByID(ctx context.Context, reviewID int32) (Reviews, error) { - row := q.db.QueryRow(ctx, getReviewByID, reviewID) - var i Reviews - err := row.Scan( - &i.ReviewID, - &i.UserID, - &i.TitleID, - &i.ImageIds, - &i.ReviewText, - &i.CreationDate, - ) - return i, err -} - -const getTitleByID = `-- name: GetTitleByID :one -SELECT title_id, title_names, studio_id, poster_id, signal_ids, - title_status, rating, rating_count, release_year, release_season, - season, episodes_aired, episodes_all, episodes_len -FROM titles -WHERE title_id = $1 -` - -func (q *Queries) GetTitleByID(ctx context.Context, titleID int32) (Titles, error) { - row := q.db.QueryRow(ctx, getTitleByID, titleID) - var i Titles - err := row.Scan( - &i.TitleID, - &i.TitleNames, - &i.StudioID, - &i.PosterID, - &i.SignalIds, - &i.TitleStatus, - &i.Rating, - &i.RatingCount, - &i.ReleaseYear, - &i.ReleaseSeason, - &i.Season, - &i.EpisodesAired, - &i.EpisodesAll, - &i.EpisodesLen, - ) - return i, err -} - -const getUserByID = `-- name: GetUserByID :one -SELECT user_id, avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date -FROM users -WHERE user_id = $1 -` - -func (q *Queries) GetUserByID(ctx context.Context, userID int32) (Users, error) { - row := q.db.QueryRow(ctx, getUserByID, userID) - var i Users - err := row.Scan( - &i.UserID, - &i.AvatarID, - &i.Passhash, - &i.Mail, - &i.Nickname, - &i.DispName, - &i.UserDesc, - &i.CreationDate, - ) - return i, err -} - -const getUserTitle = `-- name: GetUserTitle :one -SELECT usertitle_id, user_id, title_id, status, rate, review_id -FROM usertitles -WHERE user_id = $1 AND title_id = $2 -` - -type GetUserTitleParams struct { - UserID int32 `db:"user_id" json:"user_id"` - TitleID int32 `db:"title_id" json:"title_id"` -} - -func (q *Queries) GetUserTitle(ctx context.Context, arg GetUserTitleParams) (Usertitles, error) { - row := q.db.QueryRow(ctx, getUserTitle, arg.UserID, arg.TitleID) - var i Usertitles - err := row.Scan( - &i.UsertitleID, - &i.UserID, - &i.TitleID, - &i.Status, - &i.Rate, - &i.ReviewID, - ) - return i, err -} - -const listReviewsByTitle = `-- name: ListReviewsByTitle :many -SELECT review_id, user_id, title_id, image_ids, review_text, creation_date -FROM reviews -WHERE title_id = $1 -ORDER BY creation_date DESC -LIMIT $2 OFFSET $3 -` - -type ListReviewsByTitleParams struct { - TitleID int32 `db:"title_id" json:"title_id"` - Limit int32 `db:"limit" json:"limit"` - Offset int32 `db:"offset" json:"offset"` -} - -func (q *Queries) ListReviewsByTitle(ctx context.Context, arg ListReviewsByTitleParams) ([]Reviews, error) { - rows, err := q.db.Query(ctx, listReviewsByTitle, arg.TitleID, arg.Limit, arg.Offset) - if err != nil { - return nil, err - } - defer rows.Close() - var items []Reviews - for rows.Next() { - var i Reviews - if err := rows.Scan( - &i.ReviewID, - &i.UserID, - &i.TitleID, - &i.ImageIds, - &i.ReviewText, - &i.CreationDate, - ); err != nil { - return nil, err - } - items = append(items, i) - } - if err := rows.Err(); err != nil { - return nil, err - } - return items, nil -} - -const listReviewsByUser = `-- name: ListReviewsByUser :many -SELECT review_id, user_id, title_id, image_ids, review_text, creation_date -FROM reviews -WHERE user_id = $1 -ORDER BY creation_date DESC -LIMIT $2 OFFSET $3 -` - -type ListReviewsByUserParams struct { - UserID int32 `db:"user_id" json:"user_id"` - Limit int32 `db:"limit" json:"limit"` - Offset int32 `db:"offset" json:"offset"` -} - -func (q *Queries) ListReviewsByUser(ctx context.Context, arg ListReviewsByUserParams) ([]Reviews, error) { - rows, err := q.db.Query(ctx, listReviewsByUser, arg.UserID, arg.Limit, arg.Offset) - if err != nil { - return nil, err - } - defer rows.Close() - var items []Reviews - for rows.Next() { - var i Reviews - if err := rows.Scan( - &i.ReviewID, - &i.UserID, - &i.TitleID, - &i.ImageIds, - &i.ReviewText, - &i.CreationDate, - ); err != nil { - return nil, err - } - items = append(items, i) - } - if err := rows.Err(); err != nil { - return nil, err - } - return items, nil -} - -const listTags = `-- name: ListTags :many -SELECT tag_id, tag_names -FROM tags -ORDER BY tag_id -LIMIT $1 OFFSET $2 -` - -type ListTagsParams struct { - Limit int32 `db:"limit" json:"limit"` - Offset int32 `db:"offset" json:"offset"` -} - -func (q *Queries) ListTags(ctx context.Context, arg ListTagsParams) ([]Tags, error) { - rows, err := q.db.Query(ctx, listTags, arg.Limit, arg.Offset) - if err != nil { - return nil, err - } - defer rows.Close() - var items []Tags - for rows.Next() { - var i Tags - if err := rows.Scan(&i.TagID, &i.TagNames); err != nil { - return nil, err - } - items = append(items, i) - } - if err := rows.Err(); err != nil { - return nil, err - } - return items, nil -} - -const listTitles = `-- name: ListTitles :many -SELECT title_id, title_names, studio_id, poster_id, signal_ids, - title_status, rating, rating_count, release_year, release_season, - season, episodes_aired, episodes_all, episodes_len -FROM titles -ORDER BY title_id -LIMIT $1 OFFSET $2 -` - -type ListTitlesParams struct { - Limit int32 `db:"limit" json:"limit"` - Offset int32 `db:"offset" json:"offset"` -} - -func (q *Queries) ListTitles(ctx context.Context, arg ListTitlesParams) ([]Titles, error) { - rows, err := q.db.Query(ctx, listTitles, arg.Limit, arg.Offset) - if err != nil { - return nil, err - } - defer rows.Close() - var items []Titles - for rows.Next() { - var i Titles - if err := rows.Scan( - &i.TitleID, - &i.TitleNames, - &i.StudioID, - &i.PosterID, - &i.SignalIds, - &i.TitleStatus, - &i.Rating, - &i.RatingCount, - &i.ReleaseYear, - &i.ReleaseSeason, - &i.Season, - &i.EpisodesAired, - &i.EpisodesAll, - &i.EpisodesLen, - ); err != nil { - return nil, err - } - items = append(items, i) - } - if err := rows.Err(); err != nil { - return nil, err - } - return items, nil -} - -const listUserTitles = `-- name: ListUserTitles :many -SELECT usertitle_id, user_id, title_id, status, rate, review_id -FROM usertitles -WHERE user_id = $1 -ORDER BY usertitle_id -LIMIT $2 OFFSET $3 -` - -type ListUserTitlesParams struct { - UserID int32 `db:"user_id" json:"user_id"` - Limit int32 `db:"limit" json:"limit"` - Offset int32 `db:"offset" json:"offset"` -} - -func (q *Queries) ListUserTitles(ctx context.Context, arg ListUserTitlesParams) ([]Usertitles, error) { - rows, err := q.db.Query(ctx, listUserTitles, arg.UserID, arg.Limit, arg.Offset) - if err != nil { - return nil, err - } - defer rows.Close() - var items []Usertitles - for rows.Next() { - var i Usertitles - if err := rows.Scan( - &i.UsertitleID, - &i.UserID, - &i.TitleID, - &i.Status, - &i.Rate, - &i.ReviewID, - ); err != nil { - return nil, err - } - items = append(items, i) - } - if err := rows.Err(); err != nil { - return nil, err - } - return items, nil -} - -const listUsers = `-- name: ListUsers :many -SELECT user_id, avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date -FROM users -ORDER BY user_id -LIMIT $1 OFFSET $2 -` - -type ListUsersParams struct { - Limit int32 `db:"limit" json:"limit"` - Offset int32 `db:"offset" json:"offset"` -} - -func (q *Queries) ListUsers(ctx context.Context, arg ListUsersParams) ([]Users, error) { - rows, err := q.db.Query(ctx, listUsers, arg.Limit, arg.Offset) - if err != nil { - return nil, err - } - defer rows.Close() - var items []Users - for rows.Next() { - var i Users - if err := rows.Scan( - &i.UserID, - &i.AvatarID, - &i.Passhash, - &i.Mail, - &i.Nickname, - &i.DispName, - &i.UserDesc, - &i.CreationDate, - ); err != nil { - return nil, err - } - items = append(items, i) - } - if err := rows.Err(); err != nil { - return nil, err - } - return items, nil -} - -const updateReview = `-- name: UpdateReview :one -UPDATE reviews -SET - image_ids = COALESCE($1, image_ids), - review_text = COALESCE($2, review_text) -WHERE review_id = $3 -RETURNING review_id, user_id, title_id, image_ids, review_text, creation_date -` - -type UpdateReviewParams struct { - ImageIds []int32 `db:"image_ids" json:"image_ids"` - ReviewText pgtype.Text `db:"review_text" json:"review_text"` - ReviewID int32 `db:"review_id" json:"review_id"` -} - -func (q *Queries) UpdateReview(ctx context.Context, arg UpdateReviewParams) (Reviews, error) { - row := q.db.QueryRow(ctx, updateReview, arg.ImageIds, arg.ReviewText, arg.ReviewID) - var i Reviews - err := row.Scan( - &i.ReviewID, - &i.UserID, - &i.TitleID, - &i.ImageIds, - &i.ReviewText, - &i.CreationDate, - ) - return i, err -} - -const updateTitle = `-- name: UpdateTitle :one -UPDATE titles -SET - title_names = COALESCE($1, title_names), - studio_id = COALESCE($2, studio_id), - poster_id = COALESCE($3, poster_id), - signal_ids = COALESCE($4, signal_ids), - title_status = COALESCE($5, title_status), - release_year = COALESCE($6, release_year), - release_season = COALESCE($7, release_season), - episodes_aired = COALESCE($8, episodes_aired), - episodes_all = COALESCE($9, episodes_all), - episodes_len = COALESCE($10, episodes_len) -WHERE title_id = $11 -RETURNING title_id, title_names, studio_id, poster_id, signal_ids, title_status, rating, rating_count, release_year, release_season, season, episodes_aired, episodes_all, episodes_len -` - -type UpdateTitleParams struct { - TitleNames []byte `db:"title_names" json:"title_names"` - StudioID pgtype.Int4 `db:"studio_id" json:"studio_id"` - PosterID pgtype.Int4 `db:"poster_id" json:"poster_id"` - SignalIds []int32 `db:"signal_ids" json:"signal_ids"` - TitleStatus NullTitleStatusT `db:"title_status" json:"title_status"` - ReleaseYear pgtype.Int4 `db:"release_year" json:"release_year"` - ReleaseSeason NullReleaseSeasonT `db:"release_season" json:"release_season"` - EpisodesAired pgtype.Int4 `db:"episodes_aired" json:"episodes_aired"` - EpisodesAll pgtype.Int4 `db:"episodes_all" json:"episodes_all"` - EpisodesLen []byte `db:"episodes_len" json:"episodes_len"` - TitleID int32 `db:"title_id" json:"title_id"` -} - -func (q *Queries) UpdateTitle(ctx context.Context, arg UpdateTitleParams) (Titles, error) { - row := q.db.QueryRow(ctx, updateTitle, - arg.TitleNames, - arg.StudioID, - arg.PosterID, - arg.SignalIds, - arg.TitleStatus, - arg.ReleaseYear, - arg.ReleaseSeason, - arg.EpisodesAired, - arg.EpisodesAll, - arg.EpisodesLen, - arg.TitleID, - ) - var i Titles - err := row.Scan( - &i.TitleID, - &i.TitleNames, - &i.StudioID, - &i.PosterID, - &i.SignalIds, - &i.TitleStatus, - &i.Rating, - &i.RatingCount, - &i.ReleaseYear, - &i.ReleaseSeason, - &i.Season, - &i.EpisodesAired, - &i.EpisodesAll, - &i.EpisodesLen, - ) - return i, err -} - -const updateUser = `-- name: UpdateUser :one -UPDATE users -SET - avatar_id = COALESCE($1, avatar_id), - disp_name = COALESCE($2, disp_name), - user_desc = COALESCE($3, user_desc) -WHERE user_id = $4 -RETURNING user_id, avatar_id, nickname, disp_name, user_desc, creation_date -` - -type UpdateUserParams struct { - AvatarID pgtype.Int4 `db:"avatar_id" json:"avatar_id"` - DispName pgtype.Text `db:"disp_name" json:"disp_name"` - UserDesc pgtype.Text `db:"user_desc" json:"user_desc"` - UserID int32 `db:"user_id" json:"user_id"` -} - -type UpdateUserRow struct { - UserID int32 `db:"user_id" json:"user_id"` - AvatarID pgtype.Int4 `db:"avatar_id" json:"avatar_id"` - Nickname string `db:"nickname" json:"nickname"` - DispName pgtype.Text `db:"disp_name" json:"disp_name"` - UserDesc pgtype.Text `db:"user_desc" json:"user_desc"` - CreationDate pgtype.Timestamp `db:"creation_date" json:"creation_date"` -} - -func (q *Queries) UpdateUser(ctx context.Context, arg UpdateUserParams) (UpdateUserRow, error) { - row := q.db.QueryRow(ctx, updateUser, - arg.AvatarID, - arg.DispName, - arg.UserDesc, - arg.UserID, - ) - var i UpdateUserRow - err := row.Scan( - &i.UserID, - &i.AvatarID, - &i.Nickname, - &i.DispName, - &i.UserDesc, - &i.CreationDate, - ) - return i, err -} - -const updateUserTitle = `-- name: UpdateUserTitle :one -UPDATE usertitles -SET - status = COALESCE($3, status), - rate = COALESCE($4, rate), - review_id = COALESCE($5, review_id) -WHERE user_id = $1 AND title_id = $2 -RETURNING usertitle_id, user_id, title_id, status, rate, review_id -` - -type UpdateUserTitleParams struct { - UserID int32 `db:"user_id" json:"user_id"` - TitleID int32 `db:"title_id" json:"title_id"` - Status NullUsertitleStatusT `db:"status" json:"status"` - Rate pgtype.Int4 `db:"rate" json:"rate"` - ReviewID pgtype.Int4 `db:"review_id" json:"review_id"` -} - -func (q *Queries) UpdateUserTitle(ctx context.Context, arg UpdateUserTitleParams) (Usertitles, error) { - row := q.db.QueryRow(ctx, updateUserTitle, - arg.UserID, - arg.TitleID, - arg.Status, - arg.Rate, - arg.ReviewID, - ) - var i Usertitles - err := row.Scan( - &i.UsertitleID, - &i.UserID, - &i.TitleID, - &i.Status, - &i.Rate, - &i.ReviewID, - ) - return i, err -} diff --git a/modules/backend/db/db.go b/sql/db.go similarity index 97% rename from modules/backend/db/db.go rename to sql/db.go index 9d485b5..7a56507 100644 --- a/modules/backend/db/db.go +++ b/sql/db.go @@ -2,7 +2,7 @@ // versions: // sqlc v1.30.0 -package db +package sqlc import ( "context" diff --git a/sql/migrations/000001_init.down.sql b/sql/migrations/000001_init.down.sql new file mode 100644 index 0000000..d9f23c0 --- /dev/null +++ b/sql/migrations/000001_init.down.sql @@ -0,0 +1,15 @@ +DROP TABLE IF EXISTS signals; +DROP TABLE IF EXISTS title_tags; +DROP TABLE IF EXISTS usertitles; +DROP TABLE IF EXISTS reviews; +DROP TABLE IF EXISTS titles; +DROP TABLE IF EXISTS studios; +DROP TABLE IF EXISTS users; +DROP TABLE IF EXISTS images; +DROP TABLE IF EXISTS tags; +DROP TABLE IF EXISTS providers; + +DROP TYPE IF EXISTS release_season_t; +DROP TYPE IF EXISTS title_status_t; +DROP TYPE IF EXISTS storage_type_t; +DROP TYPE IF EXISTS usertitle_status_t; \ No newline at end of file diff --git a/modules/sql/scheme.sql b/sql/migrations/000001_init.up.sql similarity index 91% rename from modules/sql/scheme.sql rename to sql/migrations/000001_init.up.sql index df84550..93ce071 100644 --- a/modules/sql/scheme.sql +++ b/sql/migrations/000001_init.up.sql @@ -2,8 +2,6 @@ -- title table triggers -- maybe jsonb constraints -- actions (delete) -BEGIN; - CREATE TYPE usertitle_status_t AS ENUM ('finished', 'planned', 'dropped', 'in-progress'); CREATE TYPE storage_type_t AS ENUM ('local', 's3'); CREATE TYPE title_status_t AS ENUM ('finished', 'ongoing', 'planned'); @@ -12,6 +10,7 @@ CREATE TYPE release_season_t AS ENUM ('winter', 'spring', 'summer', 'fall'); CREATE TABLE providers ( provider_id serial PRIMARY KEY, provider_name varchar(64) NOT NULL + -- token ); CREATE TABLE tags ( @@ -19,6 +18,8 @@ CREATE TABLE tags ( tag_names jsonb NOT NULL --mb constraints ); + +-- clean unused images CREATE TABLE images ( image_id serial PRIMARY KEY, storage_type storage_type_t NOT NULL, @@ -33,6 +34,7 @@ CREATE TABLE users ( nickname varchar(16) NOT NULL CHECK (nickname ~ '^[a-zA-Z0-9_-]+$'), disp_name varchar(32), user_desc varchar(512), + -- timestamp tl dr, also add access ts creation_date timestamp NOT NULL ); @@ -48,7 +50,7 @@ CREATE TABLE titles ( title_names jsonb NOT NULL, studio_id int NOT NULL REFERENCES studios, poster_id int REFERENCES images (image_id), - signal_ids int[] NOT NULL, + --signal_ids int[] NOT NULL, title_status title_status_t NOT NULL, rating float CHECK (rating > 0 AND rating <= 10), --by trigger rating_count int CHECK (rating_count >= 0), --by trigger @@ -64,16 +66,17 @@ CREATE TABLE titles ( ); CREATE TABLE reviews ( - review_id serial PRIMARY KEY, + review_id serial PRIMARY KEY, --??? user_id int NOT NULL REFERENCES users, title_id int NOT NULL REFERENCES titles, - image_ids int[], + --image_ids int[], move somewhere review_text text NOT NULL, creation_date timestamp NOT NULL + -- constrai (title, user) ); CREATE TABLE usertitles ( - usertitle_id serial PRIMARY KEY, + usertitle_id serial PRIMARY KEY, -- bigserial, replace by (,) user_id int NOT NULL REFERENCES users, title_id int NOT NULL REFERENCES titles, status usertitle_status_t NOT NULL, @@ -89,9 +92,8 @@ CREATE TABLE title_tags ( CREATE TABLE signals ( signal_id serial PRIMARY KEY, + -- title_id raw_data jsonb NOT NULL, provider_id int NOT NULL REFERENCES providers, dirty bool NOT NULL -); - -COMMIT; \ No newline at end of file +); \ No newline at end of file diff --git a/modules/backend/db/models.go b/sql/models.go similarity index 56% rename from modules/backend/db/models.go rename to sql/models.go index ba76782..4bed173 100644 --- a/modules/backend/db/models.go +++ b/sql/models.go @@ -2,7 +2,7 @@ // versions: // sqlc v1.30.0 -package db +package sqlc import ( "database/sql/driver" @@ -184,83 +184,81 @@ func (ns NullUsertitleStatusT) Value() (driver.Value, error) { return string(ns.UsertitleStatusT), nil } -type Images struct { - ImageID int32 `db:"image_id" json:"image_id"` - StorageType StorageTypeT `db:"storage_type" json:"storage_type"` - ImagePath string `db:"image_path" json:"image_path"` +type Image struct { + ImageID int32 `json:"image_id"` + StorageType StorageTypeT `json:"storage_type"` + ImagePath string `json:"image_path"` } -type Providers struct { - ProviderID int32 `db:"provider_id" json:"provider_id"` - ProviderName string `db:"provider_name" json:"provider_name"` +type Provider struct { + ProviderID int32 `json:"provider_id"` + ProviderName string `json:"provider_name"` } -type Reviews struct { - ReviewID int32 `db:"review_id" json:"review_id"` - UserID int32 `db:"user_id" json:"user_id"` - TitleID int32 `db:"title_id" json:"title_id"` - ImageIds []int32 `db:"image_ids" json:"image_ids"` - ReviewText string `db:"review_text" json:"review_text"` - CreationDate pgtype.Timestamp `db:"creation_date" json:"creation_date"` +type Review struct { + ReviewID int32 `json:"review_id"` + UserID int32 `json:"user_id"` + TitleID int32 `json:"title_id"` + ReviewText string `json:"review_text"` + CreationDate pgtype.Timestamp `json:"creation_date"` } -type Signals struct { - SignalID int32 `db:"signal_id" json:"signal_id"` - RawData []byte `db:"raw_data" json:"raw_data"` - ProviderID int32 `db:"provider_id" json:"provider_id"` - Dirty bool `db:"dirty" json:"dirty"` +type Signal struct { + SignalID int32 `json:"signal_id"` + RawData []byte `json:"raw_data"` + ProviderID int32 `json:"provider_id"` + Dirty bool `json:"dirty"` } -type Studios struct { - StudioID int32 `db:"studio_id" json:"studio_id"` - StudioName pgtype.Text `db:"studio_name" json:"studio_name"` - IllustID pgtype.Int4 `db:"illust_id" json:"illust_id"` - StudioDesc pgtype.Text `db:"studio_desc" json:"studio_desc"` +type Studio struct { + StudioID int32 `json:"studio_id"` + StudioName *string `json:"studio_name"` + IllustID *int32 `json:"illust_id"` + StudioDesc *string `json:"studio_desc"` } -type Tags struct { - TagID int32 `db:"tag_id" json:"tag_id"` - TagNames []byte `db:"tag_names" json:"tag_names"` +type Tag struct { + TagID int32 `json:"tag_id"` + TagNames []byte `json:"tag_names"` } -type TitleTags struct { - TitleID int32 `db:"title_id" json:"title_id"` - TagID int32 `db:"tag_id" json:"tag_id"` +type Title struct { + TitleID int32 `json:"title_id"` + TitleNames []byte `json:"title_names"` + StudioID int32 `json:"studio_id"` + PosterID *int32 `json:"poster_id"` + TitleStatus TitleStatusT `json:"title_status"` + Rating *float64 `json:"rating"` + RatingCount *int32 `json:"rating_count"` + ReleaseYear *int32 `json:"release_year"` + ReleaseSeason NullReleaseSeasonT `json:"release_season"` + Season *int32 `json:"season"` + EpisodesAired *int32 `json:"episodes_aired"` + EpisodesAll *int32 `json:"episodes_all"` + EpisodesLen []byte `json:"episodes_len"` } -type Titles struct { - TitleID int32 `db:"title_id" json:"title_id"` - TitleNames []byte `db:"title_names" json:"title_names"` - StudioID int32 `db:"studio_id" json:"studio_id"` - PosterID pgtype.Int4 `db:"poster_id" json:"poster_id"` - SignalIds []int32 `db:"signal_ids" json:"signal_ids"` - TitleStatus TitleStatusT `db:"title_status" json:"title_status"` - Rating pgtype.Float8 `db:"rating" json:"rating"` - RatingCount pgtype.Int4 `db:"rating_count" json:"rating_count"` - ReleaseYear pgtype.Int4 `db:"release_year" json:"release_year"` - ReleaseSeason NullReleaseSeasonT `db:"release_season" json:"release_season"` - Season pgtype.Int4 `db:"season" json:"season"` - EpisodesAired pgtype.Int4 `db:"episodes_aired" json:"episodes_aired"` - EpisodesAll pgtype.Int4 `db:"episodes_all" json:"episodes_all"` - EpisodesLen []byte `db:"episodes_len" json:"episodes_len"` +type TitleTag struct { + TitleID int32 `json:"title_id"` + TagID int32 `json:"tag_id"` } -type Users struct { - UserID int32 `db:"user_id" json:"user_id"` - AvatarID pgtype.Int4 `db:"avatar_id" json:"avatar_id"` - Passhash string `db:"passhash" json:"passhash"` - Mail pgtype.Text `db:"mail" json:"mail"` - Nickname string `db:"nickname" json:"nickname"` - DispName pgtype.Text `db:"disp_name" json:"disp_name"` - UserDesc pgtype.Text `db:"user_desc" json:"user_desc"` - CreationDate pgtype.Timestamp `db:"creation_date" json:"creation_date"` +type User struct { + UserID int32 `json:"user_id"` + AvatarID *int32 `json:"avatar_id"` + Passhash string `json:"passhash"` + Mail *string `json:"mail"` + Nickname string `json:"nickname"` + DispName *string `json:"disp_name"` + UserDesc *string `json:"user_desc"` + CreationDate pgtype.Timestamp `json:"creation_date"` } -type Usertitles struct { - UsertitleID int32 `db:"usertitle_id" json:"usertitle_id"` - UserID int32 `db:"user_id" json:"user_id"` - TitleID int32 `db:"title_id" json:"title_id"` - Status UsertitleStatusT `db:"status" json:"status"` - Rate pgtype.Int4 `db:"rate" json:"rate"` - ReviewID pgtype.Int4 `db:"review_id" json:"review_id"` +type Usertitle struct { + UsertitleID int32 `json:"usertitle_id"` + UserID int32 `json:"user_id"` + TitleID int32 `json:"title_id"` + Status UsertitleStatusT `json:"status"` + Rate *int32 `json:"rate"` + ReviewID *int32 `json:"review_id"` } diff --git a/sql/queries.sql.go b/sql/queries.sql.go new file mode 100644 index 0000000..2b00bef --- /dev/null +++ b/sql/queries.sql.go @@ -0,0 +1,23 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.30.0 +// source: queries.sql + +package sqlc + +import ( + "context" +) + +const getImageByID = `-- name: GetImageByID :one +SELECT image_id, storage_type, image_path +FROM images +WHERE image_id = $1 +` + +func (q *Queries) GetImageByID(ctx context.Context, imageID int32) (Image, error) { + row := q.db.QueryRow(ctx, getImageByID, imageID) + var i Image + err := row.Scan(&i.ImageID, &i.StorageType, &i.ImagePath) + return i, err +} diff --git a/sql/sqlc.yaml b/sql/sqlc.yaml new file mode 100644 index 0000000..23b22f9 --- /dev/null +++ b/sql/sqlc.yaml @@ -0,0 +1,14 @@ +version: "2" +sql: + - engine: "postgresql" + queries: + - "../modules/backend/queries.sql" + schema: "migrations" + gen: + go: + package: "sqlc" + out: "." + sql_package: "pgx/v5" + sql_driver: "github.com/jackc/pgx/v5" + emit_json_tags: true + emit_pointers_for_null_types: true \ No newline at end of file From 71e2661fb9afd59af0f06ca4e3432f392da465d4 Mon Sep 17 00:00:00 2001 From: nihonium Date: Sun, 26 Oct 2025 02:09:44 +0300 Subject: [PATCH 37/80] feat!: rewritten db scheme --- sql/migrations/000001_init.down.sql | 7 +- sql/migrations/000001_init.up.sql | 170 +++++++++++++++++----------- 2 files changed, 112 insertions(+), 65 deletions(-) diff --git a/sql/migrations/000001_init.down.sql b/sql/migrations/000001_init.down.sql index d9f23c0..dc52d23 100644 --- a/sql/migrations/000001_init.down.sql +++ b/sql/migrations/000001_init.down.sql @@ -1,7 +1,12 @@ +DROP TRIGGER IF EXISTS trg_update_title_rating ON usertitles; +DROP TRIGGER IF EXISTS trg_notify_new_signal ON signals; + +DROP FUNCTION IF EXISTS update_title_rating(); +DROP FUNCTION IF EXISTS notify_new_signal(); + DROP TABLE IF EXISTS signals; DROP TABLE IF EXISTS title_tags; DROP TABLE IF EXISTS usertitles; -DROP TABLE IF EXISTS reviews; DROP TABLE IF EXISTS titles; DROP TABLE IF EXISTS studios; DROP TABLE IF EXISTS users; diff --git a/sql/migrations/000001_init.up.sql b/sql/migrations/000001_init.up.sql index 93ce071..00114a3 100644 --- a/sql/migrations/000001_init.up.sql +++ b/sql/migrations/000001_init.up.sql @@ -1,99 +1,141 @@ -- TODO: --- title table triggers -- maybe jsonb constraints --- actions (delete) +-- clean unused images CREATE TYPE usertitle_status_t AS ENUM ('finished', 'planned', 'dropped', 'in-progress'); CREATE TYPE storage_type_t AS ENUM ('local', 's3'); CREATE TYPE title_status_t AS ENUM ('finished', 'ongoing', 'planned'); CREATE TYPE release_season_t AS ENUM ('winter', 'spring', 'summer', 'fall'); CREATE TABLE providers ( - provider_id serial PRIMARY KEY, - provider_name varchar(64) NOT NULL - -- token + id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY, + provider_name text NOT NULL, + credentials jsonb ); CREATE TABLE tags ( - tag_id serial PRIMARY KEY, - tag_names jsonb NOT NULL --mb constraints + id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY, + tag_names jsonb NOT NULL ); - --- clean unused images CREATE TABLE images ( - image_id serial PRIMARY KEY, - storage_type storage_type_t NOT NULL, - image_path varchar(256) UNIQUE NOT NULL + id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY, + storage_type storage_type_t NOT NULL, + image_path text UNIQUE NOT NULL ); CREATE TABLE users ( - user_id serial PRIMARY KEY, - avatar_id int REFERENCES images (image_id), - passhash text NOT NULL, - mail varchar(64) CHECK (mail ~ '[a-zA-Z0-9._-]+@[a-zA-Z0-9._-]+\.[a-zA-Z0-9_-]+'), - nickname varchar(16) NOT NULL CHECK (nickname ~ '^[a-zA-Z0-9_-]+$'), - disp_name varchar(32), - user_desc varchar(512), - -- timestamp tl dr, also add access ts - creation_date timestamp NOT NULL + id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY, + avatar_id int REFERENCES images (id), + passhash text NOT NULL, + mail text CHECK (mail ~ '[a-zA-Z0-9._-]+@[a-zA-Z0-9._-]+\.[a-zA-Z0-9_-]+'), + nickname text NOT NULL CHECK (nickname ~ '^[a-zA-Z0-9_-]+$'), + disp_name text, + user_desc text, + creation_date timestamptz NOT NULL, + last_login timestamptz ); CREATE TABLE studios ( - studio_id serial PRIMARY KEY, - studio_name varchar(64) UNIQUE, - illust_id int REFERENCES images (image_id), - studio_desc text + id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY, + studio_name text UNIQUE, + illust_id int REFERENCES images (id), + studio_desc text ); CREATE TABLE titles ( - title_id serial PRIMARY KEY, - title_names jsonb NOT NULL, - studio_id int NOT NULL REFERENCES studios, - poster_id int REFERENCES images (image_id), - --signal_ids int[] NOT NULL, - title_status title_status_t NOT NULL, - rating float CHECK (rating > 0 AND rating <= 10), --by trigger - rating_count int CHECK (rating_count >= 0), --by trigger - release_year int CHECK (release_year >= 1900), - release_season release_season_t, - season int CHECK (season >= 0), - episodes_aired int CHECK (episodes_aired >= 0), - episodes_all int CHECK (episodes_all >= 0), - episodes_len jsonb, + id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY, + title_names jsonb NOT NULL, + studio_id bigint NOT NULL REFERENCES studios (id), + poster_id bigint REFERENCES images (id), + title_status title_status_t NOT NULL, + rating float CHECK (rating >= 0 AND rating <= 10), + rating_count int CHECK (rating_count >= 0), + release_year int CHECK (release_year >= 1900), + release_season release_season_t, + season int CHECK (season >= 0), + episodes_aired int CHECK (episodes_aired >= 0), + episodes_all int CHECK (episodes_all >= 0), + episodes_len jsonb, CHECK ((episodes_aired IS NULL AND episodes_all IS NULL) OR (episodes_aired IS NOT NULL AND episodes_all IS NOT NULL AND episodes_aired <= episodes_all)) ); -CREATE TABLE reviews ( - review_id serial PRIMARY KEY, --??? - user_id int NOT NULL REFERENCES users, - title_id int NOT NULL REFERENCES titles, - --image_ids int[], move somewhere - review_text text NOT NULL, - creation_date timestamp NOT NULL - -- constrai (title, user) -); - CREATE TABLE usertitles ( - usertitle_id serial PRIMARY KEY, -- bigserial, replace by (,) - user_id int NOT NULL REFERENCES users, - title_id int NOT NULL REFERENCES titles, - status usertitle_status_t NOT NULL, - rate int CHECK (rate > 0 AND rate <= 10), - review_id int REFERENCES reviews + PRIMARY KEY (user_id, title_id), + user_id bigint NOT NULL REFERENCES users (id), + title_id bigint NOT NULL REFERENCES titles (id), + status usertitle_status_t NOT NULL, + rate int CHECK (rate > 0 AND rate <= 10), + review_text text, + review_date timestamptz ); CREATE TABLE title_tags ( - PRIMARY KEY (title_id, tag_id), - title_id int NOT NULL REFERENCES titles, - tag_id int NOT NULL REFERENCES tags + PRIMARY KEY (title_id, tag_id), + title_id bigint NOT NULL REFERENCES titles (id), + tag_id bigint NOT NULL REFERENCES tags (id) ); CREATE TABLE signals ( - signal_id serial PRIMARY KEY, - -- title_id - raw_data jsonb NOT NULL, - provider_id int NOT NULL REFERENCES providers, - dirty bool NOT NULL -); \ No newline at end of file + id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY, + title_id bigint REFERENCES titles (id), + raw_data jsonb NOT NULL, + provider_id bigint NOT NULL REFERENCES providers (id), + pending boolean NOT NULL +); + +-- Functions +CREATE OR REPLACE FUNCTION update_title_rating() +RETURNS TRIGGER AS $$ +BEGIN + IF (TG_OP = 'INSERT') OR (TG_OP = 'UPDATE' AND NEW.rate IS DISTINCT FROM OLD.rate) THEN + UPDATE titles + SET + rating = sub.avg_rating, + rating_count = sub.rating_count + FROM ( + SELECT + title_id, + AVG(rate)::float AS avg_rating, + COUNT(rate) AS rating_count + FROM usertitles + WHERE title_id = NEW.title_id AND rate IS NOT NULL + GROUP BY title_id + ) AS sub + WHERE titles.id = sub.title_id; + END IF; + + RETURN NEW; +END; +$$ LANGUAGE plpgsql; + +CREATE OR REPLACE FUNCTION notify_new_signal() +RETURNS TRIGGER AS $$ +DECLARE + payload JSON; +BEGIN + payload := json_build_object( + 'signal_id', NEW.id, + 'title_id', NEW.title_id, + 'provider_id', NEW.provider_id, + 'pending', NEW.pending, + 'timestamp', NOW() + ); + PERFORM pg_notify('new_signal', payload::text); + + RETURN NEW; +END; +$$ LANGUAGE plpgsql; + +-- Triggers + +CREATE TRIGGER trg_update_title_rating +AFTER INSERT OR UPDATE OF rate ON usertitles +FOR EACH ROW +EXECUTE FUNCTION update_title_rating(); + +CREATE TRIGGER trg_notify_new_signal +AFTER INSERT ON signals +FOR EACH ROW +EXECUTE FUNCTION notify_new_signal(); \ No newline at end of file From 948e036e8cbe5f42939782d65c6a3c0839c2a7d4 Mon Sep 17 00:00:00 2001 From: nihonium Date: Sun, 26 Oct 2025 02:34:45 +0300 Subject: [PATCH 38/80] feat: implemented /users/{id} api route --- api/api.gen.go | 123 ++--- api/openapi.yaml | 298 ++++++------- modules/backend/handlers.go | 719 ------------------------------ modules/backend/handlers/users.go | 51 +++ modules/backend/main.go | 3 +- modules/backend/queries.sql | 20 +- sql/migrations/000001_init.up.sql | 4 +- sql/models.go | 66 ++- sql/queries.sql.go | 64 ++- sql/sqlc.yaml | 15 +- 10 files changed, 381 insertions(+), 982 deletions(-) delete mode 100644 modules/backend/handlers.go create mode 100644 modules/backend/handlers/users.go diff --git a/api/api.gen.go b/api/api.gen.go index 58b5b53..24aebd3 100644 --- a/api/api.gen.go +++ b/api/api.gen.go @@ -8,28 +8,48 @@ import ( "encoding/json" "fmt" "net/http" + "time" "github.com/gin-gonic/gin" "github.com/oapi-codegen/runtime" strictgin "github.com/oapi-codegen/runtime/strictmiddleware/gin" + openapi_types "github.com/oapi-codegen/runtime/types" ) -// Title defines model for Title. -type Title map[string]interface{} +// User defines model for User. +type User struct { + // AvatarId ID of the user avatar (references images table) + AvatarId *int64 `json:"avatar_id"` -// GetTitleParams defines parameters for GetTitle. -type GetTitleParams struct { - Query *string `form:"query,omitempty" json:"query,omitempty"` - Limit *int `form:"limit,omitempty" json:"limit,omitempty"` - Offset *int `form:"offset,omitempty" json:"offset,omitempty"` + // CreationDate Timestamp when the user was created + CreationDate time.Time `json:"creation_date"` + + // DispName Display name + DispName *string `json:"disp_name,omitempty"` + + // Id Unique user ID (primary key) + Id *int64 `json:"id,omitempty"` + + // Mail User email + Mail *openapi_types.Email `json:"mail,omitempty"` + + // Nickname Username (alphanumeric + _ or -) + Nickname string `json:"nickname"` + + // UserDesc User description + UserDesc *string `json:"user_desc,omitempty"` +} + +// GetUsersUserIdParams defines parameters for GetUsersUserId. +type GetUsersUserIdParams struct { Fields *string `form:"fields,omitempty" json:"fields,omitempty"` } // ServerInterface represents all server handlers. type ServerInterface interface { - // Get titles - // (GET /title) - GetTitle(c *gin.Context, params GetTitleParams) + // Get user info + // (GET /users/{user_id}) + GetUsersUserId(c *gin.Context, userId string, params GetUsersUserIdParams) } // ServerInterfaceWrapper converts contexts to parameters. @@ -41,37 +61,22 @@ type ServerInterfaceWrapper struct { type MiddlewareFunc func(c *gin.Context) -// GetTitle operation middleware -func (siw *ServerInterfaceWrapper) GetTitle(c *gin.Context) { +// GetUsersUserId operation middleware +func (siw *ServerInterfaceWrapper) GetUsersUserId(c *gin.Context) { var err error + // ------------- Path parameter "user_id" ------------- + var userId string + + err = runtime.BindStyledParameterWithOptions("simple", "user_id", c.Param("user_id"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter user_id: %w", err), http.StatusBadRequest) + return + } + // Parameter object where we will unmarshal all parameters from the context - var params GetTitleParams - - // ------------- Optional query parameter "query" ------------- - - err = runtime.BindQueryParameter("form", true, false, "query", c.Request.URL.Query(), ¶ms.Query) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter query: %w", err), http.StatusBadRequest) - return - } - - // ------------- Optional query parameter "limit" ------------- - - err = runtime.BindQueryParameter("form", true, false, "limit", c.Request.URL.Query(), ¶ms.Limit) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter limit: %w", err), http.StatusBadRequest) - return - } - - // ------------- Optional query parameter "offset" ------------- - - err = runtime.BindQueryParameter("form", true, false, "offset", c.Request.URL.Query(), ¶ms.Offset) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter offset: %w", err), http.StatusBadRequest) - return - } + var params GetUsersUserIdParams // ------------- Optional query parameter "fields" ------------- @@ -88,7 +93,7 @@ func (siw *ServerInterfaceWrapper) GetTitle(c *gin.Context) { } } - siw.Handler.GetTitle(c, params) + siw.Handler.GetUsersUserId(c, userId, params) } // GinServerOptions provides options for the Gin server. @@ -118,39 +123,40 @@ func RegisterHandlersWithOptions(router gin.IRouter, si ServerInterface, options ErrorHandler: errorHandler, } - router.GET(options.BaseURL+"/title", wrapper.GetTitle) + router.GET(options.BaseURL+"/users/:user_id", wrapper.GetUsersUserId) } -type GetTitleRequestObject struct { - Params GetTitleParams +type GetUsersUserIdRequestObject struct { + UserId string `json:"user_id"` + Params GetUsersUserIdParams } -type GetTitleResponseObject interface { - VisitGetTitleResponse(w http.ResponseWriter) error +type GetUsersUserIdResponseObject interface { + VisitGetUsersUserIdResponse(w http.ResponseWriter) error } -type GetTitle200JSONResponse []Title +type GetUsersUserId200JSONResponse User -func (response GetTitle200JSONResponse) VisitGetTitleResponse(w http.ResponseWriter) error { +func (response GetUsersUserId200JSONResponse) VisitGetUsersUserIdResponse(w http.ResponseWriter) error { w.Header().Set("Content-Type", "application/json") w.WriteHeader(200) return json.NewEncoder(w).Encode(response) } -type GetTitle204Response struct { +type GetUsersUserId404Response struct { } -func (response GetTitle204Response) VisitGetTitleResponse(w http.ResponseWriter) error { - w.WriteHeader(204) +func (response GetUsersUserId404Response) VisitGetUsersUserIdResponse(w http.ResponseWriter) error { + w.WriteHeader(404) return nil } // StrictServerInterface represents all server handlers. type StrictServerInterface interface { - // Get titles - // (GET /title) - GetTitle(ctx context.Context, request GetTitleRequestObject) (GetTitleResponseObject, error) + // Get user info + // (GET /users/{user_id}) + GetUsersUserId(ctx context.Context, request GetUsersUserIdRequestObject) (GetUsersUserIdResponseObject, error) } type StrictHandlerFunc = strictgin.StrictGinHandlerFunc @@ -165,17 +171,18 @@ type strictHandler struct { middlewares []StrictMiddlewareFunc } -// GetTitle operation middleware -func (sh *strictHandler) GetTitle(ctx *gin.Context, params GetTitleParams) { - var request GetTitleRequestObject +// GetUsersUserId operation middleware +func (sh *strictHandler) GetUsersUserId(ctx *gin.Context, userId string, params GetUsersUserIdParams) { + var request GetUsersUserIdRequestObject + request.UserId = userId request.Params = params handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.GetTitle(ctx, request.(GetTitleRequestObject)) + return sh.ssi.GetUsersUserId(ctx, request.(GetUsersUserIdRequestObject)) } for _, middleware := range sh.middlewares { - handler = middleware(handler, "GetTitle") + handler = middleware(handler, "GetUsersUserId") } response, err := handler(ctx, request) @@ -183,8 +190,8 @@ func (sh *strictHandler) GetTitle(ctx *gin.Context, params GetTitleParams) { if err != nil { ctx.Error(err) ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(GetTitleResponseObject); ok { - if err := validResponse.VisitGetTitleResponse(ctx.Writer); err != nil { + } else if validResponse, ok := response.(GetUsersUserIdResponseObject); ok { + if err := validResponse.VisitGetUsersUserIdResponse(ctx.Writer); err != nil { ctx.Error(err) } } else if response != nil { diff --git a/api/openapi.yaml b/api/openapi.yaml index b2a2df0..97fa3a4 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -5,40 +5,40 @@ info: servers: - url: https://api.example.com paths: - /title: - get: - summary: Get titles - parameters: - - in: query - name: query - schema: - type: string - - in: query - name: limit - schema: - type: integer - default: 10 - - in: query - name: offset - schema: - type: integer - default: 0 - - in: query - name: fields - schema: - type: string - default: all - responses: - '200': - description: List of titles - content: - application/json: - schema: - type: array - items: - $ref: '#/components/schemas/Title' - '204': - description: No titles found + # /title: + # get: + # summary: Get titles + # parameters: + # - in: query + # name: query + # schema: + # type: string + # - in: query + # name: limit + # schema: + # type: integer + # default: 10 + # - in: query + # name: offset + # schema: + # type: integer + # default: 0 + # - in: query + # name: fields + # schema: + # type: string + # default: all + # responses: + # '200': + # description: List of titles + # content: + # application/json: + # schema: + # type: array + # items: + # $ref: '#/components/schemas/Title' + # '204': + # description: No titles found # /title/{title_id}: # get: @@ -124,122 +124,122 @@ paths: # '204': # description: No reviews found -# /users/{user_id}: -# get: -# summary: Get user info -# parameters: -# - in: path -# name: user_id -# required: true -# schema: -# type: string -# - in: query -# name: fields -# schema: -# type: string -# default: all -# responses: -# '200': -# description: User info -# content: -# application/json: -# schema: -# $ref: '#/components/schemas/User' -# '404': -# description: User not found + /users/{user_id}: + get: + summary: Get user info + parameters: + - in: path + name: user_id + required: true + schema: + type: string + - in: query + name: fields + schema: + type: string + default: all + responses: + '200': + description: User info + content: + application/json: + schema: + $ref: '#/components/schemas/User' + '404': + description: User not found -# patch: -# summary: Update user -# parameters: -# - in: path -# name: user_id -# required: true -# schema: -# type: string -# requestBody: -# required: true -# content: -# application/json: -# schema: -# $ref: '#/components/schemas/User' -# responses: -# '200': -# description: Update result -# content: -# application/json: -# schema: -# type: object -# properties: -# success: -# type: boolean -# error: -# type: string + # patch: + # summary: Update user + # parameters: + # - in: path + # name: user_id + # required: true + # schema: + # type: string + # requestBody: + # required: true + # content: + # application/json: + # schema: + # $ref: '#/components/schemas/User' + # responses: + # '200': + # description: Update result + # content: + # application/json: + # schema: + # type: object + # properties: + # success: + # type: boolean + # error: + # type: string -# delete: -# summary: Delete user -# parameters: -# - in: path -# name: user_id -# required: true -# schema: -# type: string -# responses: -# '200': -# description: Delete result -# content: -# application/json: -# schema: -# type: object -# properties: -# success: -# type: boolean -# error: -# type: string + # delete: + # summary: Delete user + # parameters: + # - in: path + # name: user_id + # required: true + # schema: + # type: string + # responses: + # '200': + # description: Delete result + # content: + # application/json: + # schema: + # type: object + # properties: + # success: + # type: boolean + # error: + # type: string -# /users: -# get: -# summary: Search user -# parameters: -# - in: query -# name: query -# schema: -# type: string -# - in: query -# name: fields -# schema: -# type: string -# responses: -# '200': -# description: List of users -# content: -# application/json: -# schema: -# type: array -# items: -# $ref: '#/components/schemas/User' + # /users: + # get: + # summary: Search user + # parameters: + # - in: query + # name: query + # schema: + # type: string + # - in: query + # name: fields + # schema: + # type: string + # responses: + # '200': + # description: List of users + # content: + # application/json: + # schema: + # type: array + # items: + # $ref: '#/components/schemas/User' -# post: -# summary: Add new user -# requestBody: -# required: true -# content: -# application/json: -# schema: -# $ref: '#/components/schemas/User' -# responses: -# '200': -# description: Add result -# content: -# application/json: -# schema: -# type: object -# properties: -# success: -# type: boolean -# error: -# type: string -# user_json: -# $ref: '#/components/schemas/User' + # post: + # summary: Add new user + # requestBody: + # required: true + # content: + # application/json: + # schema: + # $ref: '#/components/schemas/User' + # responses: + # '200': + # description: Add result + # content: + # application/json: + # schema: + # type: object + # properties: + # success: + # type: boolean + # error: + # type: string + # user_json: + # $ref: '#/components/schemas/User' # /users/{user_id}/titles: # get: @@ -541,14 +541,14 @@ components: User: type: object properties: - user_id: + id: type: integer - format: int32 + format: int64 description: Unique user ID (primary key) example: 1 avatar_id: type: integer - format: int32 + format: int64 description: ID of the user avatar (references images table) nullable: true example: null diff --git a/modules/backend/handlers.go b/modules/backend/handlers.go deleted file mode 100644 index 366f298..0000000 --- a/modules/backend/handlers.go +++ /dev/null @@ -1,719 +0,0 @@ -package main - -import ( - "context" - "encoding/json" - "nyanimedb/modules/backend/db" - sqlc "nyanimedb/sql" - "strconv" - "time" - - "github.com/jackc/pgx/v5" - "github.com/jackc/pgx/v5/pgtype" - "golang.org/x/crypto/bcrypt" -) - -type Server struct { - db *sqlc.Queries -} - -func NewServer(db *db.Queries) Server { - return Server{db: db} -} - -// ————————————————————————————————————————————— -// ВСПОМОГАТЕЛЬНЫЕ ФУНКЦИИ -// ————————————————————————————————————————————— - -func parseInt32(s string) (int32, error) { - i, err := strconv.ParseInt(s, 10, 32) - return int32(i), err -} - -func ptr[T any](v T) *T { return &v } - -func pgInt4ToPtr(v pgtype.Int4) *int32 { - if v.Valid { - return &v.Int32 - } - return nil -} - -func pgTextToPtr(v pgtype.Text) *string { - if v.Valid { - return &v.String - } - return nil -} - -func pgFloat8ToPtr(v pgtype.Float8) *float64 { - if v.Valid { - return &v.Float64 - } - return nil -} - -func jsonbToInterface(data []byte) interface{} { - if data == nil { - return nil - } - var out interface{} - if err := json.Unmarshal(data, &out); err != nil { - return string(data) // fallback - } - return out -} - -// ————————————————————————————————————————————— -// ХЕНДЛЕРЫ -// ————————————————————————————————————————————— - -func (s Server) GetMedia(ctx context.Context, req GetMediaRequestObject) (GetMediaResponseObject, error) { - id, err := parseInt32(req.Params.ImageId) - if err != nil { - return GetMedia200JSONResponse{Success: ptr(false), Error: ptr("invalid image_id")}, nil - } - img, err := s.db.GetImageByID(ctx, id) - if err != nil { - if err == pgx.ErrNoRows { - return GetMedia200JSONResponse{Success: ptr(false), Error: ptr("image not found")}, nil - } - return nil, err - } - return GetMedia200JSONResponse{ - Success: ptr(true), - ImagePath: ptr(img.ImagePath), - }, nil -} - -func (s Server) PostMedia(ctx context.Context, req PostMediaRequestObject) (PostMediaResponseObject, error) { - // ❗ Не реализовано: OpenAPI не определяет тело запроса для загрузки - return PostMedia200JSONResponse{ - Success: ptr(false), - Error: ptr("upload not implemented: request body not defined in spec"), - }, nil -} - -func (s Server) GetUsers(ctx context.Context, req GetUsersRequestObject) (GetUsersResponseObject, error) { - users, err := s.db.ListUsers(ctx, db.ListUsersParams{}) - if err != nil { - return nil, err - } - var resp []User - for _, u := range users { - resp = append(resp, mapUser(u)) - } - return GetUsers200JSONResponse(resp), nil -} - -func (s Server) PostUsers(ctx context.Context, req PostUsersRequestObject) (PostUsersResponseObject, error) { - if req.Body == nil { - return PostUsers200JSONResponse{ - Success: ptr(false), - Error: ptr("request body is required"), - }, nil - } - - body := *req.Body - - // Обязательные поля - nickname, ok := body["nickname"].(string) - if !ok || nickname == "" { - return PostUsers200JSONResponse{Success: ptr(false), Error: ptr("nickname is required")}, nil - } - - mail, ok := body["mail"].(string) - if !ok || mail == "" { - return PostUsers200JSONResponse{Success: ptr(false), Error: ptr("mail is required")}, nil - } - - password, ok := body["password"].(string) - if !ok || password == "" { - return PostUsers200JSONResponse{Success: ptr(false), Error: ptr("password is required")}, nil - } - - // Опциональные поля - var avatarID *int32 - if v, ok := body["avatar_id"].(float64); ok { - id := int32(v) - avatarID = &id - } - - dispName, _ := body["disp_name"].(string) - userDesc, _ := body["user_desc"].(string) - - // 🔐 Хешируем пароль - passhashBytes, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost) - if err != nil { - return PostUsers200JSONResponse{Success: ptr(false), Error: ptr("failed to hash password")}, nil - } - passhash := string(passhashBytes) - - // Сохраняем в БД - _, err = s.db.CreateUser(ctx, db.CreateUserParams{ - AvatarID: pgtype.Int4{ - Int32: 0, - Valid: avatarID != nil, - }, - Passhash: passhash, - Mail: pgtype.Text{ - String: mail, - Valid: true, - }, - Nickname: nickname, - DispName: pgtype.Text{ - String: dispName, - Valid: dispName != "", - }, - UserDesc: pgtype.Text{ - String: userDesc, - Valid: userDesc != "", - }, - CreationDate: pgtype.Timestamp{ - Time: time.Now(), - Valid: true, - }, - }) - if err != nil { - // Проверяем нарушение уникальности (например, дубль mail или nickname) - if err.Error() == "ERROR: duplicate key value violates unique constraint \"users_mail_key\"" || - err.Error() == "ERROR: duplicate key value violates unique constraint \"users_nickname_key\"" { - return PostUsers200JSONResponse{ - Success: ptr(false), - Error: ptr("user with this email or nickname already exists"), - }, nil - } - return PostUsers200JSONResponse{Success: ptr(false), Error: ptr("database error")}, nil - } - - // Получаем созданного пользователя (без passhash и mail!) - // Предположим, что у вас есть запрос GetUserByNickname или аналогичный - // Но проще — вернуть только ID и nickname - - // ⚠️ Поскольку мы не знаем user_id, можно: - // а) добавить RETURNING в CreateUser (рекомендуется), - // б) сделать отдельный SELECT. - - // Пока вернём минимальный ответ - userResp := User{ - "nickname": nickname, - // "user_id" можно добавить, если обновите query.sql - } - - return PostUsers200JSONResponse{ - Success: ptr(true), - UserJson: &userResp, - }, nil -} -func (s Server) DeleteUsersUserId(ctx context.Context, req DeleteUsersUserIdRequestObject) (DeleteUsersUserIdResponseObject, error) { - userID, err := parseInt32(req.UserId) - if err != nil { - return DeleteUsersUserId200JSONResponse{Success: ptr(false), Error: ptr("invalid user_id")}, nil - } - err = s.db.DeleteUser(ctx, userID) - if err != nil { - if err == pgx.ErrNoRows { - return DeleteUsersUserId200JSONResponse{Success: ptr(false), Error: ptr("user not found")}, nil - } - return nil, err - } - return DeleteUsersUserId200JSONResponse{Success: ptr(true)}, nil -} - -func (s Server) GetUsersUserId(ctx context.Context, req GetUsersUserIdRequestObject) (GetUsersUserIdResponseObject, error) { - userID, err := parseInt32(req.UserId) - if err != nil { - return GetUsersUserId404Response{}, nil - } - user, err := s.db.GetUserByID(ctx, userID) - if err != nil { - if err == pgx.ErrNoRows { - return GetUsersUserId404Response{}, nil - } - return nil, err - } - return GetUsersUserId200JSONResponse(mapUser(user)), nil -} - -func (s Server) PatchUsersUserId(ctx context.Context, req PatchUsersUserIdRequestObject) (PatchUsersUserIdResponseObject, error) { - userID, err := parseInt32(req.UserId) - if err != nil { - return PatchUsersUserId200JSONResponse{Success: ptr(false), Error: ptr("invalid user_id")}, nil - } - if req.Body == nil { - return PatchUsersUserId200JSONResponse{Success: ptr(false), Error: ptr("empty body")}, nil - } - - body := *req.Body - args := db.UpdateUserParams{ - UserID: userID, - } - - if v, ok := body["avatar_id"].(float64); ok { - args.AvatarID = pgtype.Int4{Int32: int32(v), Valid: true} - // args.AvatarIDValid = true - } - if v, ok := body["disp_name"].(string); ok { - args.DispName = pgtype.Text{String: v, Valid: true} - // args.DispNameValid = true - } - if v, ok := body["user_desc"].(string); ok { - args.UserDesc = pgtype.Text{String: v, Valid: true} - // args.UserDescValid = true - } - - _, err = s.db.UpdateUser(ctx, args) - if err != nil { - return PatchUsersUserId200JSONResponse{Success: ptr(false), Error: ptr(err.Error())}, nil - } - return PatchUsersUserId200JSONResponse{Success: ptr(true)}, nil -} - -func (s Server) GetUsersUserIdReviews(ctx context.Context, req GetUsersUserIdReviewsRequestObject) (GetUsersUserIdReviewsResponseObject, error) { - userID, err := parseInt32(req.UserId) - if err != nil { - return GetUsersUserIdReviews200JSONResponse{}, nil - } - limit := int32(20) - offset := int32(0) - // if req.Params.Limit != nil { - // limit = int32(*req.Params.Limit) - // } - // if req.Params.Offset != nil { - // offset = int32(*req.Params.Offset) - // } - - reviews, err := s.db.ListReviewsByUser(ctx, db.ListReviewsByUserParams{ - UserID: userID, - Limit: limit, - Offset: offset, - }) - if err != nil { - return nil, err - } - - var resp []Review - for _, r := range reviews { - resp = append(resp, mapReview(r)) - } - return GetUsersUserIdReviews200JSONResponse(resp), nil -} - -func (s Server) DeleteUsersUserIdTitles(ctx context.Context, req DeleteUsersUserIdTitlesRequestObject) (DeleteUsersUserIdTitlesResponseObject, error) { - userID, err := parseInt32(req.UserId) - if err != nil { - return DeleteUsersUserIdTitles200JSONResponse{Success: ptr(false), Error: ptr("invalid user_id")}, nil - } - - if req.Params.TitleId != nil { - titleID, err := parseInt32(*req.Params.TitleId) - if err != nil { - return DeleteUsersUserIdTitles200JSONResponse{Success: ptr(false), Error: ptr("invalid title_id")}, nil - } - err = s.db.DeleteUserTitle(ctx, db.DeleteUserTitleParams{ - UserID: userID, - Column2: titleID, - }) - if err != nil && err != pgx.ErrNoRows { - return nil, err - } - } - // else { - // err = s.db.DeleteAllUserTitles(ctx, userID) - // if err != nil { - // return nil, err - // } - // } - return DeleteUsersUserIdTitles200JSONResponse{Success: ptr(true)}, nil -} - -func (s Server) GetUsersUserIdTitles(ctx context.Context, req GetUsersUserIdTitlesRequestObject) (GetUsersUserIdTitlesResponseObject, error) { - userID, err := parseInt32(req.UserId) - if err != nil { - return GetUsersUserIdTitles200JSONResponse{}, nil - } - limit := int32(100) - offset := int32(0) - if req.Params.Limit != nil { - limit = int32(*req.Params.Limit) - } - if req.Params.Offset != nil { - offset = int32(*req.Params.Offset) - } - - titles, err := s.db.ListUserTitles(ctx, db.ListUserTitlesParams{ - UserID: userID, - Limit: limit, - Offset: offset, - }) - if err != nil { - return nil, err - } - - var resp []UserTitle - for _, t := range titles { - resp = append(resp, mapUserTitle(t)) - } - return GetUsersUserIdTitles200JSONResponse(resp), nil -} - -func (s Server) PatchUsersUserIdTitles(ctx context.Context, req PatchUsersUserIdTitlesRequestObject) (PatchUsersUserIdTitlesResponseObject, error) { - // userID, err := parseInt32(req.UserId) - // if err != nil { - // return PatchUsersUserIdTitles200JSONResponse{Success: ptr(false), Error: ptr("invalid user_id")}, nil - // } - // if req.Body == nil { - // return PatchUsersUserIdTitles200JSONResponse{Success: ptr(false), Error: ptr("empty body")}, nil - // } - - // body := *req.Body - // titleID, ok := body["title_id"].(float64) - // if !ok { - // return PatchUsersUserIdTitles200JSONResponse{Success: ptr(false), Error: ptr("title_id required")}, nil - // } - - // args := db.UpdateUserTitleParams{ - // UserID: userID, - // TitleID: int32(titleID), - // } - - // if v, ok := body["status"].(string); ok { - // args.Status = db.UsertitleStatusT(v) - // // args.StatusValid = true - // } - // if v, ok := body["rate"].(float64); ok { - // args.Rate = pgtype.Int4{Int32: int32(v), Valid: true} - // // args.RateValid = true - // } - // if v, ok := body["review_id"].(float64); ok { - // args.ReviewID = pgtype.Int4{Int32: int32(v), Valid: true} - // // args.ReviewIDValid = true - // } - - // _, err = s.db.UpdateUserTitle(ctx, args) - // if err != nil { - // return PatchUsersUserIdTitles200JSONResponse{Success: ptr(false), Error: ptr(err.Error())}, nil - // } - return PatchUsersUserIdTitles200JSONResponse{Success: ptr(true)}, nil -} - -func (s Server) PostUsersUserIdTitles(ctx context.Context, req PostUsersUserIdTitlesRequestObject) (PostUsersUserIdTitlesResponseObject, error) { - userID, err := parseInt32(req.UserId) - if err != nil { - return PostUsersUserIdTitles200JSONResponse{Success: ptr(false), Error: ptr("invalid user_id")}, nil - } - if req.Body == nil { - return PostUsersUserIdTitles200JSONResponse{Success: ptr(false), Error: ptr("empty body")}, nil - } - - body := req.Body - titleID, err := parseInt32(*body.TitleId) - if err != nil { - return PostUsersUserIdTitles200JSONResponse{Success: ptr(false), Error: ptr("invalid title_id")}, nil - } - - status := db.UsertitleStatusT("planned") - if body.Status != nil { - status = db.UsertitleStatusT(*body.Status) - } - - _, err = s.db.CreateUserTitle(ctx, db.CreateUserTitleParams{ - UserID: userID, - TitleID: titleID, - Status: status, - Rate: pgtype.Int4{Valid: false}, - ReviewID: pgtype.Int4{Valid: false}, - }) - if err != nil { - return PostUsersUserIdTitles200JSONResponse{Success: ptr(false), Error: ptr(err.Error())}, nil - } - return PostUsersUserIdTitles200JSONResponse{Success: ptr(true)}, nil -} - -func (s Server) GetTags(ctx context.Context, req GetTagsRequestObject) (GetTagsResponseObject, error) { - limit := int32(100) - offset := int32(0) - if req.Params.Limit != nil { - limit = int32(*req.Params.Limit) - } - if req.Params.Offset != nil { - offset = int32(*req.Params.Offset) - } - tags, err := s.db.ListTags(ctx, db.ListTagsParams{Limit: limit, Offset: offset}) - if err != nil { - return nil, err - } - var resp []Tag - for _, t := range tags { - resp = append(resp, Tag{ - "tag_id": t.TagID, - "tag_names": jsonbToInterface(t.TagNames), - }) - } - return GetTags200JSONResponse(resp), nil -} - -func (s Server) GetTitle(ctx context.Context, req GetTitleRequestObject) (GetTitleResponseObject, error) { - limit := int32(50) - offset := int32(0) - if req.Params.Limit != nil { - limit = int32(*req.Params.Limit) - } - if req.Params.Offset != nil { - offset = int32(*req.Params.Offset) - } - titles, err := s.db.ListTitles(ctx, db.ListTitlesParams{Limit: limit, Offset: offset}) - if err != nil { - return nil, err - } - var resp []Title - for _, t := range titles { - resp = append(resp, mapTitle(t)) - } - return GetTitle200JSONResponse(resp), nil -} - -func (s Server) GetTitleTitleId(ctx context.Context, req GetTitleTitleIdRequestObject) (GetTitleTitleIdResponseObject, error) { - titleID, err := parseInt32(req.TitleId) - if err != nil { - return GetTitleTitleId404Response{}, nil - } - title, err := s.db.GetTitleByID(ctx, titleID) - if err != nil { - if err == pgx.ErrNoRows { - return GetTitleTitleId404Response{}, nil - } - return nil, err - } - return GetTitleTitleId200JSONResponse(mapTitle(title)), nil -} - -func (s Server) PatchTitleTitleId(ctx context.Context, req PatchTitleTitleIdRequestObject) (PatchTitleTitleIdResponseObject, error) { - titleID, err := parseInt32(req.TitleId) - if err != nil { - return PatchTitleTitleId200JSONResponse{Success: ptr(false), Error: ptr("invalid title_id")}, nil - } - if req.Body == nil { - return PatchTitleTitleId200JSONResponse{Success: ptr(false), Error: ptr("empty body")}, nil - } - - body := *req.Body - args := db.UpdateTitleParams{ - TitleID: titleID, - } - - if v, ok := body["title_names"].(map[string]interface{}); ok { - data, _ := json.Marshal(v) - args.TitleNames = data - // args.TitleNamesValid = true - } - if v, ok := body["studio_id"].(float64); ok { - args.StudioID = pgtype.Int4{Int32: int32(v), Valid: true} - // args.StudioIDValid = true - } - if v, ok := body["poster_id"].(float64); ok { - args.PosterID = pgtype.Int4{Int32: int32(v), Valid: true} - // args.PosterIDValid = true - } - // if v, ok := body["title_status"].(string); ok { - // args.TitleStatus = db.NullTitleStatusT(v) - // // args.TitleStatusValid = true - // } - if v, ok := body["release_year"].(float64); ok { - args.ReleaseYear = pgtype.Int4{Int32: int32(v), Valid: true} - // args.ReleaseYearValid = true - } - if v, ok := body["episodes_aired"].(float64); ok { - args.EpisodesAired = pgtype.Int4{Int32: int32(v), Valid: true} - // args.EpisodesAiredValid = true - } - if v, ok := body["episodes_all"].(float64); ok { - args.EpisodesAll = pgtype.Int4{Int32: int32(v), Valid: true} - // args.EpisodesAllValid = true - } - - _, err = s.db.UpdateTitle(ctx, args) - if err != nil { - return PatchTitleTitleId200JSONResponse{Success: ptr(false), Error: ptr(err.Error())}, nil - } - return PatchTitleTitleId200JSONResponse{Success: ptr(true)}, nil -} - -func (s Server) GetTitleTitleIdReviews(ctx context.Context, req GetTitleTitleIdReviewsRequestObject) (GetTitleTitleIdReviewsResponseObject, error) { - titleID, err := parseInt32(req.TitleId) - if err != nil { - return GetTitleTitleIdReviews200JSONResponse{}, nil - } - limit := int32(20) - offset := int32(0) - if req.Params.Limit != nil { - limit = int32(*req.Params.Limit) - } - if req.Params.Offset != nil { - offset = int32(*req.Params.Offset) - } - - reviews, err := s.db.ListReviewsByTitle(ctx, db.ListReviewsByTitleParams{ - TitleID: titleID, - Limit: limit, - Offset: offset, - }) - if err != nil { - return nil, err - } - - var resp []Review - for _, r := range reviews { - resp = append(resp, mapReview(r)) - } - return GetTitleTitleIdReviews200JSONResponse(resp), nil -} - -func (s Server) PostReviews(ctx context.Context, req PostReviewsRequestObject) (PostReviewsResponseObject, error) { - if req.Body == nil { - return PostReviews200JSONResponse{Success: ptr(false), Error: ptr("empty body")}, nil - } - - body := *req.Body - userID, ok1 := body["user_id"].(float64) - titleID, ok2 := body["title_id"].(float64) - reviewText, ok3 := body["review_text"].(string) - if !ok1 || !ok2 || !ok3 { - return PostReviews200JSONResponse{Success: ptr(false), Error: ptr("user_id, title_id, review_text required")}, nil - } - - var imageIDs []int32 - if ids, ok := body["image_ids"].([]interface{}); ok { - for _, id := range ids { - if f, ok := id.(float64); ok { - imageIDs = append(imageIDs, int32(f)) - } - } - } - - _, err := s.db.CreateReview(ctx, db.CreateReviewParams{ - UserID: int32(userID), - TitleID: int32(titleID), - ImageIds: imageIDs, - ReviewText: reviewText, - CreationDate: pgtype.Timestamp{Time: time.Now(), Valid: true}, - }) - if err != nil { - return PostReviews200JSONResponse{Success: ptr(false), Error: ptr(err.Error())}, nil - } - - return PostReviews200JSONResponse{Success: ptr(true)}, nil -} - -func (s Server) DeleteReviewsReviewId(ctx context.Context, req DeleteReviewsReviewIdRequestObject) (DeleteReviewsReviewIdResponseObject, error) { - reviewID, err := parseInt32(req.ReviewId) - if err != nil { - return DeleteReviewsReviewId200JSONResponse{Success: ptr(false), Error: ptr("invalid review_id")}, nil - } - err = s.db.DeleteReview(ctx, reviewID) - if err != nil { - if err == pgx.ErrNoRows { - return DeleteReviewsReviewId200JSONResponse{Success: ptr(false), Error: ptr("review not found")}, nil - } - return nil, err - } - return DeleteReviewsReviewId200JSONResponse{Success: ptr(true)}, nil -} - -func (s Server) PatchReviewsReviewId(ctx context.Context, req PatchReviewsReviewIdRequestObject) (PatchReviewsReviewIdResponseObject, error) { - reviewID, err := parseInt32(req.ReviewId) - if err != nil { - return PatchReviewsReviewId200JSONResponse{Success: ptr(false), Error: ptr("invalid review_id")}, nil - } - if req.Body == nil { - return PatchReviewsReviewId200JSONResponse{Success: ptr(false), Error: ptr("empty body")}, nil - } - - body := *req.Body - args := db.UpdateReviewParams{ - ReviewID: reviewID, - } - - if v, ok := body["review_text"].(string); ok { - args.ReviewText = pgtype.Text{String: v, Valid: true} - // args.ReviewTextValid = true - } - if ids, ok := body["image_ids"].([]interface{}); ok { - var imageIDs []int32 - for _, id := range ids { - if f, ok := id.(float64); ok { - imageIDs = append(imageIDs, int32(f)) - } - } - args.ImageIds = imageIDs - // args.ImageIdsValid = true - } - - _, err = s.db.UpdateReview(ctx, args) - if err != nil { - return PatchReviewsReviewId200JSONResponse{Success: ptr(false), Error: ptr(err.Error())}, nil - } - return PatchReviewsReviewId200JSONResponse{Success: ptr(true)}, nil -} - -// ————————————————————————————————————————————— -// МАППИНГИ -// ————————————————————————————————————————————— - -func mapUser(u db.Users) User { - return User{ - "user_id": u.UserID, - "avatar_id": pgInt4ToPtr(u.AvatarID), - "nickname": u.Nickname, - "disp_name": pgTextToPtr(u.DispName), - "user_desc": pgTextToPtr(u.UserDesc), - "creation_date": u.CreationDate.Time, - // mail и passhash НЕ возвращаем! - } -} - -func mapTitle(t db.Titles) Title { - var releaseSeason interface{} - if t.ReleaseSeason.Valid { - releaseSeason = string(t.ReleaseSeason.ReleaseSeasonT) - } - - return Title{ - "title_id": t.TitleID, - "title_names": jsonbToInterface(t.TitleNames), - "studio_id": t.StudioID, - "poster_id": pgInt4ToPtr(t.PosterID), - "signal_ids": t.SignalIds, - "title_status": string(t.TitleStatus), - "rating": pgFloat8ToPtr(t.Rating), - "rating_count": pgInt4ToPtr(t.RatingCount), - "release_year": pgInt4ToPtr(t.ReleaseYear), - "release_season": releaseSeason, - "season": pgInt4ToPtr(t.Season), - "episodes_aired": pgInt4ToPtr(t.EpisodesAired), - "episodes_all": pgInt4ToPtr(t.EpisodesAll), - "episodes_len": jsonbToInterface(t.EpisodesLen), - } -} - -func mapReview(r db.Reviews) Review { - return Review{ - "review_id": r.ReviewID, - "user_id": r.UserID, - "title_id": r.TitleID, - "image_ids": r.ImageIds, - "review_text": r.ReviewText, - "creation_date": r.CreationDate.Time, - } -} - -func mapUserTitle(ut db.Usertitles) UserTitle { - return UserTitle{ - "usertitle_id": ut.UsertitleID, - "user_id": ut.UserID, - "title_id": ut.TitleID, - "status": string(ut.Status), - "rate": pgInt4ToPtr(ut.Rate), - "review_id": pgInt4ToPtr(ut.ReviewID), - } -} diff --git a/modules/backend/handlers/users.go b/modules/backend/handlers/users.go new file mode 100644 index 0000000..b67153d --- /dev/null +++ b/modules/backend/handlers/users.go @@ -0,0 +1,51 @@ +package handlers + +import ( + "context" + oapi "nyanimedb/api" + sqlc "nyanimedb/sql" + "strconv" + + "github.com/jackc/pgx/v5" + "github.com/oapi-codegen/runtime/types" +) + +type Server struct { + db *sqlc.Queries +} + +func NewServer(db *sqlc.Queries) Server { + return Server{db: db} +} + +func parseInt64(s string) (int32, error) { + i, err := strconv.ParseInt(s, 10, 64) + return int32(i), err +} + +func mapUser(u sqlc.GetUserByIDRow) oapi.User { + return oapi.User{ + AvatarId: u.AvatarID, + CreationDate: u.CreationDate, + DispName: u.DispName, + Id: &u.ID, + Mail: (*types.Email)(u.Mail), + Nickname: u.Nickname, + UserDesc: u.UserDesc, + } +} + +func (s Server) GetUsersUserId(ctx context.Context, req oapi.GetUsersUserIdRequestObject) (oapi.GetUsersUserIdResponseObject, error) { + userID, err := parseInt64(req.UserId) + if err != nil { + return oapi.GetUsersUserId404Response{}, nil + } + user, err := s.db.GetUserByID(context.TODO(), int64(userID)) + if err != nil { + if err == pgx.ErrNoRows { + return oapi.GetUsersUserId404Response{}, nil + } + return nil, err + } + return oapi.GetUsersUserId200JSONResponse(mapUser(user)), nil +} diff --git a/modules/backend/main.go b/modules/backend/main.go index a9e8db0..42a66d3 100644 --- a/modules/backend/main.go +++ b/modules/backend/main.go @@ -9,6 +9,7 @@ import ( "time" oapi "nyanimedb/api" + handlers "nyanimedb/modules/backend/handlers" "github.com/gin-contrib/cors" "github.com/gin-gonic/gin" @@ -42,7 +43,7 @@ func main() { queries := sqlc.New(conn) - server := NewServer(queries) + server := handlers.NewServer(queries) // r.LoadHTMLGlob("templates/*") r.Use(cors.New(cors.Config{ diff --git a/modules/backend/queries.sql b/modules/backend/queries.sql index 7c9c197..b1dd8af 100644 --- a/modules/backend/queries.sql +++ b/modules/backend/queries.sql @@ -1,17 +1,17 @@ -- name: GetImageByID :one -SELECT image_id, storage_type, image_path +SELECT id, storage_type, image_path FROM images -WHERE image_id = $1; +WHERE id = $1; --- -- name: CreateImage :one --- INSERT INTO images (storage_type, image_path) --- VALUES ($1, $2) --- RETURNING image_id, storage_type, image_path; +-- name: CreateImage :one +INSERT INTO images (storage_type, image_path) +VALUES ($1, $2) +RETURNING id, storage_type, image_path; --- -- name: GetUserByID :one --- SELECT user_id, avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date --- FROM users --- WHERE user_id = $1; +-- name: GetUserByID :one +SELECT id, avatar_id, mail, nickname, disp_name, user_desc, creation_date +FROM users +WHERE id = $1; -- -- name: ListUsers :many -- SELECT user_id, avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date diff --git a/sql/migrations/000001_init.up.sql b/sql/migrations/000001_init.up.sql index 00114a3..0b7fa33 100644 --- a/sql/migrations/000001_init.up.sql +++ b/sql/migrations/000001_init.up.sql @@ -25,7 +25,7 @@ CREATE TABLE images ( CREATE TABLE users ( id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY, - avatar_id int REFERENCES images (id), + avatar_id bigint REFERENCES images (id), passhash text NOT NULL, mail text CHECK (mail ~ '[a-zA-Z0-9._-]+@[a-zA-Z0-9._-]+\.[a-zA-Z0-9_-]+'), nickname text NOT NULL CHECK (nickname ~ '^[a-zA-Z0-9_-]+$'), @@ -38,7 +38,7 @@ CREATE TABLE users ( CREATE TABLE studios ( id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY, studio_name text UNIQUE, - illust_id int REFERENCES images (id), + illust_id bigint REFERENCES images (id), studio_desc text ); diff --git a/sql/models.go b/sql/models.go index 4bed173..928d5ac 100644 --- a/sql/models.go +++ b/sql/models.go @@ -7,6 +7,7 @@ package sqlc import ( "database/sql/driver" "fmt" + "time" "github.com/jackc/pgx/v5/pgtype" ) @@ -185,48 +186,42 @@ func (ns NullUsertitleStatusT) Value() (driver.Value, error) { } type Image struct { - ImageID int32 `json:"image_id"` + ID int64 `json:"id"` StorageType StorageTypeT `json:"storage_type"` ImagePath string `json:"image_path"` } type Provider struct { - ProviderID int32 `json:"provider_id"` + ID int64 `json:"id"` ProviderName string `json:"provider_name"` -} - -type Review struct { - ReviewID int32 `json:"review_id"` - UserID int32 `json:"user_id"` - TitleID int32 `json:"title_id"` - ReviewText string `json:"review_text"` - CreationDate pgtype.Timestamp `json:"creation_date"` + Credentials []byte `json:"credentials"` } type Signal struct { - SignalID int32 `json:"signal_id"` + ID int64 `json:"id"` + TitleID *int64 `json:"title_id"` RawData []byte `json:"raw_data"` - ProviderID int32 `json:"provider_id"` - Dirty bool `json:"dirty"` + ProviderID int64 `json:"provider_id"` + Pending bool `json:"pending"` } type Studio struct { - StudioID int32 `json:"studio_id"` + ID int64 `json:"id"` StudioName *string `json:"studio_name"` - IllustID *int32 `json:"illust_id"` + IllustID *int64 `json:"illust_id"` StudioDesc *string `json:"studio_desc"` } type Tag struct { - TagID int32 `json:"tag_id"` + ID int64 `json:"id"` TagNames []byte `json:"tag_names"` } type Title struct { - TitleID int32 `json:"title_id"` + ID int64 `json:"id"` TitleNames []byte `json:"title_names"` - StudioID int32 `json:"studio_id"` - PosterID *int32 `json:"poster_id"` + StudioID int64 `json:"studio_id"` + PosterID *int64 `json:"poster_id"` TitleStatus TitleStatusT `json:"title_status"` Rating *float64 `json:"rating"` RatingCount *int32 `json:"rating_count"` @@ -239,26 +234,27 @@ type Title struct { } type TitleTag struct { - TitleID int32 `json:"title_id"` - TagID int32 `json:"tag_id"` + TitleID int64 `json:"title_id"` + TagID int64 `json:"tag_id"` } type User struct { - UserID int32 `json:"user_id"` - AvatarID *int32 `json:"avatar_id"` - Passhash string `json:"passhash"` - Mail *string `json:"mail"` - Nickname string `json:"nickname"` - DispName *string `json:"disp_name"` - UserDesc *string `json:"user_desc"` - CreationDate pgtype.Timestamp `json:"creation_date"` + ID int64 `json:"id"` + AvatarID *int64 `json:"avatar_id"` + Passhash string `json:"passhash"` + Mail *string `json:"mail"` + Nickname string `json:"nickname"` + DispName *string `json:"disp_name"` + UserDesc *string `json:"user_desc"` + CreationDate time.Time `json:"creation_date"` + LastLogin pgtype.Timestamptz `json:"last_login"` } type Usertitle struct { - UsertitleID int32 `json:"usertitle_id"` - UserID int32 `json:"user_id"` - TitleID int32 `json:"title_id"` - Status UsertitleStatusT `json:"status"` - Rate *int32 `json:"rate"` - ReviewID *int32 `json:"review_id"` + UserID int64 `json:"user_id"` + TitleID int64 `json:"title_id"` + Status UsertitleStatusT `json:"status"` + Rate *int32 `json:"rate"` + ReviewText *string `json:"review_text"` + ReviewDate pgtype.Timestamptz `json:"review_date"` } diff --git a/sql/queries.sql.go b/sql/queries.sql.go index 2b00bef..8f92c2a 100644 --- a/sql/queries.sql.go +++ b/sql/queries.sql.go @@ -7,17 +7,67 @@ package sqlc import ( "context" + "time" ) -const getImageByID = `-- name: GetImageByID :one -SELECT image_id, storage_type, image_path -FROM images -WHERE image_id = $1 +const createImage = `-- name: CreateImage :one +INSERT INTO images (storage_type, image_path) +VALUES ($1, $2) +RETURNING id, storage_type, image_path ` -func (q *Queries) GetImageByID(ctx context.Context, imageID int32) (Image, error) { - row := q.db.QueryRow(ctx, getImageByID, imageID) +type CreateImageParams struct { + StorageType StorageTypeT `json:"storage_type"` + ImagePath string `json:"image_path"` +} + +func (q *Queries) CreateImage(ctx context.Context, arg CreateImageParams) (Image, error) { + row := q.db.QueryRow(ctx, createImage, arg.StorageType, arg.ImagePath) var i Image - err := row.Scan(&i.ImageID, &i.StorageType, &i.ImagePath) + err := row.Scan(&i.ID, &i.StorageType, &i.ImagePath) + return i, err +} + +const getImageByID = `-- name: GetImageByID :one +SELECT id, storage_type, image_path +FROM images +WHERE id = $1 +` + +func (q *Queries) GetImageByID(ctx context.Context, id int64) (Image, error) { + row := q.db.QueryRow(ctx, getImageByID, id) + var i Image + err := row.Scan(&i.ID, &i.StorageType, &i.ImagePath) + return i, err +} + +const getUserByID = `-- name: GetUserByID :one +SELECT id, avatar_id, mail, nickname, disp_name, user_desc, creation_date +FROM users +WHERE id = $1 +` + +type GetUserByIDRow struct { + ID int64 `json:"id"` + AvatarID *int64 `json:"avatar_id"` + Mail *string `json:"mail"` + Nickname string `json:"nickname"` + DispName *string `json:"disp_name"` + UserDesc *string `json:"user_desc"` + CreationDate time.Time `json:"creation_date"` +} + +func (q *Queries) GetUserByID(ctx context.Context, id int64) (GetUserByIDRow, error) { + row := q.db.QueryRow(ctx, getUserByID, id) + var i GetUserByIDRow + err := row.Scan( + &i.ID, + &i.AvatarID, + &i.Mail, + &i.Nickname, + &i.DispName, + &i.UserDesc, + &i.CreationDate, + ) return i, err } diff --git a/sql/sqlc.yaml b/sql/sqlc.yaml index 23b22f9..f44761e 100644 --- a/sql/sqlc.yaml +++ b/sql/sqlc.yaml @@ -11,4 +11,17 @@ sql: sql_package: "pgx/v5" sql_driver: "github.com/jackc/pgx/v5" emit_json_tags: true - emit_pointers_for_null_types: true \ No newline at end of file + emit_pointers_for_null_types: true + overrides: + - db_type: "uuid" + nullable: false + go_type: + import: "github.com/gofrs/uuid" + package: "gofrsuuid" + type: UUID + pointer: true + - db_type: "timestamptz" + nullable: false + go_type: + import: "time" + type: "Time" \ No newline at end of file From e12812d202aa31ba565100400f2a14312a302e86 Mon Sep 17 00:00:00 2001 From: nihonium Date: Sun, 26 Oct 2025 02:39:54 +0300 Subject: [PATCH 39/80] feat: frontend first routing implementation --- modules/frontend/package-lock.json | 57 ++++++++++++++++++- modules/frontend/package.json | 3 +- modules/frontend/src/App.tsx | 11 +++- .../src/components/UserPage/UserPage.tsx | 10 +++- 4 files changed, 74 insertions(+), 7 deletions(-) diff --git a/modules/frontend/package-lock.json b/modules/frontend/package-lock.json index b1789ed..6a06afb 100644 --- a/modules/frontend/package-lock.json +++ b/modules/frontend/package-lock.json @@ -10,7 +10,8 @@ "dependencies": { "axios": "^1.12.2", "react": "^19.1.1", - "react-dom": "^19.1.1" + "react-dom": "^19.1.1", + "react-router-dom": "^7.9.4" }, "devDependencies": { "@eslint/js": "^9.36.0", @@ -2061,6 +2062,15 @@ "dev": true, "license": "MIT" }, + "node_modules/cookie": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz", + "integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==", + "license": "MIT", + "engines": { + "node": ">=18" + } + }, "node_modules/cross-spawn": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", @@ -3346,6 +3356,7 @@ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.0.tgz", "integrity": "sha512-UlbRu4cAiGaIewkPyiRGJk0imDN2T3JjieT6spoL2UeSf5od4n5LB/mQ4ejmxhCFT1tYe8IvaFulzynWovsEFQ==", "license": "MIT", + "peer": true, "dependencies": { "scheduler": "^0.27.0" }, @@ -3363,6 +3374,44 @@ "node": ">=0.10.0" } }, + "node_modules/react-router": { + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.9.4.tgz", + "integrity": "sha512-SD3G8HKviFHg9xj7dNODUKDFgpG4xqD5nhyd0mYoB5iISepuZAvzSr8ywxgxKJ52yRzf/HWtVHc9AWwoTbljvA==", + "license": "MIT", + "dependencies": { + "cookie": "^1.0.1", + "set-cookie-parser": "^2.6.0" + }, + "engines": { + "node": ">=20.0.0" + }, + "peerDependencies": { + "react": ">=18", + "react-dom": ">=18" + }, + "peerDependenciesMeta": { + "react-dom": { + "optional": true + } + } + }, + "node_modules/react-router-dom": { + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.9.4.tgz", + "integrity": "sha512-f30P6bIkmYvnHHa5Gcu65deIXoA2+r3Eb6PJIAddvsT9aGlchMatJ51GgpU470aSqRRbFX22T70yQNUGuW3DfA==", + "license": "MIT", + "dependencies": { + "react-router": "7.9.4" + }, + "engines": { + "node": ">=20.0.0" + }, + "peerDependencies": { + "react": ">=18", + "react-dom": ">=18" + } + }, "node_modules/resolve-from": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", @@ -3466,6 +3515,12 @@ "semver": "bin/semver.js" } }, + "node_modules/set-cookie-parser": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz", + "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==", + "license": "MIT" + }, "node_modules/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", diff --git a/modules/frontend/package.json b/modules/frontend/package.json index c40ff17..b4977aa 100644 --- a/modules/frontend/package.json +++ b/modules/frontend/package.json @@ -12,7 +12,8 @@ "dependencies": { "axios": "^1.12.2", "react": "^19.1.1", - "react-dom": "^19.1.1" + "react-dom": "^19.1.1", + "react-router-dom": "^7.9.4" }, "devDependencies": { "@eslint/js": "^9.36.0", diff --git a/modules/frontend/src/App.tsx b/modules/frontend/src/App.tsx index 6b2ee5f..a88ad57 100644 --- a/modules/frontend/src/App.tsx +++ b/modules/frontend/src/App.tsx @@ -1,8 +1,15 @@ import React from "react"; +import { BrowserRouter as Router, Routes, Route } from "react-router-dom"; import UserPage from "./components/UserPage/UserPage"; const App: React.FC = () => { - return ; + return ( + + + } /> + + + ); }; -export default App; +export default App; \ No newline at end of file diff --git a/modules/frontend/src/components/UserPage/UserPage.tsx b/modules/frontend/src/components/UserPage/UserPage.tsx index b0db90c..0a83679 100644 --- a/modules/frontend/src/components/UserPage/UserPage.tsx +++ b/modules/frontend/src/components/UserPage/UserPage.tsx @@ -1,17 +1,21 @@ import React, { useEffect, useState } from "react"; -import { DefaultService } from "../../api/services/DefaultService"; // adjust path +import { useParams } from "react-router-dom"; // <-- import +import { DefaultService } from "../../api/services/DefaultService"; import type { User } from "../../api/models/User"; import styles from "./UserPage.module.css"; const UserPage: React.FC = () => { + const { id } = useParams<{ id: string }>(); // <-- get user id from URL const [user, setUser] = useState(null); const [loading, setLoading] = useState(true); const [error, setError] = useState(null); useEffect(() => { + if (!id) return; + const getUserInfo = async () => { try { - const userInfo = await DefaultService.getUsers("1", "all"); + const userInfo = await DefaultService.getUsers(id, "all"); // <-- use dynamic id setUser(userInfo); } catch (err) { console.error(err); @@ -21,7 +25,7 @@ const UserPage: React.FC = () => { } }; getUserInfo(); - }, []); + }, [id]); if (loading) return
Loading...
; if (error) return
{error}
; From 92c06bbb507ac35086acf1c8e8add4200491ea9b Mon Sep 17 00:00:00 2001 From: nihonium Date: Sun, 26 Oct 2025 02:44:28 +0300 Subject: [PATCH 40/80] fix: remove templates from backend Dockerfile --- Dockerfiles/Dockerfile_backend | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfiles/Dockerfile_backend b/Dockerfiles/Dockerfile_backend index 27c9212..68c2414 100644 --- a/Dockerfiles/Dockerfile_backend +++ b/Dockerfiles/Dockerfile_backend @@ -2,6 +2,5 @@ FROM ubuntu:22.04 WORKDIR /app COPY --chmod=755 modules/backend/nyanimedb /app -COPY modules/backend/templates /app/templates EXPOSE 8080 ENTRYPOINT ["/app/nyanimedb"] \ No newline at end of file From fd1e129a5ff2eda351645798dd0a4372736e7fd3 Mon Sep 17 00:00:00 2001 From: nihonium Date: Sun, 26 Oct 2025 02:49:50 +0300 Subject: [PATCH 41/80] fix: remove templates from cicd --- .forgejo/workflows/build-and-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build-and-deploy.yml b/.forgejo/workflows/build-and-deploy.yml index cd1087b..e7d0a83 100644 --- a/.forgejo/workflows/build-and-deploy.yml +++ b/.forgejo/workflows/build-and-deploy.yml @@ -27,7 +27,7 @@ jobs: cd modules/backend go mod tidy go build -o nyanimedb . - tar -czvf nyanimedb-backend.tar.gz nyanimedb templates/ + tar -czvf nyanimedb-backend.tar.gz nyanimedb - name: Upload built backend to artifactory uses: actions/upload-artifact@v3 From feb763509e56744434459265b2b53bc6e6221ef1 Mon Sep 17 00:00:00 2001 From: nihonium Date: Sun, 26 Oct 2025 02:51:53 +0300 Subject: [PATCH 42/80] fix: regenerated frontend openapi functions --- modules/frontend/src/api/core/OpenAPI.ts | 2 +- modules/frontend/src/api/models/User.ts | 2 +- .../src/api/services/DefaultService.ts | 443 ------------------ 3 files changed, 2 insertions(+), 445 deletions(-) diff --git a/modules/frontend/src/api/core/OpenAPI.ts b/modules/frontend/src/api/core/OpenAPI.ts index 99c577d..4fb2299 100644 --- a/modules/frontend/src/api/core/OpenAPI.ts +++ b/modules/frontend/src/api/core/OpenAPI.ts @@ -20,7 +20,7 @@ export type OpenAPIConfig = { }; export const OpenAPI: OpenAPIConfig = { - BASE: 'http://10.1.0.65:8080', + BASE: 'https://api.example.com', VERSION: '1.0.0', WITH_CREDENTIALS: false, CREDENTIALS: 'include', diff --git a/modules/frontend/src/api/models/User.ts b/modules/frontend/src/api/models/User.ts index c296445..b03d22f 100644 --- a/modules/frontend/src/api/models/User.ts +++ b/modules/frontend/src/api/models/User.ts @@ -6,7 +6,7 @@ export type User = { /** * Unique user ID (primary key) */ - user_id: number; + id?: number; /** * ID of the user avatar (references images table) */ diff --git a/modules/frontend/src/api/services/DefaultService.ts b/modules/frontend/src/api/services/DefaultService.ts index f000c3f..7ebd129 100644 --- a/modules/frontend/src/api/services/DefaultService.ts +++ b/modules/frontend/src/api/services/DefaultService.ts @@ -2,116 +2,11 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ -import type { Review } from '../models/Review'; -import type { Tag } from '../models/Tag'; -import type { Title } from '../models/Title'; import type { User } from '../models/User'; -import type { UserTitle } from '../models/UserTitle'; import type { CancelablePromise } from '../core/CancelablePromise'; import { OpenAPI } from '../core/OpenAPI'; import { request as __request } from '../core/request'; export class DefaultService { - /** - * Get titles - * @param query - * @param limit - * @param offset - * @param fields - * @returns Title List of titles - * @throws ApiError - */ - public static getTitle( - query?: string, - limit: number = 10, - offset?: number, - fields: string = 'all', - ): CancelablePromise> { - return __request(OpenAPI, { - method: 'GET', - url: '/title', - query: { - 'query': query, - 'limit': limit, - 'offset': offset, - 'fields': fields, - }, - }); - } - /** - * Get title description - * @param titleId - * @param fields - * @returns Title Title description - * @throws ApiError - */ - public static getTitle1( - titleId: string, - fields: string = 'all', - ): CancelablePromise { - return __request(OpenAPI, { - method: 'GET', - url: '/title/{title_id}', - path: { - 'title_id': titleId, - }, - query: { - 'fields': fields, - }, - errors: { - 404: `Title not found`, - }, - }); - } - /** - * Update title info - * @param titleId - * @param requestBody - * @returns any Update result - * @throws ApiError - */ - public static patchTitle( - titleId: string, - requestBody: Title, - ): CancelablePromise<{ - success?: boolean; - error?: string; - user_json?: User; - }> { - return __request(OpenAPI, { - method: 'PATCH', - url: '/title/{title_id}', - path: { - 'title_id': titleId, - }, - body: requestBody, - mediaType: 'application/json', - }); - } - /** - * Get title reviews - * @param titleId - * @param limit - * @param offset - * @returns Review List of reviews - * @throws ApiError - */ - public static getTitleReviews( - titleId: string, - limit: number = 10, - offset?: number, - ): CancelablePromise<Array<Review>> { - return __request(OpenAPI, { - method: 'GET', - url: '/title/{title_id}/reviews', - path: { - 'title_id': titleId, - }, - query: { - 'limit': limit, - 'offset': offset, - }, - }); - } /** * Get user info * @param userId @@ -137,342 +32,4 @@ export class DefaultService { }, }); } - /** - * Update user - * @param userId - * @param requestBody - * @returns any Update result - * @throws ApiError - */ - public static patchUsers( - userId: string, - requestBody: User, - ): CancelablePromise<{ - success?: boolean; - error?: string; - }> { - return __request(OpenAPI, { - method: 'PATCH', - url: '/users/{user_id}', - path: { - 'user_id': userId, - }, - body: requestBody, - mediaType: 'application/json', - }); - } - /** - * Delete user - * @param userId - * @returns any Delete result - * @throws ApiError - */ - public static deleteUsers( - userId: string, - ): CancelablePromise<{ - success?: boolean; - error?: string; - }> { - return __request(OpenAPI, { - method: 'DELETE', - url: '/users/{user_id}', - path: { - 'user_id': userId, - }, - }); - } - /** - * Search user - * @param query - * @param fields - * @returns User List of users - * @throws ApiError - */ - public static getUsers1( - query?: string, - fields?: string, - ): CancelablePromise<Array<User>> { - return __request(OpenAPI, { - method: 'GET', - url: '/users', - query: { - 'query': query, - 'fields': fields, - }, - }); - } - /** - * Add new user - * @param requestBody - * @returns any Add result - * @throws ApiError - */ - public static postUsers( - requestBody: User, - ): CancelablePromise<{ - success?: boolean; - error?: string; - user_json?: User; - }> { - return __request(OpenAPI, { - method: 'POST', - url: '/users', - body: requestBody, - mediaType: 'application/json', - }); - } - /** - * Get user titles - * @param userId - * @param query - * @param limit - * @param offset - * @param fields - * @returns UserTitle List of user titles - * @throws ApiError - */ - public static getUsersTitles( - userId: string, - query?: string, - limit: number = 10, - offset?: number, - fields: string = 'all', - ): CancelablePromise<Array<UserTitle>> { - return __request(OpenAPI, { - method: 'GET', - url: '/users/{user_id}/titles', - path: { - 'user_id': userId, - }, - query: { - 'query': query, - 'limit': limit, - 'offset': offset, - 'fields': fields, - }, - }); - } - /** - * Add user title - * @param userId - * @param requestBody - * @returns any Add result - * @throws ApiError - */ - public static postUsersTitles( - userId: string, - requestBody: { - title_id?: string; - status?: string; - }, - ): CancelablePromise<{ - success?: boolean; - error?: string; - }> { - return __request(OpenAPI, { - method: 'POST', - url: '/users/{user_id}/titles', - path: { - 'user_id': userId, - }, - body: requestBody, - mediaType: 'application/json', - }); - } - /** - * Update user title - * @param userId - * @param requestBody - * @returns any Update result - * @throws ApiError - */ - public static patchUsersTitles( - userId: string, - requestBody: UserTitle, - ): CancelablePromise<{ - success?: boolean; - error?: string; - }> { - return __request(OpenAPI, { - method: 'PATCH', - url: '/users/{user_id}/titles', - path: { - 'user_id': userId, - }, - body: requestBody, - mediaType: 'application/json', - }); - } - /** - * Delete user title - * @param userId - * @param titleId - * @returns any Delete result - * @throws ApiError - */ - public static deleteUsersTitles( - userId: string, - titleId?: string, - ): CancelablePromise<{ - success?: boolean; - error?: string; - }> { - return __request(OpenAPI, { - method: 'DELETE', - url: '/users/{user_id}/titles', - path: { - 'user_id': userId, - }, - query: { - 'title_id': titleId, - }, - }); - } - /** - * Get user reviews - * @param userId - * @param limit - * @param offset - * @returns Review List of reviews - * @throws ApiError - */ - public static getUsersReviews( - userId: string, - limit: number = 10, - offset?: number, - ): CancelablePromise<Array<Review>> { - return __request(OpenAPI, { - method: 'GET', - url: '/users/{user_id}/reviews', - path: { - 'user_id': userId, - }, - query: { - 'limit': limit, - 'offset': offset, - }, - }); - } - /** - * Add review - * @param requestBody - * @returns any Add result - * @throws ApiError - */ - public static postReviews( - requestBody: Review, - ): CancelablePromise<{ - success?: boolean; - error?: string; - }> { - return __request(OpenAPI, { - method: 'POST', - url: '/reviews', - body: requestBody, - mediaType: 'application/json', - }); - } - /** - * Update review - * @param reviewId - * @param requestBody - * @returns any Update result - * @throws ApiError - */ - public static patchReviews( - reviewId: string, - requestBody: Review, - ): CancelablePromise<{ - success?: boolean; - error?: string; - }> { - return __request(OpenAPI, { - method: 'PATCH', - url: '/reviews/{review_id}', - path: { - 'review_id': reviewId, - }, - body: requestBody, - mediaType: 'application/json', - }); - } - /** - * Delete review - * @param reviewId - * @returns any Delete result - * @throws ApiError - */ - public static deleteReviews( - reviewId: string, - ): CancelablePromise<{ - success?: boolean; - error?: string; - }> { - return __request(OpenAPI, { - method: 'DELETE', - url: '/reviews/{review_id}', - path: { - 'review_id': reviewId, - }, - }); - } - /** - * Get tags - * @param limit - * @param offset - * @param fields - * @returns Tag List of tags - * @throws ApiError - */ - public static getTags( - limit: number = 10, - offset?: number, - fields?: string, - ): CancelablePromise<Array<Tag>> { - return __request(OpenAPI, { - method: 'GET', - url: '/tags', - query: { - 'limit': limit, - 'offset': offset, - 'fields': fields, - }, - }); - } - /** - * Upload image - * @returns any Upload result - * @throws ApiError - */ - public static postMedia(): CancelablePromise<{ - success?: boolean; - error?: string; - image_id?: string; - }> { - return __request(OpenAPI, { - method: 'POST', - url: '/media', - }); - } - /** - * Get image path - * @param imageId - * @returns any Image path - * @throws ApiError - */ - public static getMedia( - imageId: string, - ): CancelablePromise<{ - success?: boolean; - error?: string; - image_path?: string; - }> { - return __request(OpenAPI, { - method: 'GET', - url: '/media', - query: { - 'image_id': imageId, - }, - }); - } } From 66281838b226d6584622990bda1c76298f640389 Mon Sep 17 00:00:00 2001 From: nihonium <nihonium@nekoea.red> Date: Sun, 26 Oct 2025 03:18:54 +0300 Subject: [PATCH 43/80] fix: new psql feature --- deploy/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index a9ca65d..1a96253 100644 --- a/deploy/docker-compose.yml +++ b/deploy/docker-compose.yml @@ -10,7 +10,7 @@ services: ports: - "${POSTGRES_PORT}:5432" volumes: - - postgres_data:/var/lib/postgresql/data + - postgres_data:/var/lib/postgresql # pgadmin: # image: dpage/pgadmin4:${PGADMIN_VERSION} From 6ed47b667ca61f87bfec88cf4801a8c1e2148b9f Mon Sep 17 00:00:00 2001 From: nihonium <nihonium@nekoea.red> Date: Sun, 26 Oct 2025 04:06:38 +0300 Subject: [PATCH 44/80] feat: proxy api requests via frontend --- Dockerfiles/Dockerfile_frontend | 1 + api/openapi.yaml | 2 +- modules/frontend/nginx-default.conf | 29 ++++++++++++++++++++++++ modules/frontend/src/api/core/OpenAPI.ts | 2 +- 4 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 modules/frontend/nginx-default.conf diff --git a/Dockerfiles/Dockerfile_frontend b/Dockerfiles/Dockerfile_frontend index a7ec893..18bc6d7 100644 --- a/Dockerfiles/Dockerfile_frontend +++ b/Dockerfiles/Dockerfile_frontend @@ -1,4 +1,5 @@ FROM nginx:alpine COPY modules/frontend/dist /usr/share/nginx/html +COPY modules/frontend/nginx-default.conf /etc/nginx/conf.d/default.conf EXPOSE 80 CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/api/openapi.yaml b/api/openapi.yaml index 97fa3a4..b20f677 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -3,7 +3,7 @@ info: title: Titles, Users, Reviews, Tags, and Media API version: 1.0.0 servers: - - url: https://api.example.com + - url: /api/v1 paths: # /title: # get: diff --git a/modules/frontend/nginx-default.conf b/modules/frontend/nginx-default.conf new file mode 100644 index 0000000..a538968 --- /dev/null +++ b/modules/frontend/nginx-default.conf @@ -0,0 +1,29 @@ +server { + listen 80; + listen [::]:80; + server_name localhost; + + root /usr/share/nginx/html; + index index.html; + + location / { + try_files $uri $uri/ /index.html; + } + + location /api/v1/ { + rewrite ^/api/v1/(.*)$ /$1 break; + proxy_pass http://nyanimedb-backend:8080/; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection 'upgrade'; + proxy_set_header Host $host; + proxy_cache_bypass $http_upgrade; + } + #error_page 404 /404.html; + + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } + +} \ No newline at end of file diff --git a/modules/frontend/src/api/core/OpenAPI.ts b/modules/frontend/src/api/core/OpenAPI.ts index 4fb2299..185e5c3 100644 --- a/modules/frontend/src/api/core/OpenAPI.ts +++ b/modules/frontend/src/api/core/OpenAPI.ts @@ -20,7 +20,7 @@ export type OpenAPIConfig = { }; export const OpenAPI: OpenAPIConfig = { - BASE: 'https://api.example.com', + BASE: '/api/v1', VERSION: '1.0.0', WITH_CREDENTIALS: false, CREDENTIALS: 'include', From 6d538ed15419d898482f94da4de7da1067974817 Mon Sep 17 00:00:00 2001 From: Iron_Felix <trubnikov.arseniy@mail.ru> Date: Sat, 1 Nov 2025 21:17:42 +0300 Subject: [PATCH 45/80] feat: common code for back functions are now in handlers/common.go --- modules/backend/handlers/common.go | 19 +++++++++++++++++++ modules/backend/handlers/users.go | 21 ++++++++++----------- 2 files changed, 29 insertions(+), 11 deletions(-) create mode 100644 modules/backend/handlers/common.go diff --git a/modules/backend/handlers/common.go b/modules/backend/handlers/common.go new file mode 100644 index 0000000..b85d022 --- /dev/null +++ b/modules/backend/handlers/common.go @@ -0,0 +1,19 @@ +package handlers + +import ( + sqlc "nyanimedb/sql" + "strconv" +) + +type Server struct { + db *sqlc.Queries +} + +func NewServer(db *sqlc.Queries) Server { + return Server{db: db} +} + +func parseInt64(s string) (int32, error) { + i, err := strconv.ParseInt(s, 10, 64) + return int32(i), err +} diff --git a/modules/backend/handlers/users.go b/modules/backend/handlers/users.go index b67153d..3da61de 100644 --- a/modules/backend/handlers/users.go +++ b/modules/backend/handlers/users.go @@ -4,24 +4,23 @@ import ( "context" oapi "nyanimedb/api" sqlc "nyanimedb/sql" - "strconv" "github.com/jackc/pgx/v5" "github.com/oapi-codegen/runtime/types" ) -type Server struct { - db *sqlc.Queries -} +// type Server struct { +// db *sqlc.Queries +// } -func NewServer(db *sqlc.Queries) Server { - return Server{db: db} -} +// func NewServer(db *sqlc.Queries) Server { +// return Server{db: db} +// } -func parseInt64(s string) (int32, error) { - i, err := strconv.ParseInt(s, 10, 64) - return int32(i), err -} +// func parseInt64(s string) (int32, error) { +// i, err := strconv.ParseInt(s, 10, 64) +// return int32(i), err +// } func mapUser(u sqlc.GetUserByIDRow) oapi.User { return oapi.User{ From 4ffa7dc93e7a06f39260a27b1ee5b0d574d4e5be Mon Sep 17 00:00:00 2001 From: Iron_Felix <trubnikov.arseniy@mail.ru> Date: Wed, 5 Nov 2025 17:11:43 +0300 Subject: [PATCH 46/80] feat: add new user handler was uncommented --- api/openapi.yaml | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/api/openapi.yaml b/api/openapi.yaml index b20f677..6439c86 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -196,7 +196,7 @@ paths: # error: # type: string - # /users: + /users: # get: # summary: Search user # parameters: @@ -218,28 +218,28 @@ paths: # items: # $ref: '#/components/schemas/User' - # post: - # summary: Add new user - # requestBody: - # required: true - # content: - # application/json: - # schema: - # $ref: '#/components/schemas/User' - # responses: - # '200': - # description: Add result - # content: - # application/json: - # schema: - # type: object - # properties: - # success: - # type: boolean - # error: - # type: string - # user_json: - # $ref: '#/components/schemas/User' + post: + summary: Add new user + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/User' + responses: + '200': + description: Add result + content: + application/json: + schema: + type: object + properties: + success: + type: boolean + error: + type: string + user_json: + $ref: '#/components/schemas/User' # /users/{user_id}/titles: # get: @@ -580,7 +580,7 @@ components: required: - user_id - nickname - - creation_date + # - creation_date UserTitle: type: object additionalProperties: true From bac889b6276c6cb5a9f6a8b136922ab434a2e442 Mon Sep 17 00:00:00 2001 From: Iron_Felix <trubnikov.arseniy@mail.ru> Date: Wed, 5 Nov 2025 17:20:09 +0300 Subject: [PATCH 47/80] fix: regexps for mail and nickname were corrected --- sql/migrations/000001_init.up.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/migrations/000001_init.up.sql b/sql/migrations/000001_init.up.sql index 0b7fa33..eba22e2 100644 --- a/sql/migrations/000001_init.up.sql +++ b/sql/migrations/000001_init.up.sql @@ -27,8 +27,8 @@ CREATE TABLE users ( id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY, avatar_id bigint REFERENCES images (id), passhash text NOT NULL, - mail text CHECK (mail ~ '[a-zA-Z0-9._-]+@[a-zA-Z0-9._-]+\.[a-zA-Z0-9_-]+'), - nickname text NOT NULL CHECK (nickname ~ '^[a-zA-Z0-9_-]+$'), + mail text CHECK (mail ~ '^[a-zA-Z0-9._-]+@[a-zA-Z0-9._-]+\.[a-zA-Z0-9_-]+$'), + nickname text UNIQUE NOT NULL CHECK (nickname ~ '^[a-zA-Z0-9_-]{3,}$'), disp_name text, user_desc text, creation_date timestamptz NOT NULL, From 83fee98059ced5aaee9a1109ccb5129cf47fc360 Mon Sep 17 00:00:00 2001 From: Iron_Felix <trubnikov.arseniy@mail.ru> Date: Fri, 14 Nov 2025 15:22:14 +0300 Subject: [PATCH 48/80] feat: external_ids table is added for binding user sessions in tg and other services --- sql/migrations/000001_init.up.sql | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sql/migrations/000001_init.up.sql b/sql/migrations/000001_init.up.sql index eba22e2..abecd32 100644 --- a/sql/migrations/000001_init.up.sql +++ b/sql/migrations/000001_init.up.sql @@ -85,6 +85,12 @@ CREATE TABLE signals ( pending boolean NOT NULL ); +CREATE TABLE external_ids ( + user_id NOT NULL REFERENCES users (id), + service_id text NOT NULL, + external_ids text NOT NULL +); + -- Functions CREATE OR REPLACE FUNCTION update_title_rating() RETURNS TRIGGER AS $$ From f24edc5dd76f1bedfece5c173203d461d9971e91 Mon Sep 17 00:00:00 2001 From: Iron_Felix <trubnikov.arseniy@mail.ru> Date: Fri, 14 Nov 2025 15:34:48 +0300 Subject: [PATCH 49/80] feat: external_services table create --- sql/migrations/000001_init.up.sql | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sql/migrations/000001_init.up.sql b/sql/migrations/000001_init.up.sql index abecd32..a5e89b8 100644 --- a/sql/migrations/000001_init.up.sql +++ b/sql/migrations/000001_init.up.sql @@ -87,8 +87,13 @@ CREATE TABLE signals ( CREATE TABLE external_ids ( user_id NOT NULL REFERENCES users (id), - service_id text NOT NULL, - external_ids text NOT NULL + service_id bigint REFERENCES external_services (id), + external_id text NOT NULL +); + +CREATE TABLE external_services ( + id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY, + name text UNIQUE NOT NULL ); -- Functions From 7fed5ed53665466a8da575a0a9b83978ecc85c7b Mon Sep 17 00:00:00 2001 From: Iron_Felix <trubnikov.arseniy@mail.ru> Date: Fri, 14 Nov 2025 23:57:34 +0300 Subject: [PATCH 50/80] feat: get titles added with all components needed --- api/openapi.yaml | 151 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 117 insertions(+), 34 deletions(-) diff --git a/api/openapi.yaml b/api/openapi.yaml index 6439c86..c1aed30 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -5,40 +5,60 @@ info: servers: - url: /api/v1 paths: - # /title: - # get: - # summary: Get titles - # parameters: - # - in: query - # name: query - # schema: - # type: string - # - in: query - # name: limit - # schema: - # type: integer - # default: 10 - # - in: query - # name: offset - # schema: - # type: integer - # default: 0 - # - in: query - # name: fields - # schema: - # type: string - # default: all - # responses: - # '200': - # description: List of titles - # content: - # application/json: - # schema: - # type: array - # items: - # $ref: '#/components/schemas/Title' - # '204': - # description: No titles found + /title: + get: + summary: Get titles + parameters: + - in: query + name: word + schema: + type: string + - in: query + name: status + schema: + $ref: '#/components/schemas/TitleStatus' + - in: query + name: rating + schema: + type: number + format: double + - in: query + name: release_year + schema: + type: integer + format: int32 + - in: query + name: release_season + schema: + $ref: '#/components/schemas/ReleaseSeason' + - in: query + name: limit + schema: + type: integer + default: 10 + - in: query + name: offset + schema: + type: integer + default: 0 + - in: query + name: fields + schema: + type: string + default: all + responses: + '200': + description: List of titles + content: + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/Title' + '204': + description: No titles found + '500': + description: Unknown server error # /title/{title_id}: # get: @@ -535,8 +555,71 @@ paths: components: schemas: + TitleStatus: + type: string + description: Title status + enum: + - finished + - ongoing + - planned + ReleaseSeason: + type: string + description: Title release season + enum: + - winter + - spring + - summer + - fall + UserTitleStatus: + type: string + description: User's title status + enum: + - finished + - planned + - dropped + - in-progress Title: type: object + properties: + id: + type: integer + format: int64 + description: Unique title ID (primary key) + example: 1 + title_names: + type: array + items: + type: string + studio_id: + type: integer + format: int64 + poster_id: + type: integer + format: int64 + title_status: + $ref: '#/components/schemas/TitleStatus' + rating: + type: number + format: double + rating_count: + type: integer + format: int32 + release_year: + type: integer + format: int32 + release_season: + $ref: '#/components/schemas/ReleaseSeason' + episodes_aired: + type: integer + format: int32 + episodes_all: + type: integer + format: int32 + episodes_len: + type: array + items: + type: number + format: double additionalProperties: true User: type: object From 765e75e8bba8808abb08dc7f9209a06771d00249 Mon Sep 17 00:00:00 2001 From: Iron_Felix <trubnikov.arseniy@mail.ru> Date: Sat, 15 Nov 2025 00:04:43 +0300 Subject: [PATCH 51/80] feat: new responses added --- api/openapi.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/api/openapi.yaml b/api/openapi.yaml index c1aed30..b17b539 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -57,6 +57,8 @@ paths: $ref: '#/components/schemas/Title' '204': description: No titles found + '400': + description: Request params are not correct '500': description: Unknown server error @@ -167,6 +169,10 @@ paths: $ref: '#/components/schemas/User' '404': description: User not found + '400': + description: Request params are not correct + '500': + description: Unknown server error # patch: # summary: Update user From c2dc7627002b56e1ad92f6aff41b26e0ea63608b Mon Sep 17 00:00:00 2001 From: Iron_Felix <trubnikov.arseniy@mail.ru> Date: Sat, 15 Nov 2025 00:46:47 +0300 Subject: [PATCH 52/80] feat: openapi changes --- api/api.gen.go | 517 +++++++++++++++++++++++++++++++++++- go.mod | 1 + go.sum | 3 + modules/backend/queries.sql | 39 ++- 4 files changed, 553 insertions(+), 7 deletions(-) diff --git a/api/api.gen.go b/api/api.gen.go index 24aebd3..40c0fa2 100644 --- a/api/api.gen.go +++ b/api/api.gen.go @@ -16,13 +16,57 @@ import ( openapi_types "github.com/oapi-codegen/runtime/types" ) +// Defines values for ReleaseSeason. +const ( + Fall ReleaseSeason = "fall" + Spring ReleaseSeason = "spring" + Summer ReleaseSeason = "summer" + Winter ReleaseSeason = "winter" +) + +// Defines values for TitleStatus. +const ( + Finished TitleStatus = "finished" + Ongoing TitleStatus = "ongoing" + Planned TitleStatus = "planned" +) + +// ReleaseSeason Title release season +type ReleaseSeason string + +// Title defines model for Title. +type Title struct { + EpisodesAired *int32 `json:"episodes_aired,omitempty"` + EpisodesAll *int32 `json:"episodes_all,omitempty"` + EpisodesLen *[]float64 `json:"episodes_len,omitempty"` + + // Id Unique title ID (primary key) + Id *int64 `json:"id,omitempty"` + PosterId *int64 `json:"poster_id,omitempty"` + Rating *float64 `json:"rating,omitempty"` + RatingCount *int32 `json:"rating_count,omitempty"` + + // ReleaseSeason Title release season + ReleaseSeason *ReleaseSeason `json:"release_season,omitempty"` + ReleaseYear *int32 `json:"release_year,omitempty"` + StudioId *int64 `json:"studio_id,omitempty"` + TitleNames *[]string `json:"title_names,omitempty"` + + // TitleStatus Title status + TitleStatus *TitleStatus `json:"title_status,omitempty"` + AdditionalProperties map[string]interface{} `json:"-"` +} + +// TitleStatus Title status +type TitleStatus string + // User defines model for User. type User struct { // AvatarId ID of the user avatar (references images table) AvatarId *int64 `json:"avatar_id"` // CreationDate Timestamp when the user was created - CreationDate time.Time `json:"creation_date"` + CreationDate *time.Time `json:"creation_date,omitempty"` // DispName Display name DispName *string `json:"disp_name,omitempty"` @@ -40,13 +84,267 @@ type User struct { UserDesc *string `json:"user_desc,omitempty"` } +// GetTitleParams defines parameters for GetTitle. +type GetTitleParams struct { + Word *string `form:"word,omitempty" json:"word,omitempty"` + Status *TitleStatus `form:"status,omitempty" json:"status,omitempty"` + Rating *float64 `form:"rating,omitempty" json:"rating,omitempty"` + ReleaseYear *int32 `form:"release_year,omitempty" json:"release_year,omitempty"` + ReleaseSeason *ReleaseSeason `form:"release_season,omitempty" json:"release_season,omitempty"` + Limit *int `form:"limit,omitempty" json:"limit,omitempty"` + Offset *int `form:"offset,omitempty" json:"offset,omitempty"` + Fields *string `form:"fields,omitempty" json:"fields,omitempty"` +} + // GetUsersUserIdParams defines parameters for GetUsersUserId. type GetUsersUserIdParams struct { Fields *string `form:"fields,omitempty" json:"fields,omitempty"` } +// PostUsersJSONRequestBody defines body for PostUsers for application/json ContentType. +type PostUsersJSONRequestBody = User + +// Getter for additional properties for Title. Returns the specified +// element and whether it was found +func (a Title) Get(fieldName string) (value interface{}, found bool) { + if a.AdditionalProperties != nil { + value, found = a.AdditionalProperties[fieldName] + } + return +} + +// Setter for additional properties for Title +func (a *Title) Set(fieldName string, value interface{}) { + if a.AdditionalProperties == nil { + a.AdditionalProperties = make(map[string]interface{}) + } + a.AdditionalProperties[fieldName] = value +} + +// Override default JSON handling for Title to handle AdditionalProperties +func (a *Title) UnmarshalJSON(b []byte) error { + object := make(map[string]json.RawMessage) + err := json.Unmarshal(b, &object) + if err != nil { + return err + } + + if raw, found := object["episodes_aired"]; found { + err = json.Unmarshal(raw, &a.EpisodesAired) + if err != nil { + return fmt.Errorf("error reading 'episodes_aired': %w", err) + } + delete(object, "episodes_aired") + } + + if raw, found := object["episodes_all"]; found { + err = json.Unmarshal(raw, &a.EpisodesAll) + if err != nil { + return fmt.Errorf("error reading 'episodes_all': %w", err) + } + delete(object, "episodes_all") + } + + if raw, found := object["episodes_len"]; found { + err = json.Unmarshal(raw, &a.EpisodesLen) + if err != nil { + return fmt.Errorf("error reading 'episodes_len': %w", err) + } + delete(object, "episodes_len") + } + + if raw, found := object["id"]; found { + err = json.Unmarshal(raw, &a.Id) + if err != nil { + return fmt.Errorf("error reading 'id': %w", err) + } + delete(object, "id") + } + + if raw, found := object["poster_id"]; found { + err = json.Unmarshal(raw, &a.PosterId) + if err != nil { + return fmt.Errorf("error reading 'poster_id': %w", err) + } + delete(object, "poster_id") + } + + if raw, found := object["rating"]; found { + err = json.Unmarshal(raw, &a.Rating) + if err != nil { + return fmt.Errorf("error reading 'rating': %w", err) + } + delete(object, "rating") + } + + if raw, found := object["rating_count"]; found { + err = json.Unmarshal(raw, &a.RatingCount) + if err != nil { + return fmt.Errorf("error reading 'rating_count': %w", err) + } + delete(object, "rating_count") + } + + if raw, found := object["release_season"]; found { + err = json.Unmarshal(raw, &a.ReleaseSeason) + if err != nil { + return fmt.Errorf("error reading 'release_season': %w", err) + } + delete(object, "release_season") + } + + if raw, found := object["release_year"]; found { + err = json.Unmarshal(raw, &a.ReleaseYear) + if err != nil { + return fmt.Errorf("error reading 'release_year': %w", err) + } + delete(object, "release_year") + } + + if raw, found := object["studio_id"]; found { + err = json.Unmarshal(raw, &a.StudioId) + if err != nil { + return fmt.Errorf("error reading 'studio_id': %w", err) + } + delete(object, "studio_id") + } + + if raw, found := object["title_names"]; found { + err = json.Unmarshal(raw, &a.TitleNames) + if err != nil { + return fmt.Errorf("error reading 'title_names': %w", err) + } + delete(object, "title_names") + } + + if raw, found := object["title_status"]; found { + err = json.Unmarshal(raw, &a.TitleStatus) + if err != nil { + return fmt.Errorf("error reading 'title_status': %w", err) + } + delete(object, "title_status") + } + + if len(object) != 0 { + a.AdditionalProperties = make(map[string]interface{}) + for fieldName, fieldBuf := range object { + var fieldVal interface{} + err := json.Unmarshal(fieldBuf, &fieldVal) + if err != nil { + return fmt.Errorf("error unmarshaling field %s: %w", fieldName, err) + } + a.AdditionalProperties[fieldName] = fieldVal + } + } + return nil +} + +// Override default JSON handling for Title to handle AdditionalProperties +func (a Title) MarshalJSON() ([]byte, error) { + var err error + object := make(map[string]json.RawMessage) + + if a.EpisodesAired != nil { + object["episodes_aired"], err = json.Marshal(a.EpisodesAired) + if err != nil { + return nil, fmt.Errorf("error marshaling 'episodes_aired': %w", err) + } + } + + if a.EpisodesAll != nil { + object["episodes_all"], err = json.Marshal(a.EpisodesAll) + if err != nil { + return nil, fmt.Errorf("error marshaling 'episodes_all': %w", err) + } + } + + if a.EpisodesLen != nil { + object["episodes_len"], err = json.Marshal(a.EpisodesLen) + if err != nil { + return nil, fmt.Errorf("error marshaling 'episodes_len': %w", err) + } + } + + if a.Id != nil { + object["id"], err = json.Marshal(a.Id) + if err != nil { + return nil, fmt.Errorf("error marshaling 'id': %w", err) + } + } + + if a.PosterId != nil { + object["poster_id"], err = json.Marshal(a.PosterId) + if err != nil { + return nil, fmt.Errorf("error marshaling 'poster_id': %w", err) + } + } + + if a.Rating != nil { + object["rating"], err = json.Marshal(a.Rating) + if err != nil { + return nil, fmt.Errorf("error marshaling 'rating': %w", err) + } + } + + if a.RatingCount != nil { + object["rating_count"], err = json.Marshal(a.RatingCount) + if err != nil { + return nil, fmt.Errorf("error marshaling 'rating_count': %w", err) + } + } + + if a.ReleaseSeason != nil { + object["release_season"], err = json.Marshal(a.ReleaseSeason) + if err != nil { + return nil, fmt.Errorf("error marshaling 'release_season': %w", err) + } + } + + if a.ReleaseYear != nil { + object["release_year"], err = json.Marshal(a.ReleaseYear) + if err != nil { + return nil, fmt.Errorf("error marshaling 'release_year': %w", err) + } + } + + if a.StudioId != nil { + object["studio_id"], err = json.Marshal(a.StudioId) + if err != nil { + return nil, fmt.Errorf("error marshaling 'studio_id': %w", err) + } + } + + if a.TitleNames != nil { + object["title_names"], err = json.Marshal(a.TitleNames) + if err != nil { + return nil, fmt.Errorf("error marshaling 'title_names': %w", err) + } + } + + if a.TitleStatus != nil { + object["title_status"], err = json.Marshal(a.TitleStatus) + if err != nil { + return nil, fmt.Errorf("error marshaling 'title_status': %w", err) + } + } + + for fieldName, field := range a.AdditionalProperties { + object[fieldName], err = json.Marshal(field) + if err != nil { + return nil, fmt.Errorf("error marshaling '%s': %w", fieldName, err) + } + } + return json.Marshal(object) +} + // ServerInterface represents all server handlers. type ServerInterface interface { + // Get titles + // (GET /title) + GetTitle(c *gin.Context, params GetTitleParams) + // Add new user + // (POST /users) + PostUsers(c *gin.Context) // Get user info // (GET /users/{user_id}) GetUsersUserId(c *gin.Context, userId string, params GetUsersUserIdParams) @@ -61,6 +359,101 @@ type ServerInterfaceWrapper struct { type MiddlewareFunc func(c *gin.Context) +// GetTitle operation middleware +func (siw *ServerInterfaceWrapper) GetTitle(c *gin.Context) { + + var err error + + // Parameter object where we will unmarshal all parameters from the context + var params GetTitleParams + + // ------------- Optional query parameter "word" ------------- + + err = runtime.BindQueryParameter("form", true, false, "word", c.Request.URL.Query(), ¶ms.Word) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter word: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "status" ------------- + + err = runtime.BindQueryParameter("form", true, false, "status", c.Request.URL.Query(), ¶ms.Status) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter status: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "rating" ------------- + + err = runtime.BindQueryParameter("form", true, false, "rating", c.Request.URL.Query(), ¶ms.Rating) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter rating: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "release_year" ------------- + + err = runtime.BindQueryParameter("form", true, false, "release_year", c.Request.URL.Query(), ¶ms.ReleaseYear) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter release_year: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "release_season" ------------- + + err = runtime.BindQueryParameter("form", true, false, "release_season", c.Request.URL.Query(), ¶ms.ReleaseSeason) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter release_season: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "limit" ------------- + + err = runtime.BindQueryParameter("form", true, false, "limit", c.Request.URL.Query(), ¶ms.Limit) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter limit: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "offset" ------------- + + err = runtime.BindQueryParameter("form", true, false, "offset", c.Request.URL.Query(), ¶ms.Offset) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter offset: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "fields" ------------- + + err = runtime.BindQueryParameter("form", true, false, "fields", c.Request.URL.Query(), ¶ms.Fields) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter fields: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.GetTitle(c, params) +} + +// PostUsers operation middleware +func (siw *ServerInterfaceWrapper) PostUsers(c *gin.Context) { + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.PostUsers(c) +} + // GetUsersUserId operation middleware func (siw *ServerInterfaceWrapper) GetUsersUserId(c *gin.Context) { @@ -123,9 +516,65 @@ func RegisterHandlersWithOptions(router gin.IRouter, si ServerInterface, options ErrorHandler: errorHandler, } + router.GET(options.BaseURL+"/title", wrapper.GetTitle) + router.POST(options.BaseURL+"/users", wrapper.PostUsers) router.GET(options.BaseURL+"/users/:user_id", wrapper.GetUsersUserId) } +type GetTitleRequestObject struct { + Params GetTitleParams +} + +type GetTitleResponseObject interface { + VisitGetTitleResponse(w http.ResponseWriter) error +} + +type GetTitle200JSONResponse []Title + +func (response GetTitle200JSONResponse) VisitGetTitleResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type GetTitle204Response struct { +} + +func (response GetTitle204Response) VisitGetTitleResponse(w http.ResponseWriter) error { + w.WriteHeader(204) + return nil +} + +type GetTitle500Response struct { +} + +func (response GetTitle500Response) VisitGetTitleResponse(w http.ResponseWriter) error { + w.WriteHeader(500) + return nil +} + +type PostUsersRequestObject struct { + Body *PostUsersJSONRequestBody +} + +type PostUsersResponseObject interface { + VisitPostUsersResponse(w http.ResponseWriter) error +} + +type PostUsers200JSONResponse struct { + Error *string `json:"error,omitempty"` + Success *bool `json:"success,omitempty"` + UserJson *User `json:"user_json,omitempty"` +} + +func (response PostUsers200JSONResponse) VisitPostUsersResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + type GetUsersUserIdRequestObject struct { UserId string `json:"user_id"` Params GetUsersUserIdParams @@ -154,6 +603,12 @@ func (response GetUsersUserId404Response) VisitGetUsersUserIdResponse(w http.Res // StrictServerInterface represents all server handlers. type StrictServerInterface interface { + // Get titles + // (GET /title) + GetTitle(ctx context.Context, request GetTitleRequestObject) (GetTitleResponseObject, error) + // Add new user + // (POST /users) + PostUsers(ctx context.Context, request PostUsersRequestObject) (PostUsersResponseObject, error) // Get user info // (GET /users/{user_id}) GetUsersUserId(ctx context.Context, request GetUsersUserIdRequestObject) (GetUsersUserIdResponseObject, error) @@ -171,6 +626,66 @@ type strictHandler struct { middlewares []StrictMiddlewareFunc } +// GetTitle operation middleware +func (sh *strictHandler) GetTitle(ctx *gin.Context, params GetTitleParams) { + var request GetTitleRequestObject + + request.Params = params + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.GetTitle(ctx, request.(GetTitleRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "GetTitle") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(GetTitleResponseObject); ok { + if err := validResponse.VisitGetTitleResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + +// PostUsers operation middleware +func (sh *strictHandler) PostUsers(ctx *gin.Context) { + var request PostUsersRequestObject + + var body PostUsersJSONRequestBody + if err := ctx.ShouldBindJSON(&body); err != nil { + ctx.Status(http.StatusBadRequest) + ctx.Error(err) + return + } + request.Body = &body + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.PostUsers(ctx, request.(PostUsersRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "PostUsers") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(PostUsersResponseObject); ok { + if err := validResponse.VisitPostUsersResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + // GetUsersUserId operation middleware func (sh *strictHandler) GetUsersUserId(ctx *gin.Context, userId string, params GetUsersUserIdParams) { var request GetUsersUserIdRequestObject diff --git a/go.mod b/go.mod index b7a66f2..7c34aeb 100644 --- a/go.mod +++ b/go.mod @@ -34,6 +34,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/quic-go/qpack v0.5.1 // indirect github.com/quic-go/quic-go v0.54.0 // indirect + github.com/sirupsen/logrus v1.9.3 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.3.0 // indirect go.uber.org/mock v0.5.0 // indirect diff --git a/go.sum b/go.sum index 1af1a7c..121ca40 100644 --- a/go.sum +++ b/go.sum @@ -68,6 +68,8 @@ github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI= github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg= github.com/quic-go/quic-go v0.54.0 h1:6s1YB9QotYI6Ospeiguknbp2Znb/jZYjZLRXn9kMQBg= github.com/quic-go/quic-go v0.54.0/go.mod h1:e68ZEaCdyviluZmy44P6Iey98v/Wfz6HCjQEm+l8zTY= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= @@ -95,6 +97,7 @@ golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs= golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8= golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw= golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI= golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= diff --git a/modules/backend/queries.sql b/modules/backend/queries.sql index b1dd8af..b90ec6a 100644 --- a/modules/backend/queries.sql +++ b/modules/backend/queries.sql @@ -38,12 +38,39 @@ WHERE id = $1; -- DELETE FROM users -- WHERE user_id = $1; --- -- name: GetTitleByID :one --- SELECT title_id, title_names, studio_id, poster_id, signal_ids, --- title_status, rating, rating_count, release_year, release_season, --- season, episodes_aired, episodes_all, episodes_len --- FROM titles --- WHERE title_id = $1; +-- name: SearchTitles :many +SELECT + * +FROM titles +WHERE + CASE + WHEN sqlc.narg('word')::text IS NOT NULL THEN + ( + SELECT bool_and( + EXISTS ( + SELECT 1 + FROM jsonb_each_text(title_names) AS t(key, val) + WHERE val ILIKE pattern + ) + ) + FROM unnest( + ARRAY( + SELECT '%' || trim(w) || '%' + FROM unnest(string_to_array(sqlc.narg('word')::text, ' ')) AS w + WHERE trim(w) <> '' + ) + ) AS pattern + ) + ELSE true + END + + AND (sqlc.narg('status')::title_status_t IS NULL OR title_status = sqlc.narg('status')::title_status_t) + AND (sqlc.narg('rating')::float IS NULL OR rating >= sqlc.narg('rating')::float) + AND (sqlc.narg('release_year')::int IS NULL OR release_year = sqlc.narg('release_year')::int) + AND (sqlc.narg('release_season')::release_season_t IS NULL OR release_season = sqlc.narg('release_season')::release_season_t) + +LIMIT COALESCE(sqlc.narg('limit')::int, 100) -- 100 is default limit +OFFSET sqlc.narg('offset')::int; -- -- name: ListTitles :many -- SELECT title_id, title_names, studio_id, poster_id, signal_ids, From d2450ffc89d1ee16311c140c3422dea8f166745f Mon Sep 17 00:00:00 2001 From: Iron_Felix <trubnikov.arseniy@mail.ru> Date: Sat, 15 Nov 2025 00:52:23 +0300 Subject: [PATCH 53/80] feat: titles.go added --- api/api.gen.go | 24 ++++++++ api/openapi.yaml | 10 ++++ modules/backend/handlers/titles.go | 96 ++++++++++++++++++++++++++++++ 3 files changed, 130 insertions(+) create mode 100644 modules/backend/handlers/titles.go diff --git a/api/api.gen.go b/api/api.gen.go index 40c0fa2..d17b591 100644 --- a/api/api.gen.go +++ b/api/api.gen.go @@ -546,6 +546,14 @@ func (response GetTitle204Response) VisitGetTitleResponse(w http.ResponseWriter) return nil } +type GetTitle400Response struct { +} + +func (response GetTitle400Response) VisitGetTitleResponse(w http.ResponseWriter) error { + w.WriteHeader(400) + return nil +} + type GetTitle500Response struct { } @@ -593,6 +601,14 @@ func (response GetUsersUserId200JSONResponse) VisitGetUsersUserIdResponse(w http return json.NewEncoder(w).Encode(response) } +type GetUsersUserId400Response struct { +} + +func (response GetUsersUserId400Response) VisitGetUsersUserIdResponse(w http.ResponseWriter) error { + w.WriteHeader(400) + return nil +} + type GetUsersUserId404Response struct { } @@ -601,6 +617,14 @@ func (response GetUsersUserId404Response) VisitGetUsersUserIdResponse(w http.Res return nil } +type GetUsersUserId500Response struct { +} + +func (response GetUsersUserId500Response) VisitGetUsersUserIdResponse(w http.ResponseWriter) error { + w.WriteHeader(500) + return nil +} + // StrictServerInterface represents all server handlers. type StrictServerInterface interface { // Get titles diff --git a/api/openapi.yaml b/api/openapi.yaml index b17b539..43e380d 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -10,6 +10,7 @@ paths: summary: Get titles parameters: - in: query +<<<<<<< Updated upstream name: word schema: type: string @@ -32,6 +33,12 @@ paths: schema: $ref: '#/components/schemas/ReleaseSeason' - in: query +======= + name: query + schema: + type: string + - in: query +>>>>>>> Stashed changes name: limit schema: type: integer @@ -57,10 +64,13 @@ paths: $ref: '#/components/schemas/Title' '204': description: No titles found +<<<<<<< Updated upstream '400': description: Request params are not correct '500': description: Unknown server error +======= +>>>>>>> Stashed changes # /title/{title_id}: # get: diff --git a/modules/backend/handlers/titles.go b/modules/backend/handlers/titles.go new file mode 100644 index 0000000..7bfcf58 --- /dev/null +++ b/modules/backend/handlers/titles.go @@ -0,0 +1,96 @@ +package handlers + +import ( + "context" + "fmt" + oapi "nyanimedb/api" + sqlc "nyanimedb/sql" + + log "github.com/sirupsen/logrus" +) + +func Word2Sqlc(s *string) *string { + if s == nil { + return nil + } + if *s == "" { + return nil + } + return s +} + +func TitleStatus2Sqlc(s *oapi.TitleStatus) (*sqlc.TitleStatusT, error) { + if s == nil { + return nil, nil + } + var t sqlc.TitleStatusT + if *s == "finished" { + t = "finished" + } else if *s == "ongoing" { + t = "ongoing" + } else if *s == "planned" { + t = "planned" + } else { + return nil, fmt.Errorf("unexpected tittle status: %s", *s) + } + return &t, nil +} + +func ReleaseSeason2sqlc(s *oapi.ReleaseSeason) (*sqlc.ReleaseSeasonT, error) { + if s == nil { + return nil, nil + } + var t sqlc.ReleaseSeasonT + if *s == "winter" { + t = "winter" + } else if *s == "spring" { + t = "spring" + } else if *s == "summer" { + t = "summer" + } else if *s == "fall" { + t = "fall" + } else { + return nil, fmt.Errorf("unexpected release season: %s", *s) + } + return &t, nil +} + +func (s Server) GetTitle(ctx context.Context, request oapi.GetTitleRequestObject) (oapi.GetTitleResponseObject, error) { + var result []oapi.Title + + word := Word2Sqlc(request.Params.Word) + status, err := TitleStatus2Sqlc(request.Params.Status) + if err != nil { + log.Errorf("%v", err) + return oapi.GetTitle400Response{}, err + } + season, err := ReleaseSeason2sqlc(request.Params.ReleaseSeason) + if err != nil { + log.Errorf("%v", err) + return oapi.GetTitle400Response{}, err + } + // param = nil means it will not be used + titles, err := s.db.SearchTitles(ctx, sqlc.SearchTitlesParams{ + Word: word, + Status: status, + Rating: request.Params.Rating, + ReleaseYear: request.Params.ReleaseYear, + ReleaseSeason: season, + }) + if err != nil { + return oapi.GetTitle500Response{}, nil + } + if len(titles) == 0 { + return oapi.GetTitle204Response{}, nil + } + + for _, title := range titles { + t := oapi.Title{ + Rating: title.Rating, + PosterId: title.PosterID, + } + result = append(result, t) + } + + return oapi.GetTitle200JSONResponse(result), nil +} From d04248ab7a8b82c7852a082a2bfec92c2be0d20f Mon Sep 17 00:00:00 2001 From: Iron_Felix <trubnikov.arseniy@mail.ru> Date: Sat, 15 Nov 2025 01:02:30 +0300 Subject: [PATCH 54/80] feat --- api/openapi.yaml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/api/openapi.yaml b/api/openapi.yaml index 43e380d..f1c40f9 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -10,7 +10,6 @@ paths: summary: Get titles parameters: - in: query -<<<<<<< Updated upstream name: word schema: type: string @@ -33,12 +32,6 @@ paths: schema: $ref: '#/components/schemas/ReleaseSeason' - in: query -======= - name: query - schema: - type: string - - in: query ->>>>>>> Stashed changes name: limit schema: type: integer @@ -64,14 +57,10 @@ paths: $ref: '#/components/schemas/Title' '204': description: No titles found -<<<<<<< Updated upstream '400': description: Request params are not correct '500': description: Unknown server error -======= ->>>>>>> Stashed changes - # /title/{title_id}: # get: # summary: Get title description From ae01eec0fdf2d3ff4f14e8df756983d4a6d97c76 Mon Sep 17 00:00:00 2001 From: Iron_Felix <trubnikov.arseniy@mail.ru> Date: Sat, 15 Nov 2025 02:50:29 +0300 Subject: [PATCH 55/80] fix!: some types were changed --- api/api.gen.go | 10 ++++++---- api/openapi.yaml | 20 +++++++++++++++----- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/api/api.gen.go b/api/api.gen.go index d17b591..a235db8 100644 --- a/api/api.gen.go +++ b/api/api.gen.go @@ -36,9 +36,9 @@ type ReleaseSeason string // Title defines model for Title. type Title struct { - EpisodesAired *int32 `json:"episodes_aired,omitempty"` - EpisodesAll *int32 `json:"episodes_all,omitempty"` - EpisodesLen *[]float64 `json:"episodes_len,omitempty"` + EpisodesAired *int32 `json:"episodes_aired,omitempty"` + EpisodesAll *int32 `json:"episodes_all,omitempty"` + EpisodesLen *map[string]float64 `json:"episodes_len,omitempty"` // Id Unique title ID (primary key) Id *int64 `json:"id,omitempty"` @@ -50,7 +50,9 @@ type Title struct { ReleaseSeason *ReleaseSeason `json:"release_season,omitempty"` ReleaseYear *int32 `json:"release_year,omitempty"` StudioId *int64 `json:"studio_id,omitempty"` - TitleNames *[]string `json:"title_names,omitempty"` + + // TitleNames Localized titles. Key = language (ISO 639-1), value = list of names + TitleNames *map[string][]string `json:"title_names,omitempty"` // TitleStatus Title status TitleStatus *TitleStatus `json:"title_status,omitempty"` diff --git a/api/openapi.yaml b/api/openapi.yaml index f1c40f9..4187ebb 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -592,9 +592,19 @@ components: description: Unique title ID (primary key) example: 1 title_names: - type: array - items: - type: string + type: object + description: "Localized titles. Key = language (ISO 639-1), value = list of names" + additionalProperties: + type: array + items: + type: string + example: "Attack on Titan" + minItems: 1 + example: ["Attack on Titan", "AoT"] + example: + en: ["Attack on Titan", "AoT"] + ru: ["Атака титанов", "Титаны"] + ja: ["進撃の巨人"] studio_id: type: integer format: int64 @@ -621,8 +631,8 @@ components: type: integer format: int32 episodes_len: - type: array - items: + type: object + additionalProperties: type: number format: double additionalProperties: true From e8783a0e9df1eaeb25c52644504deaf750b45cdf Mon Sep 17 00:00:00 2001 From: Iron_Felix <trubnikov.arseniy@mail.ru> Date: Sat, 15 Nov 2025 02:51:13 +0300 Subject: [PATCH 56/80] feat: get title func written --- modules/backend/handlers/titles.go | 47 +++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 4 deletions(-) diff --git a/modules/backend/handlers/titles.go b/modules/backend/handlers/titles.go index 7bfcf58..85f9f45 100644 --- a/modules/backend/handlers/titles.go +++ b/modules/backend/handlers/titles.go @@ -2,6 +2,7 @@ package handlers import ( "context" + "encoding/json" "fmt" oapi "nyanimedb/api" sqlc "nyanimedb/sql" @@ -40,9 +41,10 @@ func ReleaseSeason2sqlc(s *oapi.ReleaseSeason) (*sqlc.ReleaseSeasonT, error) { if s == nil { return nil, nil } + //TODO var t sqlc.ReleaseSeasonT - if *s == "winter" { - t = "winter" + if *s == oapi.Winter { + t = sqlc.ReleaseSeasonTWinter } else if *s == "spring" { t = "spring" } else if *s == "summer" { @@ -55,6 +57,23 @@ func ReleaseSeason2sqlc(s *oapi.ReleaseSeason) (*sqlc.ReleaseSeasonT, error) { return &t, nil } +// unmarshall jsonb to map[string][]string +func jsonb2map4names(b []byte) (*map[string][]string, error) { + var t map[string][]string + if err := json.Unmarshal(b, &t); err != nil { + return nil, fmt.Errorf("invalid title_names JSON for title: %w", err) + } + return &t, nil +} + +func jsonb2map4len(b []byte) (*map[string]float64, error) { + var t map[string]float64 + if err := json.Unmarshal(b, &t); err != nil { + return nil, fmt.Errorf("invalid episodes_len JSON for title: %w", err) + } + return &t, nil +} + func (s Server) GetTitle(ctx context.Context, request oapi.GetTitleRequestObject) (oapi.GetTitleResponseObject, error) { var result []oapi.Title @@ -85,9 +104,29 @@ func (s Server) GetTitle(ctx context.Context, request oapi.GetTitleRequestObject } for _, title := range titles { + title_names, err := jsonb2map4names(title.TitleNames) + if err != nil { + log.Errorf("%v", err) + return oapi.GetTitle500Response{}, err + } + episodes_lens, err := jsonb2map4len(title.EpisodesLen) + if err != nil { + log.Errorf("%v", err) + return oapi.GetTitle500Response{}, err + } t := oapi.Title{ - Rating: title.Rating, - PosterId: title.PosterID, + Id: &title.ID, + PosterId: title.PosterID, + Rating: title.Rating, + RatingCount: title.RatingCount, + ReleaseSeason: (*oapi.ReleaseSeason)(title.ReleaseSeason), + ReleaseYear: title.ReleaseYear, + StudioId: &title.StudioID, + TitleNames: title_names, + TitleStatus: (*oapi.TitleStatus)(&title.TitleStatus), + EpisodesAired: title.EpisodesAired, + EpisodesAll: title.EpisodesAll, + EpisodesLen: episodes_lens, } result = append(result, t) } From 5cc67579000c0f3369de0ce83aa1faeb8900f5b6 Mon Sep 17 00:00:00 2001 From: Iron_Felix <trubnikov.arseniy@mail.ru> Date: Sat, 15 Nov 2025 02:51:52 +0300 Subject: [PATCH 57/80] feat: minor changes to db and new query --- sql/migrations/000001_init.up.sql | 4 +- sql/models.go | 37 ++++++---- sql/queries.sql.go | 114 ++++++++++++++++++++++++++++++ sql/sqlc.yaml | 12 +++- 4 files changed, 152 insertions(+), 15 deletions(-) diff --git a/sql/migrations/000001_init.up.sql b/sql/migrations/000001_init.up.sql index a5e89b8..c325dc8 100644 --- a/sql/migrations/000001_init.up.sql +++ b/sql/migrations/000001_init.up.sql @@ -44,6 +44,7 @@ CREATE TABLE studios ( CREATE TABLE titles ( id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY, + -- example {"ru": ["Атака титанов", "Атака Титанов"],"en": ["Attack on Titan", "AoT"],"ja": ["進撃の巨人", "しんげきのきょじん"]} title_names jsonb NOT NULL, studio_id bigint NOT NULL REFERENCES studios (id), poster_id bigint REFERENCES images (id), @@ -55,6 +56,7 @@ CREATE TABLE titles ( season int CHECK (season >= 0), episodes_aired int CHECK (episodes_aired >= 0), episodes_all int CHECK (episodes_all >= 0), + -- example { "1": "50.50", "2": "23.23"} episodes_len jsonb, CHECK ((episodes_aired IS NULL AND episodes_all IS NULL) OR (episodes_aired IS NOT NULL AND episodes_all IS NOT NULL @@ -86,7 +88,7 @@ CREATE TABLE signals ( ); CREATE TABLE external_ids ( - user_id NOT NULL REFERENCES users (id), + user_id bigint NOT NULL REFERENCES users (id), service_id bigint REFERENCES external_services (id), external_id text NOT NULL ); diff --git a/sql/models.go b/sql/models.go index 928d5ac..6583b71 100644 --- a/sql/models.go +++ b/sql/models.go @@ -185,6 +185,17 @@ func (ns NullUsertitleStatusT) Value() (driver.Value, error) { return string(ns.UsertitleStatusT), nil } +type ExternalID struct { + UserID int64 `json:"user_id"` + ServiceID *int64 `json:"service_id"` + ExternalID string `json:"external_id"` +} + +type ExternalService struct { + ID int64 `json:"id"` + Name string `json:"name"` +} + type Image struct { ID int64 `json:"id"` StorageType StorageTypeT `json:"storage_type"` @@ -218,19 +229,19 @@ type Tag struct { } type Title struct { - ID int64 `json:"id"` - TitleNames []byte `json:"title_names"` - StudioID int64 `json:"studio_id"` - PosterID *int64 `json:"poster_id"` - TitleStatus TitleStatusT `json:"title_status"` - Rating *float64 `json:"rating"` - RatingCount *int32 `json:"rating_count"` - ReleaseYear *int32 `json:"release_year"` - ReleaseSeason NullReleaseSeasonT `json:"release_season"` - Season *int32 `json:"season"` - EpisodesAired *int32 `json:"episodes_aired"` - EpisodesAll *int32 `json:"episodes_all"` - EpisodesLen []byte `json:"episodes_len"` + ID int64 `json:"id"` + TitleNames []byte `json:"title_names"` + StudioID int64 `json:"studio_id"` + PosterID *int64 `json:"poster_id"` + TitleStatus TitleStatusT `json:"title_status"` + Rating *float64 `json:"rating"` + RatingCount *int32 `json:"rating_count"` + ReleaseYear *int32 `json:"release_year"` + ReleaseSeason *ReleaseSeasonT `json:"release_season"` + Season *int32 `json:"season"` + EpisodesAired *int32 `json:"episodes_aired"` + EpisodesAll *int32 `json:"episodes_all"` + EpisodesLen []byte `json:"episodes_len"` } type TitleTag struct { diff --git a/sql/queries.sql.go b/sql/queries.sql.go index 8f92c2a..2ef4178 100644 --- a/sql/queries.sql.go +++ b/sql/queries.sql.go @@ -71,3 +71,117 @@ func (q *Queries) GetUserByID(ctx context.Context, id int64) (GetUserByIDRow, er ) return i, err } + +const searchTitles = `-- name: SearchTitles :many + + + + +SELECT + id, title_names, studio_id, poster_id, title_status, rating, rating_count, release_year, release_season, season, episodes_aired, episodes_all, episodes_len +FROM titles +WHERE + CASE + WHEN $1::text IS NOT NULL THEN + ( + SELECT bool_and( + EXISTS ( + SELECT 1 + FROM jsonb_each_text(title_names) AS t(key, val) + WHERE val ILIKE pattern + ) + ) + FROM unnest( + ARRAY( + SELECT '%' || trim(w) || '%' + FROM unnest(string_to_array($1::text, ' ')) AS w + WHERE trim(w) <> '' + ) + ) AS pattern + ) + ELSE true + END + + AND ($2::title_status_t IS NULL OR title_status = $2::title_status_t) + AND ($3::float IS NULL OR rating >= $3::float) + AND ($4::int IS NULL OR release_year = $4::int) + AND ($5::release_season_t IS NULL OR release_season = $5::release_season_t) + +LIMIT COALESCE($7::int, 100) -- 100 is default limit +OFFSET $6::int +` + +type SearchTitlesParams struct { + Word *string `json:"word"` + Status *TitleStatusT `json:"status"` + Rating *float64 `json:"rating"` + ReleaseYear *int32 `json:"release_year"` + ReleaseSeason *ReleaseSeasonT `json:"release_season"` + Offset *int32 `json:"offset"` + Limit *int32 `json:"limit"` +} + +// -- name: ListUsers :many +// SELECT user_id, avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date +// FROM users +// ORDER BY user_id +// LIMIT $1 OFFSET $2; +// -- name: CreateUser :one +// INSERT INTO users (avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date) +// VALUES ($1, $2, $3, $4, $5, $6, $7) +// RETURNING user_id, avatar_id, nickname, disp_name, user_desc, creation_date; +// -- name: UpdateUser :one +// UPDATE users +// SET +// +// avatar_id = COALESCE(sqlc.narg('avatar_id'), avatar_id), +// disp_name = COALESCE(sqlc.narg('disp_name'), disp_name), +// user_desc = COALESCE(sqlc.narg('user_desc'), user_desc), +// passhash = COALESCE(sqlc.narg('passhash'), passhash) +// +// WHERE user_id = sqlc.arg('user_id') +// RETURNING user_id, avatar_id, nickname, disp_name, user_desc, creation_date; +// -- name: DeleteUser :exec +// DELETE FROM users +// WHERE user_id = $1; +func (q *Queries) SearchTitles(ctx context.Context, arg SearchTitlesParams) ([]Title, error) { + rows, err := q.db.Query(ctx, searchTitles, + arg.Word, + arg.Status, + arg.Rating, + arg.ReleaseYear, + arg.ReleaseSeason, + arg.Offset, + arg.Limit, + ) + if err != nil { + return nil, err + } + defer rows.Close() + var items []Title + for rows.Next() { + var i Title + if err := rows.Scan( + &i.ID, + &i.TitleNames, + &i.StudioID, + &i.PosterID, + &i.TitleStatus, + &i.Rating, + &i.RatingCount, + &i.ReleaseYear, + &i.ReleaseSeason, + &i.Season, + &i.EpisodesAired, + &i.EpisodesAll, + &i.EpisodesLen, + ); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} diff --git a/sql/sqlc.yaml b/sql/sqlc.yaml index f44761e..f74d2ad 100644 --- a/sql/sqlc.yaml +++ b/sql/sqlc.yaml @@ -24,4 +24,14 @@ sql: nullable: false go_type: import: "time" - type: "Time" \ No newline at end of file + type: "Time" + - db_type: "title_status_t" + nullable: true + go_type: + pointer: true + type: "TitleStatusT" + - db_type: "release_season_t" + nullable: true + go_type: + pointer: true + type: "ReleaseSeasonT" \ No newline at end of file From f49fad2307e17b4b704c833c8d14dd958adc2a85 Mon Sep 17 00:00:00 2001 From: Iron_Felix <trubnikov.arseniy@mail.ru> Date: Sat, 15 Nov 2025 03:01:38 +0300 Subject: [PATCH 58/80] fix: tmp commeneted method --- api/api.gen.go | 77 ------------------------------- api/openapi.yaml | 44 +++++++++--------- modules/backend/handlers/users.go | 2 +- 3 files changed, 23 insertions(+), 100 deletions(-) diff --git a/api/api.gen.go b/api/api.gen.go index a235db8..417554a 100644 --- a/api/api.gen.go +++ b/api/api.gen.go @@ -103,9 +103,6 @@ type GetUsersUserIdParams struct { Fields *string `form:"fields,omitempty" json:"fields,omitempty"` } -// PostUsersJSONRequestBody defines body for PostUsers for application/json ContentType. -type PostUsersJSONRequestBody = User - // Getter for additional properties for Title. Returns the specified // element and whether it was found func (a Title) Get(fieldName string) (value interface{}, found bool) { @@ -344,9 +341,6 @@ type ServerInterface interface { // Get titles // (GET /title) GetTitle(c *gin.Context, params GetTitleParams) - // Add new user - // (POST /users) - PostUsers(c *gin.Context) // Get user info // (GET /users/{user_id}) GetUsersUserId(c *gin.Context, userId string, params GetUsersUserIdParams) @@ -443,19 +437,6 @@ func (siw *ServerInterfaceWrapper) GetTitle(c *gin.Context) { siw.Handler.GetTitle(c, params) } -// PostUsers operation middleware -func (siw *ServerInterfaceWrapper) PostUsers(c *gin.Context) { - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.PostUsers(c) -} - // GetUsersUserId operation middleware func (siw *ServerInterfaceWrapper) GetUsersUserId(c *gin.Context) { @@ -519,7 +500,6 @@ func RegisterHandlersWithOptions(router gin.IRouter, si ServerInterface, options } router.GET(options.BaseURL+"/title", wrapper.GetTitle) - router.POST(options.BaseURL+"/users", wrapper.PostUsers) router.GET(options.BaseURL+"/users/:user_id", wrapper.GetUsersUserId) } @@ -564,27 +544,6 @@ func (response GetTitle500Response) VisitGetTitleResponse(w http.ResponseWriter) return nil } -type PostUsersRequestObject struct { - Body *PostUsersJSONRequestBody -} - -type PostUsersResponseObject interface { - VisitPostUsersResponse(w http.ResponseWriter) error -} - -type PostUsers200JSONResponse struct { - Error *string `json:"error,omitempty"` - Success *bool `json:"success,omitempty"` - UserJson *User `json:"user_json,omitempty"` -} - -func (response PostUsers200JSONResponse) VisitPostUsersResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - type GetUsersUserIdRequestObject struct { UserId string `json:"user_id"` Params GetUsersUserIdParams @@ -632,9 +591,6 @@ type StrictServerInterface interface { // Get titles // (GET /title) GetTitle(ctx context.Context, request GetTitleRequestObject) (GetTitleResponseObject, error) - // Add new user - // (POST /users) - PostUsers(ctx context.Context, request PostUsersRequestObject) (PostUsersResponseObject, error) // Get user info // (GET /users/{user_id}) GetUsersUserId(ctx context.Context, request GetUsersUserIdRequestObject) (GetUsersUserIdResponseObject, error) @@ -679,39 +635,6 @@ func (sh *strictHandler) GetTitle(ctx *gin.Context, params GetTitleParams) { } } -// PostUsers operation middleware -func (sh *strictHandler) PostUsers(ctx *gin.Context) { - var request PostUsersRequestObject - - var body PostUsersJSONRequestBody - if err := ctx.ShouldBindJSON(&body); err != nil { - ctx.Status(http.StatusBadRequest) - ctx.Error(err) - return - } - request.Body = &body - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.PostUsers(ctx, request.(PostUsersRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "PostUsers") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(PostUsersResponseObject); ok { - if err := validResponse.VisitPostUsersResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - // GetUsersUserId operation middleware func (sh *strictHandler) GetUsersUserId(ctx *gin.Context, userId string, params GetUsersUserIdParams) { var request GetUsersUserIdRequestObject diff --git a/api/openapi.yaml b/api/openapi.yaml index 4187ebb..bfd9aae 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -243,28 +243,28 @@ paths: # items: # $ref: '#/components/schemas/User' - post: - summary: Add new user - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/User' - responses: - '200': - description: Add result - content: - application/json: - schema: - type: object - properties: - success: - type: boolean - error: - type: string - user_json: - $ref: '#/components/schemas/User' + # post: + # summary: Add new user + # requestBody: + # required: true + # content: + # application/json: + # schema: + # $ref: '#/components/schemas/User' + # responses: + # '200': + # description: Add result + # content: + # application/json: + # schema: + # type: object + # properties: + # success: + # type: boolean + # error: + # type: string + # user_json: + # $ref: '#/components/schemas/User' # /users/{user_id}/titles: # get: diff --git a/modules/backend/handlers/users.go b/modules/backend/handlers/users.go index 3da61de..9e59261 100644 --- a/modules/backend/handlers/users.go +++ b/modules/backend/handlers/users.go @@ -25,7 +25,7 @@ import ( func mapUser(u sqlc.GetUserByIDRow) oapi.User { return oapi.User{ AvatarId: u.AvatarID, - CreationDate: u.CreationDate, + CreationDate: &u.CreationDate, DispName: u.DispName, Id: &u.ID, Mail: (*types.Email)(u.Mail), From 2edf96571b0edcbaf4d8e03a456b41e6a79163d0 Mon Sep 17 00:00:00 2001 From: Iron_Felix <trubnikov.arseniy@mail.ru> Date: Sat, 15 Nov 2025 18:20:27 +0300 Subject: [PATCH 59/80] feat: field studio_name added to title in openapi --- api/api.gen.go | 93 ++++++------------------------- api/openapi.yaml | 46 +++++++-------- modules/backend/handlers/users.go | 2 +- 3 files changed, 41 insertions(+), 100 deletions(-) diff --git a/api/api.gen.go b/api/api.gen.go index a235db8..9adc19d 100644 --- a/api/api.gen.go +++ b/api/api.gen.go @@ -50,6 +50,7 @@ type Title struct { ReleaseSeason *ReleaseSeason `json:"release_season,omitempty"` ReleaseYear *int32 `json:"release_year,omitempty"` StudioId *int64 `json:"studio_id,omitempty"` + StudioName *string `json:"studio_name,omitempty"` // TitleNames Localized titles. Key = language (ISO 639-1), value = list of names TitleNames *map[string][]string `json:"title_names,omitempty"` @@ -103,9 +104,6 @@ type GetUsersUserIdParams struct { Fields *string `form:"fields,omitempty" json:"fields,omitempty"` } -// PostUsersJSONRequestBody defines body for PostUsers for application/json ContentType. -type PostUsersJSONRequestBody = User - // Getter for additional properties for Title. Returns the specified // element and whether it was found func (a Title) Get(fieldName string) (value interface{}, found bool) { @@ -211,6 +209,14 @@ func (a *Title) UnmarshalJSON(b []byte) error { delete(object, "studio_id") } + if raw, found := object["studio_name"]; found { + err = json.Unmarshal(raw, &a.StudioName) + if err != nil { + return fmt.Errorf("error reading 'studio_name': %w", err) + } + delete(object, "studio_name") + } + if raw, found := object["title_names"]; found { err = json.Unmarshal(raw, &a.TitleNames) if err != nil { @@ -316,6 +322,13 @@ func (a Title) MarshalJSON() ([]byte, error) { } } + if a.StudioName != nil { + object["studio_name"], err = json.Marshal(a.StudioName) + if err != nil { + return nil, fmt.Errorf("error marshaling 'studio_name': %w", err) + } + } + if a.TitleNames != nil { object["title_names"], err = json.Marshal(a.TitleNames) if err != nil { @@ -344,9 +357,6 @@ type ServerInterface interface { // Get titles // (GET /title) GetTitle(c *gin.Context, params GetTitleParams) - // Add new user - // (POST /users) - PostUsers(c *gin.Context) // Get user info // (GET /users/{user_id}) GetUsersUserId(c *gin.Context, userId string, params GetUsersUserIdParams) @@ -443,19 +453,6 @@ func (siw *ServerInterfaceWrapper) GetTitle(c *gin.Context) { siw.Handler.GetTitle(c, params) } -// PostUsers operation middleware -func (siw *ServerInterfaceWrapper) PostUsers(c *gin.Context) { - - for _, middleware := range siw.HandlerMiddlewares { - middleware(c) - if c.IsAborted() { - return - } - } - - siw.Handler.PostUsers(c) -} - // GetUsersUserId operation middleware func (siw *ServerInterfaceWrapper) GetUsersUserId(c *gin.Context) { @@ -519,7 +516,6 @@ func RegisterHandlersWithOptions(router gin.IRouter, si ServerInterface, options } router.GET(options.BaseURL+"/title", wrapper.GetTitle) - router.POST(options.BaseURL+"/users", wrapper.PostUsers) router.GET(options.BaseURL+"/users/:user_id", wrapper.GetUsersUserId) } @@ -564,27 +560,6 @@ func (response GetTitle500Response) VisitGetTitleResponse(w http.ResponseWriter) return nil } -type PostUsersRequestObject struct { - Body *PostUsersJSONRequestBody -} - -type PostUsersResponseObject interface { - VisitPostUsersResponse(w http.ResponseWriter) error -} - -type PostUsers200JSONResponse struct { - Error *string `json:"error,omitempty"` - Success *bool `json:"success,omitempty"` - UserJson *User `json:"user_json,omitempty"` -} - -func (response PostUsers200JSONResponse) VisitPostUsersResponse(w http.ResponseWriter) error { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(200) - - return json.NewEncoder(w).Encode(response) -} - type GetUsersUserIdRequestObject struct { UserId string `json:"user_id"` Params GetUsersUserIdParams @@ -632,9 +607,6 @@ type StrictServerInterface interface { // Get titles // (GET /title) GetTitle(ctx context.Context, request GetTitleRequestObject) (GetTitleResponseObject, error) - // Add new user - // (POST /users) - PostUsers(ctx context.Context, request PostUsersRequestObject) (PostUsersResponseObject, error) // Get user info // (GET /users/{user_id}) GetUsersUserId(ctx context.Context, request GetUsersUserIdRequestObject) (GetUsersUserIdResponseObject, error) @@ -679,39 +651,6 @@ func (sh *strictHandler) GetTitle(ctx *gin.Context, params GetTitleParams) { } } -// PostUsers operation middleware -func (sh *strictHandler) PostUsers(ctx *gin.Context) { - var request PostUsersRequestObject - - var body PostUsersJSONRequestBody - if err := ctx.ShouldBindJSON(&body); err != nil { - ctx.Status(http.StatusBadRequest) - ctx.Error(err) - return - } - request.Body = &body - - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.PostUsers(ctx, request.(PostUsersRequestObject)) - } - for _, middleware := range sh.middlewares { - handler = middleware(handler, "PostUsers") - } - - response, err := handler(ctx, request) - - if err != nil { - ctx.Error(err) - ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(PostUsersResponseObject); ok { - if err := validResponse.VisitPostUsersResponse(ctx.Writer); err != nil { - ctx.Error(err) - } - } else if response != nil { - ctx.Error(fmt.Errorf("unexpected response type: %T", response)) - } -} - // GetUsersUserId operation middleware func (sh *strictHandler) GetUsersUserId(ctx *gin.Context, userId string, params GetUsersUserIdParams) { var request GetUsersUserIdRequestObject diff --git a/api/openapi.yaml b/api/openapi.yaml index 4187ebb..c899595 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -243,28 +243,28 @@ paths: # items: # $ref: '#/components/schemas/User' - post: - summary: Add new user - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/User' - responses: - '200': - description: Add result - content: - application/json: - schema: - type: object - properties: - success: - type: boolean - error: - type: string - user_json: - $ref: '#/components/schemas/User' + # post: + # summary: Add new user + # requestBody: + # required: true + # content: + # application/json: + # schema: + # $ref: '#/components/schemas/User' + # responses: + # '200': + # description: Add result + # content: + # application/json: + # schema: + # type: object + # properties: + # success: + # type: boolean + # error: + # type: string + # user_json: + # $ref: '#/components/schemas/User' # /users/{user_id}/titles: # get: @@ -608,6 +608,8 @@ components: studio_id: type: integer format: int64 + studio_name: + type: string poster_id: type: integer format: int64 diff --git a/modules/backend/handlers/users.go b/modules/backend/handlers/users.go index 3da61de..9e59261 100644 --- a/modules/backend/handlers/users.go +++ b/modules/backend/handlers/users.go @@ -25,7 +25,7 @@ import ( func mapUser(u sqlc.GetUserByIDRow) oapi.User { return oapi.User{ AvatarId: u.AvatarID, - CreationDate: u.CreationDate, + CreationDate: &u.CreationDate, DispName: u.DispName, Id: &u.ID, Mail: (*types.Email)(u.Mail), From 3cca6ee16821dda7be772056f0ba3f62beab30c3 Mon Sep 17 00:00:00 2001 From: Iron_Felix <trubnikov.arseniy@mail.ru> Date: Sat, 15 Nov 2025 18:56:46 +0300 Subject: [PATCH 60/80] feat: statements for studios table added --- modules/backend/queries.sql | 14 ++++++++++++ sql/queries.sql.go | 45 +++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/modules/backend/queries.sql b/modules/backend/queries.sql index b90ec6a..29c941e 100644 --- a/modules/backend/queries.sql +++ b/modules/backend/queries.sql @@ -13,6 +13,20 @@ SELECT id, avatar_id, mail, nickname, disp_name, user_desc, creation_date FROM users WHERE id = $1; + +-- name: GetStudioByID :one +SELECT * +FROM studios +WHERE id = sqlc.arg('studio_id')::int; + +-- name: InsertStudio :one +INSERT INTO studios (studio_name, illust_id, studio_desc) +VALUES ( + sqlc.arg('studio_name')::text, + sqlc.narg('illust_id')::bigint, + sqlc.narg('studio_desc')::text) +RETURNING id, studio_name, illust_id, studio_desc; + -- -- name: ListUsers :many -- SELECT user_id, avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date -- FROM users diff --git a/sql/queries.sql.go b/sql/queries.sql.go index 2ef4178..b3ee9f4 100644 --- a/sql/queries.sql.go +++ b/sql/queries.sql.go @@ -41,6 +41,24 @@ func (q *Queries) GetImageByID(ctx context.Context, id int64) (Image, error) { return i, err } +const getStudioByID = `-- name: GetStudioByID :one +SELECT id, studio_name, illust_id, studio_desc +FROM studios +WHERE id = $1::int +` + +func (q *Queries) GetStudioByID(ctx context.Context, studioID int32) (Studio, error) { + row := q.db.QueryRow(ctx, getStudioByID, studioID) + var i Studio + err := row.Scan( + &i.ID, + &i.StudioName, + &i.IllustID, + &i.StudioDesc, + ) + return i, err +} + const getUserByID = `-- name: GetUserByID :one SELECT id, avatar_id, mail, nickname, disp_name, user_desc, creation_date FROM users @@ -72,6 +90,33 @@ func (q *Queries) GetUserByID(ctx context.Context, id int64) (GetUserByIDRow, er return i, err } +const insertStudio = `-- name: InsertStudio :one +INSERT INTO studios (studio_name, illust_id, studio_desc) +VALUES ( + $1::text, + $2::bigint, + $3::text) +RETURNING id, studio_name, illust_id, studio_desc +` + +type InsertStudioParams struct { + StudioName string `json:"studio_name"` + IllustID *int64 `json:"illust_id"` + StudioDesc *string `json:"studio_desc"` +} + +func (q *Queries) InsertStudio(ctx context.Context, arg InsertStudioParams) (Studio, error) { + row := q.db.QueryRow(ctx, insertStudio, arg.StudioName, arg.IllustID, arg.StudioDesc) + var i Studio + err := row.Scan( + &i.ID, + &i.StudioName, + &i.IllustID, + &i.StudioDesc, + ) + return i, err +} + const searchTitles = `-- name: SearchTitles :many From e6dc27fd55abe64c96ae51e746c2c31625d9982c Mon Sep 17 00:00:00 2001 From: Iron_Felix <trubnikov.arseniy@mail.ru> Date: Sat, 15 Nov 2025 19:19:39 +0300 Subject: [PATCH 61/80] feat: statements for tags added --- modules/backend/queries.sql | 20 ++++++++++++ sql/queries.sql.go | 62 +++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/modules/backend/queries.sql b/modules/backend/queries.sql index 29c941e..a4c0bb9 100644 --- a/modules/backend/queries.sql +++ b/modules/backend/queries.sql @@ -27,6 +27,26 @@ VALUES ( sqlc.narg('studio_desc')::text) RETURNING id, studio_name, illust_id, studio_desc; +-- name: GetTitleTags :many +SELECT + tag_names +FROM tags as g +JOIN title_tags as t ON(t.tag_id = g.id) +WHERE t.title_id = sqlc.arg('title_id')::bigint; + +-- name: InsertTitleTags :one +INSERT INTO title_tags (title_id, tag_id) +VALUES ( + sqlc.arg('title_id')::bigint, + sqlc.arg('tag_id')::bigint) +RETURNING title_id, tag_id; + +-- name: InsertTag :one +INSERT INTO tags (tag_names) +VALUES ( + sqlc.arg('tag_names')::jsonb) +RETURNING id, tag_names; + -- -- name: ListUsers :many -- SELECT user_id, avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date -- FROM users diff --git a/sql/queries.sql.go b/sql/queries.sql.go index b3ee9f4..a73889c 100644 --- a/sql/queries.sql.go +++ b/sql/queries.sql.go @@ -59,6 +59,34 @@ func (q *Queries) GetStudioByID(ctx context.Context, studioID int32) (Studio, er return i, err } +const getTitleTags = `-- name: GetTitleTags :many +SELECT + tag_names +FROM tags as g +JOIN title_tags as t ON(t.tag_id = g.id) +WHERE t.title_id = $1::bigint +` + +func (q *Queries) GetTitleTags(ctx context.Context, titleID int64) ([][]byte, error) { + rows, err := q.db.Query(ctx, getTitleTags, titleID) + if err != nil { + return nil, err + } + defer rows.Close() + var items [][]byte + for rows.Next() { + var tag_names []byte + if err := rows.Scan(&tag_names); err != nil { + return nil, err + } + items = append(items, tag_names) + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + const getUserByID = `-- name: GetUserByID :one SELECT id, avatar_id, mail, nickname, disp_name, user_desc, creation_date FROM users @@ -117,6 +145,40 @@ func (q *Queries) InsertStudio(ctx context.Context, arg InsertStudioParams) (Stu return i, err } +const insertTag = `-- name: InsertTag :one +INSERT INTO tags (tag_names) +VALUES ( + $1::jsonb) +RETURNING id, tag_names +` + +func (q *Queries) InsertTag(ctx context.Context, tagNames []byte) (Tag, error) { + row := q.db.QueryRow(ctx, insertTag, tagNames) + var i Tag + err := row.Scan(&i.ID, &i.TagNames) + return i, err +} + +const insertTitleTags = `-- name: InsertTitleTags :one +INSERT INTO title_tags (title_id, tag_id) +VALUES ( + $1::bigint, + $2::bigint) +RETURNING title_id, tag_id +` + +type InsertTitleTagsParams struct { + TitleID int64 `json:"title_id"` + TagID int64 `json:"tag_id"` +} + +func (q *Queries) InsertTitleTags(ctx context.Context, arg InsertTitleTagsParams) (TitleTag, error) { + row := q.db.QueryRow(ctx, insertTitleTags, arg.TitleID, arg.TagID) + var i TitleTag + err := row.Scan(&i.TitleID, &i.TagID) + return i, err +} + const searchTitles = `-- name: SearchTitles :many From 4949a3c25faeb933e6c92ae9938001adf7fefab8 Mon Sep 17 00:00:00 2001 From: Iron_Felix <trubnikov.arseniy@mail.ru> Date: Sat, 15 Nov 2025 23:00:40 +0300 Subject: [PATCH 62/80] refactor: new types --- api/api.gen.go | 4 ++-- api/openapi.yaml | 2 ++ modules/backend/handlers/titles.go | 27 +++++++++++++++++---------- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/api/api.gen.go b/api/api.gen.go index 9adc19d..ebb4c01 100644 --- a/api/api.gen.go +++ b/api/api.gen.go @@ -94,8 +94,8 @@ type GetTitleParams struct { Rating *float64 `form:"rating,omitempty" json:"rating,omitempty"` ReleaseYear *int32 `form:"release_year,omitempty" json:"release_year,omitempty"` ReleaseSeason *ReleaseSeason `form:"release_season,omitempty" json:"release_season,omitempty"` - Limit *int `form:"limit,omitempty" json:"limit,omitempty"` - Offset *int `form:"offset,omitempty" json:"offset,omitempty"` + Limit *int32 `form:"limit,omitempty" json:"limit,omitempty"` + Offset *int32 `form:"offset,omitempty" json:"offset,omitempty"` Fields *string `form:"fields,omitempty" json:"fields,omitempty"` } diff --git a/api/openapi.yaml b/api/openapi.yaml index c899595..200cc47 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -35,11 +35,13 @@ paths: name: limit schema: type: integer + format: int32 default: 10 - in: query name: offset schema: type: integer + format: int32 default: 0 - in: query name: fields diff --git a/modules/backend/handlers/titles.go b/modules/backend/handlers/titles.go index 85f9f45..99217ca 100644 --- a/modules/backend/handlers/titles.go +++ b/modules/backend/handlers/titles.go @@ -57,21 +57,25 @@ func ReleaseSeason2sqlc(s *oapi.ReleaseSeason) (*sqlc.ReleaseSeasonT, error) { return &t, nil } +type TileNames *map[string][]string + // unmarshall jsonb to map[string][]string -func jsonb2map4names(b []byte) (*map[string][]string, error) { - var t map[string][]string - if err := json.Unmarshal(b, &t); err != nil { +func jsonb2TitleNames(b []byte) (TileNames, error) { + var t TileNames + if err := json.Unmarshal(b, t); err != nil { return nil, fmt.Errorf("invalid title_names JSON for title: %w", err) } - return &t, nil + return t, nil } -func jsonb2map4len(b []byte) (*map[string]float64, error) { - var t map[string]float64 - if err := json.Unmarshal(b, &t); err != nil { +type EpisodeLens *map[string]float64 + +func jsonb2EpisodeLens(b []byte) (EpisodeLens, error) { + var t EpisodeLens + if err := json.Unmarshal(b, t); err != nil { return nil, fmt.Errorf("invalid episodes_len JSON for title: %w", err) } - return &t, nil + return t, nil } func (s Server) GetTitle(ctx context.Context, request oapi.GetTitleRequestObject) (oapi.GetTitleResponseObject, error) { @@ -95,6 +99,8 @@ func (s Server) GetTitle(ctx context.Context, request oapi.GetTitleRequestObject Rating: request.Params.Rating, ReleaseYear: request.Params.ReleaseYear, ReleaseSeason: season, + Offset: request.Params.Offset, + Limit: request.Params.Limit, }) if err != nil { return oapi.GetTitle500Response{}, nil @@ -104,12 +110,12 @@ func (s Server) GetTitle(ctx context.Context, request oapi.GetTitleRequestObject } for _, title := range titles { - title_names, err := jsonb2map4names(title.TitleNames) + title_names, err := jsonb2TitleNames(title.TitleNames) if err != nil { log.Errorf("%v", err) return oapi.GetTitle500Response{}, err } - episodes_lens, err := jsonb2map4len(title.EpisodesLen) + episodes_lens, err := jsonb2EpisodeLens(title.EpisodesLen) if err != nil { log.Errorf("%v", err) return oapi.GetTitle500Response{}, err @@ -122,6 +128,7 @@ func (s Server) GetTitle(ctx context.Context, request oapi.GetTitleRequestObject ReleaseSeason: (*oapi.ReleaseSeason)(title.ReleaseSeason), ReleaseYear: title.ReleaseYear, StudioId: &title.StudioID, + // StudioName: , TitleNames: title_names, TitleStatus: (*oapi.TitleStatus)(&title.TitleStatus), EpisodesAired: title.EpisodesAired, From e18f4a44c3acf4b0fc36889690e853dd7b416c0e Mon Sep 17 00:00:00 2001 From: Iron_Felix <trubnikov.arseniy@mail.ru> Date: Sun, 16 Nov 2025 01:47:11 +0300 Subject: [PATCH 63/80] feat: more fields for titles and refactored schemas --- api/api.gen.go | 71 ++++++++++++++++++++++++++++-------------------- api/openapi.yaml | 71 ++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 101 insertions(+), 41 deletions(-) diff --git a/api/api.gen.go b/api/api.gen.go index ebb4c01..c3ef4da 100644 --- a/api/api.gen.go +++ b/api/api.gen.go @@ -34,6 +34,21 @@ const ( // ReleaseSeason Title release season type ReleaseSeason string +// Studio defines model for Studio. +type Studio struct { + Description *string `json:"description,omitempty"` + Id *int64 `json:"id,omitempty"` + Name *string `json:"name,omitempty"` + PosterId *int64 `json:"poster_id,omitempty"` + PosterPath *string `json:"poster_path,omitempty"` +} + +// Tag A localized tag: keys are language codes (ISO 639-1), values are tag names +type Tag map[string]string + +// Tags Array of localized tags +type Tags = []Tag + // Title defines model for Title. type Title struct { EpisodesAired *int32 `json:"episodes_aired,omitempty"` @@ -41,7 +56,7 @@ type Title struct { EpisodesLen *map[string]float64 `json:"episodes_len,omitempty"` // Id Unique title ID (primary key) - Id *int64 `json:"id,omitempty"` + Id int64 `json:"id"` PosterId *int64 `json:"poster_id,omitempty"` Rating *float64 `json:"rating,omitempty"` RatingCount *int32 `json:"rating_count,omitempty"` @@ -49,11 +64,13 @@ type Title struct { // ReleaseSeason Title release season ReleaseSeason *ReleaseSeason `json:"release_season,omitempty"` ReleaseYear *int32 `json:"release_year,omitempty"` - StudioId *int64 `json:"studio_id,omitempty"` - StudioName *string `json:"studio_name,omitempty"` + Studio *Studio `json:"studio,omitempty"` + + // Tags Array of localized tags + Tags Tags `json:"tags"` // TitleNames Localized titles. Key = language (ISO 639-1), value = list of names - TitleNames *map[string][]string `json:"title_names,omitempty"` + TitleNames map[string][]string `json:"title_names"` // TitleStatus Title status TitleStatus *TitleStatus `json:"title_status,omitempty"` @@ -201,20 +218,20 @@ func (a *Title) UnmarshalJSON(b []byte) error { delete(object, "release_year") } - if raw, found := object["studio_id"]; found { - err = json.Unmarshal(raw, &a.StudioId) + if raw, found := object["studio"]; found { + err = json.Unmarshal(raw, &a.Studio) if err != nil { - return fmt.Errorf("error reading 'studio_id': %w", err) + return fmt.Errorf("error reading 'studio': %w", err) } - delete(object, "studio_id") + delete(object, "studio") } - if raw, found := object["studio_name"]; found { - err = json.Unmarshal(raw, &a.StudioName) + if raw, found := object["tags"]; found { + err = json.Unmarshal(raw, &a.Tags) if err != nil { - return fmt.Errorf("error reading 'studio_name': %w", err) + return fmt.Errorf("error reading 'tags': %w", err) } - delete(object, "studio_name") + delete(object, "tags") } if raw, found := object["title_names"]; found { @@ -273,11 +290,9 @@ func (a Title) MarshalJSON() ([]byte, error) { } } - if a.Id != nil { - object["id"], err = json.Marshal(a.Id) - if err != nil { - return nil, fmt.Errorf("error marshaling 'id': %w", err) - } + object["id"], err = json.Marshal(a.Id) + if err != nil { + return nil, fmt.Errorf("error marshaling 'id': %w", err) } if a.PosterId != nil { @@ -315,25 +330,21 @@ func (a Title) MarshalJSON() ([]byte, error) { } } - if a.StudioId != nil { - object["studio_id"], err = json.Marshal(a.StudioId) + if a.Studio != nil { + object["studio"], err = json.Marshal(a.Studio) if err != nil { - return nil, fmt.Errorf("error marshaling 'studio_id': %w", err) + return nil, fmt.Errorf("error marshaling 'studio': %w", err) } } - if a.StudioName != nil { - object["studio_name"], err = json.Marshal(a.StudioName) - if err != nil { - return nil, fmt.Errorf("error marshaling 'studio_name': %w", err) - } + object["tags"], err = json.Marshal(a.Tags) + if err != nil { + return nil, fmt.Errorf("error marshaling 'tags': %w", err) } - if a.TitleNames != nil { - object["title_names"], err = json.Marshal(a.TitleNames) - if err != nil { - return nil, fmt.Errorf("error marshaling 'title_names': %w", err) - } + object["title_names"], err = json.Marshal(a.TitleNames) + if err != nil { + return nil, fmt.Errorf("error marshaling 'title_names': %w", err) } if a.TitleStatus != nil { diff --git a/api/openapi.yaml b/api/openapi.yaml index 200cc47..0356898 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -2,8 +2,10 @@ openapi: 3.1.1 info: title: Titles, Users, Reviews, Tags, and Media API version: 1.0.0 + servers: - url: /api/v1 + paths: /title: get: @@ -63,6 +65,7 @@ paths: description: Request params are not correct '500': description: Unknown server error + # /title/{title_id}: # get: # summary: Get title description @@ -569,6 +572,7 @@ components: - finished - ongoing - planned + ReleaseSeason: type: string description: Title release season @@ -577,6 +581,7 @@ components: - spring - summer - fall + UserTitleStatus: type: string description: User's title status @@ -585,8 +590,57 @@ components: - planned - dropped - in-progress + + Review: + type: object + additionalProperties: true + + Tag: + type: object + description: "A localized tag: keys are language codes (ISO 639-1), values are tag names" + additionalProperties: + type: string + example: + en: "Shojo" + ru: "Сёдзё" + ja: "少女" + + Tags: + type: array + description: "Array of localized tags" + items: + $ref: '#/components/schemas/Tag' + example: + - en: "Shojo" + ru: "Сёдзё" + ja: "少女" + - en: "Shounen" + ru: "Сёнен" + ja: "少年" + + Studio: + type: object + properties: + id: + type: integer + format: int64 + name: + type: string + poster_id: + type: integer + format: int64 + poster_path: + type: string + description: + type: string + + Title: type: object + required: + - id + - title_names + - tags properties: id: type: integer @@ -607,11 +661,10 @@ components: en: ["Attack on Titan", "AoT"] ru: ["Атака титанов", "Титаны"] ja: ["進撃の巨人"] - studio_id: - type: integer - format: int64 - studio_name: - type: string + studio: + $ref: '#/components/schemas/Studio' + tags: + $ref: '#/components/schemas/Tags' poster_id: type: integer format: int64 @@ -640,6 +693,7 @@ components: type: number format: double additionalProperties: true + User: type: object properties: @@ -683,12 +737,7 @@ components: - user_id - nickname # - creation_date + UserTitle: type: object additionalProperties: true - Review: - type: object - additionalProperties: true - Tag: - type: object - additionalProperties: true From d1180a426ff4f043baaaec58afd894b4c2f5ffb4 Mon Sep 17 00:00:00 2001 From: Iron_Felix <trubnikov.arseniy@mail.ru> Date: Sun, 16 Nov 2025 02:14:38 +0300 Subject: [PATCH 64/80] feat: new schema for images --- api/api.gen.go | 23 +++++++++++++++-------- api/openapi.yaml | 16 +++++++++++++--- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/api/api.gen.go b/api/api.gen.go index c3ef4da..b3c51f6 100644 --- a/api/api.gen.go +++ b/api/api.gen.go @@ -31,6 +31,13 @@ const ( Planned TitleStatus = "planned" ) +// Image defines model for Image. +type Image struct { + Id *int64 `json:"id,omitempty"` + ImagePath *string `json:"image_path,omitempty"` + StorageType *string `json:"storage_type,omitempty"` +} + // ReleaseSeason Title release season type ReleaseSeason string @@ -57,7 +64,7 @@ type Title struct { // Id Unique title ID (primary key) Id int64 `json:"id"` - PosterId *int64 `json:"poster_id,omitempty"` + Poster *Image `json:"poster,omitempty"` Rating *float64 `json:"rating,omitempty"` RatingCount *int32 `json:"rating_count,omitempty"` @@ -178,12 +185,12 @@ func (a *Title) UnmarshalJSON(b []byte) error { delete(object, "id") } - if raw, found := object["poster_id"]; found { - err = json.Unmarshal(raw, &a.PosterId) + if raw, found := object["poster"]; found { + err = json.Unmarshal(raw, &a.Poster) if err != nil { - return fmt.Errorf("error reading 'poster_id': %w", err) + return fmt.Errorf("error reading 'poster': %w", err) } - delete(object, "poster_id") + delete(object, "poster") } if raw, found := object["rating"]; found { @@ -295,10 +302,10 @@ func (a Title) MarshalJSON() ([]byte, error) { return nil, fmt.Errorf("error marshaling 'id': %w", err) } - if a.PosterId != nil { - object["poster_id"], err = json.Marshal(a.PosterId) + if a.Poster != nil { + object["poster"], err = json.Marshal(a.Poster) if err != nil { - return nil, fmt.Errorf("error marshaling 'poster_id': %w", err) + return nil, fmt.Errorf("error marshaling 'poster': %w", err) } } diff --git a/api/openapi.yaml b/api/openapi.yaml index 0356898..d523f06 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -565,6 +565,17 @@ paths: components: schemas: + Image: + type: object + properties: + id: + type: integer + format: int64 + storage_type: + type: string + image_path: + type: string + TitleStatus: type: string description: Title status @@ -665,9 +676,8 @@ components: $ref: '#/components/schemas/Studio' tags: $ref: '#/components/schemas/Tags' - poster_id: - type: integer - format: int64 + poster: + $ref: '#/components/schemas/Image' title_status: $ref: '#/components/schemas/TitleStatus' rating: From 13a283ae8da0e138c1723d53517d1c9c6f01cc32 Mon Sep 17 00:00:00 2001 From: Iron_Felix <trubnikov.arseniy@mail.ru> Date: Sun, 16 Nov 2025 02:38:36 +0300 Subject: [PATCH 65/80] feat: GetTitles now returns all the field needed --- api/api.gen.go | 3 +- api/openapi.yaml | 7 +- modules/backend/handlers/titles.go | 147 +++++++++++++++++++++-------- modules/backend/queries.sql | 4 +- sql/migrations/000001_init.up.sql | 1 + sql/queries.sql.go | 8 +- 6 files changed, 119 insertions(+), 51 deletions(-) diff --git a/api/api.gen.go b/api/api.gen.go index b3c51f6..0057c22 100644 --- a/api/api.gen.go +++ b/api/api.gen.go @@ -46,8 +46,7 @@ type Studio struct { Description *string `json:"description,omitempty"` Id *int64 `json:"id,omitempty"` Name *string `json:"name,omitempty"` - PosterId *int64 `json:"poster_id,omitempty"` - PosterPath *string `json:"poster_path,omitempty"` + Poster *Image `json:"poster,omitempty"` } // Tag A localized tag: keys are language codes (ISO 639-1), values are tag names diff --git a/api/openapi.yaml b/api/openapi.yaml index d523f06..4628c6d 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -637,11 +637,8 @@ components: format: int64 name: type: string - poster_id: - type: integer - format: int64 - poster_path: - type: string + poster: + $ref: '#/components/schemas/Image' description: type: string diff --git a/modules/backend/handlers/titles.go b/modules/backend/handlers/titles.go index 99217ca..182f450 100644 --- a/modules/backend/handlers/titles.go +++ b/modules/backend/handlers/titles.go @@ -25,13 +25,14 @@ func TitleStatus2Sqlc(s *oapi.TitleStatus) (*sqlc.TitleStatusT, error) { return nil, nil } var t sqlc.TitleStatusT - if *s == "finished" { - t = "finished" - } else if *s == "ongoing" { - t = "ongoing" - } else if *s == "planned" { - t = "planned" - } else { + switch *s { + case oapi.Finished: + t = sqlc.TitleStatusTFinished + case oapi.Ongoing: + t = sqlc.TitleStatusTOngoing + case oapi.Planned: + t = sqlc.TitleStatusTPlanned + default: return nil, fmt.Errorf("unexpected tittle status: %s", *s) } return &t, nil @@ -41,41 +42,86 @@ func ReleaseSeason2sqlc(s *oapi.ReleaseSeason) (*sqlc.ReleaseSeasonT, error) { if s == nil { return nil, nil } - //TODO var t sqlc.ReleaseSeasonT - if *s == oapi.Winter { + switch *s { + case oapi.Winter: t = sqlc.ReleaseSeasonTWinter - } else if *s == "spring" { - t = "spring" - } else if *s == "summer" { - t = "summer" - } else if *s == "fall" { - t = "fall" - } else { + case oapi.Spring: + t = sqlc.ReleaseSeasonTSpring + case oapi.Summer: + t = sqlc.ReleaseSeasonTSummer + case oapi.Fall: + t = sqlc.ReleaseSeasonTFall + default: return nil, fmt.Errorf("unexpected release season: %s", *s) } return &t, nil } -type TileNames *map[string][]string +type TitleNames *map[string][]string +type EpisodeLens *map[string]float64 +type TagNames []map[string]string -// unmarshall jsonb to map[string][]string -func jsonb2TitleNames(b []byte) (TileNames, error) { - var t TileNames - if err := json.Unmarshal(b, t); err != nil { - return nil, fmt.Errorf("invalid title_names JSON for title: %w", err) +func (s Server) GetTagsByTitleId(ctx context.Context, id int64) (oapi.Tags, error) { + sqlc_title_tags, err := s.db.GetTitleTags(ctx, id) + if err != nil { + log.Errorf("%v", err) + return nil, err } - return t, nil + + var oapi_tag_names oapi.Tags + for _, title_tag := range sqlc_title_tags { + var oapi_tag_name map[string]string + err = json.Unmarshal(title_tag, &oapi_tag_name) + if err != nil { + log.Errorf("invalid JSON for %s: %v", "TagNames", err) + return nil, err + } + oapi_tag_names = append(oapi_tag_names, oapi_tag_name) + } + + return oapi_tag_names, nil } -type EpisodeLens *map[string]float64 +func (s Server) GetImage(ctx context.Context, id int64) (oapi.Image, error) { -func jsonb2EpisodeLens(b []byte) (EpisodeLens, error) { - var t EpisodeLens - if err := json.Unmarshal(b, t); err != nil { - return nil, fmt.Errorf("invalid episodes_len JSON for title: %w", err) + var oapi_image oapi.Image + + sqlc_image, err := s.db.GetImageByID(ctx, id) + if err != nil { + log.Errorf("%v", err) + return oapi_image, err } - return t, nil + //can cast and dont use brain cause all this fiels required + oapi_image.Id = &sqlc_image.ID + oapi_image.ImagePath = &sqlc_image.ImagePath + oapi_image.StorageType = (*string)(&sqlc_image.StorageType) + + return oapi_image, nil +} + +func (s Server) GetStudio(ctx context.Context, id int64) (oapi.Studio, error) { + + var oapi_studio oapi.Studio + + sqlc_studio, err := s.db.GetStudioByID(ctx, id) + if err != nil { + log.Errorf("%v", err) + return oapi_studio, err + } + + oapi_studio.Id = &sqlc_studio.ID + oapi_studio.Name = sqlc_studio.StudioName + oapi_studio.Description = sqlc_studio.StudioDesc + + oapi_illust, err := s.GetImage(ctx, *sqlc_studio.IllustID) + if err != nil { + log.Errorf("%v", err) + return oapi_studio, err + } + oapi_studio.Poster = &oapi_illust + + return oapi_studio, nil } func (s Server) GetTitle(ctx context.Context, request oapi.GetTitleRequestObject) (oapi.GetTitleResponseObject, error) { @@ -103,6 +149,7 @@ func (s Server) GetTitle(ctx context.Context, request oapi.GetTitleRequestObject Limit: request.Params.Limit, }) if err != nil { + log.Errorf("%v", err) return oapi.GetTitle500Response{}, nil } if len(titles) == 0 { @@ -110,26 +157,50 @@ func (s Server) GetTitle(ctx context.Context, request oapi.GetTitleRequestObject } for _, title := range titles { - title_names, err := jsonb2TitleNames(title.TitleNames) + + var title_names TitleNames + err := json.Unmarshal(title.TitleNames, &title_names) if err != nil { - log.Errorf("%v", err) + log.Errorf("invalid JSON for %s: %v", "TitleNames", err) return oapi.GetTitle500Response{}, err } - episodes_lens, err := jsonb2EpisodeLens(title.EpisodesLen) + + var episodes_lens EpisodeLens + err = json.Unmarshal(title.EpisodesLen, &episodes_lens) if err != nil { - log.Errorf("%v", err) + log.Errorf("invalid JSON for %s: %v", "EpisodeLens", err) return oapi.GetTitle500Response{}, err } + + oapi_tag_names, err := s.GetTagsByTitleId(ctx, title.ID) + if err != nil { + log.Errorf("error while getting tags %v", err) + return oapi.GetTitle500Response{}, err + } + + oapi_image, err := s.GetImage(ctx, *title.PosterID) + if err != nil { + log.Errorf("error while getting image %v", err) + return oapi.GetTitle500Response{}, err + } + + oapi_studio, err := s.GetStudio(ctx, title.StudioID) + if err != nil { + log.Errorf("error while getting studio %v", err) + return oapi.GetTitle500Response{}, err + } + t := oapi.Title{ - Id: &title.ID, - PosterId: title.PosterID, + + Id: title.ID, + Poster: &oapi_image, Rating: title.Rating, RatingCount: title.RatingCount, ReleaseSeason: (*oapi.ReleaseSeason)(title.ReleaseSeason), ReleaseYear: title.ReleaseYear, - StudioId: &title.StudioID, - // StudioName: , - TitleNames: title_names, + Studio: &oapi_studio, + Tags: oapi_tag_names, + TitleNames: *title_names, TitleStatus: (*oapi.TitleStatus)(&title.TitleStatus), EpisodesAired: title.EpisodesAired, EpisodesAll: title.EpisodesAll, diff --git a/modules/backend/queries.sql b/modules/backend/queries.sql index a4c0bb9..7717f9f 100644 --- a/modules/backend/queries.sql +++ b/modules/backend/queries.sql @@ -1,7 +1,7 @@ -- name: GetImageByID :one SELECT id, storage_type, image_path FROM images -WHERE id = $1; +WHERE id = sqlc.arg('illust_id'); -- name: CreateImage :one INSERT INTO images (storage_type, image_path) @@ -17,7 +17,7 @@ WHERE id = $1; -- name: GetStudioByID :one SELECT * FROM studios -WHERE id = sqlc.arg('studio_id')::int; +WHERE id = sqlc.arg('studio_id')::bigint; -- name: InsertStudio :one INSERT INTO studios (studio_name, illust_id, studio_desc) diff --git a/sql/migrations/000001_init.up.sql b/sql/migrations/000001_init.up.sql index c325dc8..669143a 100644 --- a/sql/migrations/000001_init.up.sql +++ b/sql/migrations/000001_init.up.sql @@ -14,6 +14,7 @@ CREATE TABLE providers ( CREATE TABLE tags ( id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY, + -- example: { "ru": "Сёдзё", "en": "Shojo", "jp": "少女"} tag_names jsonb NOT NULL ); diff --git a/sql/queries.sql.go b/sql/queries.sql.go index a73889c..865ec73 100644 --- a/sql/queries.sql.go +++ b/sql/queries.sql.go @@ -34,8 +34,8 @@ FROM images WHERE id = $1 ` -func (q *Queries) GetImageByID(ctx context.Context, id int64) (Image, error) { - row := q.db.QueryRow(ctx, getImageByID, id) +func (q *Queries) GetImageByID(ctx context.Context, illustID int64) (Image, error) { + row := q.db.QueryRow(ctx, getImageByID, illustID) var i Image err := row.Scan(&i.ID, &i.StorageType, &i.ImagePath) return i, err @@ -44,10 +44,10 @@ func (q *Queries) GetImageByID(ctx context.Context, id int64) (Image, error) { const getStudioByID = `-- name: GetStudioByID :one SELECT id, studio_name, illust_id, studio_desc FROM studios -WHERE id = $1::int +WHERE id = $1::bigint ` -func (q *Queries) GetStudioByID(ctx context.Context, studioID int32) (Studio, error) { +func (q *Queries) GetStudioByID(ctx context.Context, studioID int64) (Studio, error) { row := q.db.QueryRow(ctx, getStudioByID, studioID) var i Studio err := row.Scan( From cefbbec1dc2fa2ad1bcc7dc711fe2ddb16f7eb56 Mon Sep 17 00:00:00 2001 From: Iron_Felix <trubnikov.arseniy@mail.ru> Date: Sun, 16 Nov 2025 02:43:28 +0300 Subject: [PATCH 66/80] feat: wrote query to get one title --- modules/backend/queries.sql | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/backend/queries.sql b/modules/backend/queries.sql index 7717f9f..f58d33c 100644 --- a/modules/backend/queries.sql +++ b/modules/backend/queries.sql @@ -72,6 +72,11 @@ RETURNING id, tag_names; -- DELETE FROM users -- WHERE user_id = $1; +--name: GetTitleByID :one +SELECT * +FROM titles +WHERE id = sqlc.arg("title_id")::bigint; + -- name: SearchTitles :many SELECT * From 47989ab10da73e351f9550dbae328698c38bc68e Mon Sep 17 00:00:00 2001 From: Iron_Felix <trubnikov.arseniy@mail.ru> Date: Sun, 16 Nov 2025 03:38:51 +0300 Subject: [PATCH 67/80] feat: /titles/{id} endpoint implemented --- api/api.gen.go | 117 +++++++++++++++++++++++ api/openapi.yaml | 51 +++++----- modules/backend/handlers/titles.go | 144 ++++++++++++++++------------- modules/backend/queries.sql | 4 +- sql/queries.sql.go | 81 ++++++++++------ 5 files changed, 283 insertions(+), 114 deletions(-) diff --git a/api/api.gen.go b/api/api.gen.go index 0057c22..3f4f5dd 100644 --- a/api/api.gen.go +++ b/api/api.gen.go @@ -122,6 +122,11 @@ type GetTitleParams struct { Fields *string `form:"fields,omitempty" json:"fields,omitempty"` } +// GetTitleTitleIdParams defines parameters for GetTitleTitleId. +type GetTitleTitleIdParams struct { + Fields *string `form:"fields,omitempty" json:"fields,omitempty"` +} + // GetUsersUserIdParams defines parameters for GetUsersUserId. type GetUsersUserIdParams struct { Fields *string `form:"fields,omitempty" json:"fields,omitempty"` @@ -374,6 +379,9 @@ type ServerInterface interface { // Get titles // (GET /title) GetTitle(c *gin.Context, params GetTitleParams) + // Get title description + // (GET /title/{title_id}) + GetTitleTitleId(c *gin.Context, titleId int64, params GetTitleTitleIdParams) // Get user info // (GET /users/{user_id}) GetUsersUserId(c *gin.Context, userId string, params GetUsersUserIdParams) @@ -470,6 +478,41 @@ func (siw *ServerInterfaceWrapper) GetTitle(c *gin.Context) { siw.Handler.GetTitle(c, params) } +// GetTitleTitleId operation middleware +func (siw *ServerInterfaceWrapper) GetTitleTitleId(c *gin.Context) { + + var err error + + // ------------- Path parameter "title_id" ------------- + var titleId int64 + + err = runtime.BindStyledParameterWithOptions("simple", "title_id", c.Param("title_id"), &titleId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter title_id: %w", err), http.StatusBadRequest) + return + } + + // Parameter object where we will unmarshal all parameters from the context + var params GetTitleTitleIdParams + + // ------------- Optional query parameter "fields" ------------- + + err = runtime.BindQueryParameter("form", true, false, "fields", c.Request.URL.Query(), ¶ms.Fields) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter fields: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.GetTitleTitleId(c, titleId, params) +} + // GetUsersUserId operation middleware func (siw *ServerInterfaceWrapper) GetUsersUserId(c *gin.Context) { @@ -533,6 +576,7 @@ func RegisterHandlersWithOptions(router gin.IRouter, si ServerInterface, options } router.GET(options.BaseURL+"/title", wrapper.GetTitle) + router.GET(options.BaseURL+"/title/:title_id", wrapper.GetTitleTitleId) router.GET(options.BaseURL+"/users/:user_id", wrapper.GetUsersUserId) } @@ -577,6 +621,48 @@ func (response GetTitle500Response) VisitGetTitleResponse(w http.ResponseWriter) return nil } +type GetTitleTitleIdRequestObject struct { + TitleId int64 `json:"title_id"` + Params GetTitleTitleIdParams +} + +type GetTitleTitleIdResponseObject interface { + VisitGetTitleTitleIdResponse(w http.ResponseWriter) error +} + +type GetTitleTitleId200JSONResponse Title + +func (response GetTitleTitleId200JSONResponse) VisitGetTitleTitleIdResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type GetTitleTitleId400Response struct { +} + +func (response GetTitleTitleId400Response) VisitGetTitleTitleIdResponse(w http.ResponseWriter) error { + w.WriteHeader(400) + return nil +} + +type GetTitleTitleId404Response struct { +} + +func (response GetTitleTitleId404Response) VisitGetTitleTitleIdResponse(w http.ResponseWriter) error { + w.WriteHeader(404) + return nil +} + +type GetTitleTitleId500Response struct { +} + +func (response GetTitleTitleId500Response) VisitGetTitleTitleIdResponse(w http.ResponseWriter) error { + w.WriteHeader(500) + return nil +} + type GetUsersUserIdRequestObject struct { UserId string `json:"user_id"` Params GetUsersUserIdParams @@ -624,6 +710,9 @@ type StrictServerInterface interface { // Get titles // (GET /title) GetTitle(ctx context.Context, request GetTitleRequestObject) (GetTitleResponseObject, error) + // Get title description + // (GET /title/{title_id}) + GetTitleTitleId(ctx context.Context, request GetTitleTitleIdRequestObject) (GetTitleTitleIdResponseObject, error) // Get user info // (GET /users/{user_id}) GetUsersUserId(ctx context.Context, request GetUsersUserIdRequestObject) (GetUsersUserIdResponseObject, error) @@ -668,6 +757,34 @@ func (sh *strictHandler) GetTitle(ctx *gin.Context, params GetTitleParams) { } } +// GetTitleTitleId operation middleware +func (sh *strictHandler) GetTitleTitleId(ctx *gin.Context, titleId int64, params GetTitleTitleIdParams) { + var request GetTitleTitleIdRequestObject + + request.TitleId = titleId + request.Params = params + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.GetTitleTitleId(ctx, request.(GetTitleTitleIdRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "GetTitleTitleId") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(GetTitleTitleIdResponseObject); ok { + if err := validResponse.VisitGetTitleTitleIdResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} + // GetUsersUserId operation middleware func (sh *strictHandler) GetUsersUserId(ctx *gin.Context, userId string, params GetUsersUserIdParams) { var request GetUsersUserIdRequestObject diff --git a/api/openapi.yaml b/api/openapi.yaml index 4628c6d..9ea20f4 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -66,29 +66,34 @@ paths: '500': description: Unknown server error -# /title/{title_id}: -# get: -# summary: Get title description -# parameters: -# - in: path -# name: title_id -# required: true -# schema: -# type: string -# - in: query -# name: fields -# schema: -# type: string -# default: all -# responses: -# '200': -# description: Title description -# content: -# application/json: -# schema: -# $ref: '#/components/schemas/Title' -# '404': -# description: Title not found + /title/{title_id}: + get: + summary: Get title description + parameters: + - in: path + name: title_id + required: true + schema: + type: integer + format: int64 + - in: query + name: fields + schema: + type: string + default: all + responses: + '200': + description: Title description + content: + application/json: + schema: + $ref: '#/components/schemas/Title' + '404': + description: Title not found + '400': + description: Request params are not correct + '500': + description: Unknown server error # patch: # summary: Update title info diff --git a/modules/backend/handlers/titles.go b/modules/backend/handlers/titles.go index 182f450..3bbaa10 100644 --- a/modules/backend/handlers/titles.go +++ b/modules/backend/handlers/titles.go @@ -58,15 +58,15 @@ func ReleaseSeason2sqlc(s *oapi.ReleaseSeason) (*sqlc.ReleaseSeasonT, error) { return &t, nil } -type TitleNames *map[string][]string -type EpisodeLens *map[string]float64 -type TagNames []map[string]string +// type TitleNames map[string][]string +// type EpisodeLens map[string]float64 +// type TagNames []map[string]string func (s Server) GetTagsByTitleId(ctx context.Context, id int64) (oapi.Tags, error) { + sqlc_title_tags, err := s.db.GetTitleTags(ctx, id) if err != nil { - log.Errorf("%v", err) - return nil, err + return nil, fmt.Errorf("query GetTitleTags: %v", err) } var oapi_tag_names oapi.Tags @@ -74,8 +74,7 @@ func (s Server) GetTagsByTitleId(ctx context.Context, id int64) (oapi.Tags, erro var oapi_tag_name map[string]string err = json.Unmarshal(title_tag, &oapi_tag_name) if err != nil { - log.Errorf("invalid JSON for %s: %v", "TagNames", err) - return nil, err + return nil, fmt.Errorf("unmarshalling title_tag: %v", err) } oapi_tag_names = append(oapi_tag_names, oapi_tag_name) } @@ -89,8 +88,7 @@ func (s Server) GetImage(ctx context.Context, id int64) (oapi.Image, error) { sqlc_image, err := s.db.GetImageByID(ctx, id) if err != nil { - log.Errorf("%v", err) - return oapi_image, err + return oapi_image, fmt.Errorf("query GetImageByID: %v", err) } //can cast and dont use brain cause all this fiels required oapi_image.Id = &sqlc_image.ID @@ -106,8 +104,7 @@ func (s Server) GetStudio(ctx context.Context, id int64) (oapi.Studio, error) { sqlc_studio, err := s.db.GetStudioByID(ctx, id) if err != nil { - log.Errorf("%v", err) - return oapi_studio, err + return oapi_studio, fmt.Errorf("query GetStudioByID: %v", err) } oapi_studio.Id = &sqlc_studio.ID @@ -116,16 +113,82 @@ func (s Server) GetStudio(ctx context.Context, id int64) (oapi.Studio, error) { oapi_illust, err := s.GetImage(ctx, *sqlc_studio.IllustID) if err != nil { - log.Errorf("%v", err) - return oapi_studio, err + return oapi_studio, fmt.Errorf("GetImage: %v", err) } oapi_studio.Poster = &oapi_illust return oapi_studio, nil } +func (s Server) mapTitle(ctx context.Context, title sqlc.Title) (oapi.Title, error) { + var oapi_title oapi.Title + + var title_names map[string][]string + err := json.Unmarshal(title.TitleNames, &title_names) + if err != nil { + return oapi_title, fmt.Errorf("unmarshal TitleNames: %v", err) + } + + var episodes_lens map[string]float64 + err = json.Unmarshal(title.EpisodesLen, &episodes_lens) + if err != nil { + return oapi_title, fmt.Errorf("unmarshal EpisodesLen: %v", err) + } + + oapi_tag_names, err := s.GetTagsByTitleId(ctx, title.ID) + if err != nil { + return oapi_title, fmt.Errorf("GetTagsByTitleId: %v", err) + } + + oapi_image, err := s.GetImage(ctx, *title.PosterID) + if err != nil { + return oapi_title, fmt.Errorf("GetImage: %v", err) + } + + oapi_studio, err := s.GetStudio(ctx, title.StudioID) + if err != nil { + return oapi_title, fmt.Errorf("GetStudio: %v", err) + } + + oapi_title = oapi.Title{ + + Id: title.ID, + Poster: &oapi_image, + Rating: title.Rating, + RatingCount: title.RatingCount, + ReleaseSeason: (*oapi.ReleaseSeason)(title.ReleaseSeason), + ReleaseYear: title.ReleaseYear, + Studio: &oapi_studio, + Tags: oapi_tag_names, + TitleNames: title_names, + TitleStatus: (*oapi.TitleStatus)(&title.TitleStatus), + EpisodesAired: title.EpisodesAired, + EpisodesAll: title.EpisodesAll, + EpisodesLen: &episodes_lens, + } + return oapi_title, nil +} + +func (s Server) GetTitleTitleId(ctx context.Context, request oapi.GetTitleTitleIdRequestObject) (oapi.GetTitleTitleIdResponseObject, error) { + var oapi_title oapi.Title + + sqlc_title, err := s.db.GetTitleByID(ctx, request.TitleId) + if err != nil { + log.Errorf("%v", err) + return oapi.GetTitleTitleId500Response{}, nil + } + + oapi_title, err = s.mapTitle(ctx, sqlc_title) + if err != nil { + log.Errorf("%v", err) + return oapi.GetTitleTitleId500Response{}, nil + } + + return oapi.GetTitleTitleId200JSONResponse(oapi_title), nil +} + func (s Server) GetTitle(ctx context.Context, request oapi.GetTitleRequestObject) (oapi.GetTitleResponseObject, error) { - var result []oapi.Title + var opai_titles []oapi.Title word := Word2Sqlc(request.Params.Word) status, err := TitleStatus2Sqlc(request.Params.Status) @@ -158,56 +221,13 @@ func (s Server) GetTitle(ctx context.Context, request oapi.GetTitleRequestObject for _, title := range titles { - var title_names TitleNames - err := json.Unmarshal(title.TitleNames, &title_names) + t, err := s.mapTitle(ctx, title) if err != nil { - log.Errorf("invalid JSON for %s: %v", "TitleNames", err) - return oapi.GetTitle500Response{}, err + log.Errorf("%v", err) + return oapi.GetTitle500Response{}, nil } - - var episodes_lens EpisodeLens - err = json.Unmarshal(title.EpisodesLen, &episodes_lens) - if err != nil { - log.Errorf("invalid JSON for %s: %v", "EpisodeLens", err) - return oapi.GetTitle500Response{}, err - } - - oapi_tag_names, err := s.GetTagsByTitleId(ctx, title.ID) - if err != nil { - log.Errorf("error while getting tags %v", err) - return oapi.GetTitle500Response{}, err - } - - oapi_image, err := s.GetImage(ctx, *title.PosterID) - if err != nil { - log.Errorf("error while getting image %v", err) - return oapi.GetTitle500Response{}, err - } - - oapi_studio, err := s.GetStudio(ctx, title.StudioID) - if err != nil { - log.Errorf("error while getting studio %v", err) - return oapi.GetTitle500Response{}, err - } - - t := oapi.Title{ - - Id: title.ID, - Poster: &oapi_image, - Rating: title.Rating, - RatingCount: title.RatingCount, - ReleaseSeason: (*oapi.ReleaseSeason)(title.ReleaseSeason), - ReleaseYear: title.ReleaseYear, - Studio: &oapi_studio, - Tags: oapi_tag_names, - TitleNames: *title_names, - TitleStatus: (*oapi.TitleStatus)(&title.TitleStatus), - EpisodesAired: title.EpisodesAired, - EpisodesAll: title.EpisodesAll, - EpisodesLen: episodes_lens, - } - result = append(result, t) + opai_titles = append(opai_titles, t) } - return oapi.GetTitle200JSONResponse(result), nil + return oapi.GetTitle200JSONResponse(opai_titles), nil } diff --git a/modules/backend/queries.sql b/modules/backend/queries.sql index f58d33c..0570604 100644 --- a/modules/backend/queries.sql +++ b/modules/backend/queries.sql @@ -72,10 +72,10 @@ RETURNING id, tag_names; -- DELETE FROM users -- WHERE user_id = $1; ---name: GetTitleByID :one +-- name: GetTitleByID :one SELECT * FROM titles -WHERE id = sqlc.arg("title_id")::bigint; +WHERE id = sqlc.arg('title_id')::bigint; -- name: SearchTitles :many SELECT diff --git a/sql/queries.sql.go b/sql/queries.sql.go index 865ec73..8539d8d 100644 --- a/sql/queries.sql.go +++ b/sql/queries.sql.go @@ -59,6 +59,60 @@ func (q *Queries) GetStudioByID(ctx context.Context, studioID int64) (Studio, er return i, err } +const getTitleByID = `-- name: GetTitleByID :one + + + + +SELECT id, title_names, studio_id, poster_id, title_status, rating, rating_count, release_year, release_season, season, episodes_aired, episodes_all, episodes_len +FROM titles +WHERE id = $1::bigint +` + +// -- name: ListUsers :many +// SELECT user_id, avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date +// FROM users +// ORDER BY user_id +// LIMIT $1 OFFSET $2; +// -- name: CreateUser :one +// INSERT INTO users (avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date) +// VALUES ($1, $2, $3, $4, $5, $6, $7) +// RETURNING user_id, avatar_id, nickname, disp_name, user_desc, creation_date; +// -- name: UpdateUser :one +// UPDATE users +// SET +// +// avatar_id = COALESCE(sqlc.narg('avatar_id'), avatar_id), +// disp_name = COALESCE(sqlc.narg('disp_name'), disp_name), +// user_desc = COALESCE(sqlc.narg('user_desc'), user_desc), +// passhash = COALESCE(sqlc.narg('passhash'), passhash) +// +// WHERE user_id = sqlc.arg('user_id') +// RETURNING user_id, avatar_id, nickname, disp_name, user_desc, creation_date; +// -- name: DeleteUser :exec +// DELETE FROM users +// WHERE user_id = $1; +func (q *Queries) GetTitleByID(ctx context.Context, titleID int64) (Title, error) { + row := q.db.QueryRow(ctx, getTitleByID, titleID) + var i Title + err := row.Scan( + &i.ID, + &i.TitleNames, + &i.StudioID, + &i.PosterID, + &i.TitleStatus, + &i.Rating, + &i.RatingCount, + &i.ReleaseYear, + &i.ReleaseSeason, + &i.Season, + &i.EpisodesAired, + &i.EpisodesAll, + &i.EpisodesLen, + ) + return i, err +} + const getTitleTags = `-- name: GetTitleTags :many SELECT tag_names @@ -180,10 +234,6 @@ func (q *Queries) InsertTitleTags(ctx context.Context, arg InsertTitleTagsParams } const searchTitles = `-- name: SearchTitles :many - - - - SELECT id, title_names, studio_id, poster_id, title_status, rating, rating_count, release_year, release_season, season, episodes_aired, episodes_all, episodes_len FROM titles @@ -228,29 +278,6 @@ type SearchTitlesParams struct { Limit *int32 `json:"limit"` } -// -- name: ListUsers :many -// SELECT user_id, avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date -// FROM users -// ORDER BY user_id -// LIMIT $1 OFFSET $2; -// -- name: CreateUser :one -// INSERT INTO users (avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date) -// VALUES ($1, $2, $3, $4, $5, $6, $7) -// RETURNING user_id, avatar_id, nickname, disp_name, user_desc, creation_date; -// -- name: UpdateUser :one -// UPDATE users -// SET -// -// avatar_id = COALESCE(sqlc.narg('avatar_id'), avatar_id), -// disp_name = COALESCE(sqlc.narg('disp_name'), disp_name), -// user_desc = COALESCE(sqlc.narg('user_desc'), user_desc), -// passhash = COALESCE(sqlc.narg('passhash'), passhash) -// -// WHERE user_id = sqlc.arg('user_id') -// RETURNING user_id, avatar_id, nickname, disp_name, user_desc, creation_date; -// -- name: DeleteUser :exec -// DELETE FROM users -// WHERE user_id = $1; func (q *Queries) SearchTitles(ctx context.Context, arg SearchTitlesParams) ([]Title, error) { rows, err := q.db.Query(ctx, searchTitles, arg.Word, From 29f0a612996039d3be25563873f5eab23298d03d Mon Sep 17 00:00:00 2001 From: Iron_Felix <trubnikov.arseniy@mail.ru> Date: Sun, 16 Nov 2025 04:15:33 +0300 Subject: [PATCH 68/80] feat: reviews table added --- sql/migrations/000001_init.up.sql | 16 ++++++++++++++++ sql/models.go | 15 +++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/sql/migrations/000001_init.up.sql b/sql/migrations/000001_init.up.sql index 669143a..97f881d 100644 --- a/sql/migrations/000001_init.up.sql +++ b/sql/migrations/000001_init.up.sql @@ -24,6 +24,22 @@ CREATE TABLE images ( image_path text UNIQUE NOT NULL ); +CREATE TABLE reviews ( + id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY, + data text NOT NULL, + rating int CHECK (rating >= 0 AND rating <= 10), + illust_id bigint REFERENCES images (id), + user_id bigint REFERENCES users (id), + title_id bigint REFERENCES titles (id), + created_at timestamptz DEFAULT NOW() +); + +CREATE TABLE review_images ( + PRIMARY KEY (review_id, image_id), + review_id bigint NOT NULL REFERENCES reviews(id) ON DELETE CASCADE, + image_id bigint NOT NULL REFERENCES images(id) ON DELETE CASCADE +); + CREATE TABLE users ( id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY, avatar_id bigint REFERENCES images (id), diff --git a/sql/models.go b/sql/models.go index 6583b71..a36c6fa 100644 --- a/sql/models.go +++ b/sql/models.go @@ -208,6 +208,21 @@ type Provider struct { Credentials []byte `json:"credentials"` } +type Review struct { + ID int64 `json:"id"` + Data string `json:"data"` + Rating *int32 `json:"rating"` + IllustID *int64 `json:"illust_id"` + UserID *int64 `json:"user_id"` + TitleID *int64 `json:"title_id"` + CreatedAt pgtype.Timestamptz `json:"created_at"` +} + +type ReviewImage struct { + ReviewID int64 `json:"review_id"` + ImageID int64 `json:"image_id"` +} + type Signal struct { ID int64 `json:"id"` TitleID *int64 `json:"title_id"` From b81cc86beb8f1bff094084d28b115f520efd2437 Mon Sep 17 00:00:00 2001 From: Iron_Felix <trubnikov.arseniy@mail.ru> Date: Sun, 16 Nov 2025 04:52:11 +0300 Subject: [PATCH 69/80] fix: --- modules/backend/handlers/titles.go | 40 ++++++++++++++++++------------ 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/modules/backend/handlers/titles.go b/modules/backend/handlers/titles.go index 3bbaa10..e5fcf18 100644 --- a/modules/backend/handlers/titles.go +++ b/modules/backend/handlers/titles.go @@ -90,10 +90,12 @@ func (s Server) GetImage(ctx context.Context, id int64) (oapi.Image, error) { if err != nil { return oapi_image, fmt.Errorf("query GetImageByID: %v", err) } + //can cast and dont use brain cause all this fiels required oapi_image.Id = &sqlc_image.ID oapi_image.ImagePath = &sqlc_image.ImagePath - oapi_image.StorageType = (*string)(&sqlc_image.StorageType) + storageTypeStr := string(sqlc_image.StorageType) // или fmt.Sprint(...), если int + oapi_image.StorageType = &storageTypeStr return oapi_image, nil } @@ -150,22 +152,28 @@ func (s Server) mapTitle(ctx context.Context, title sqlc.Title) (oapi.Title, err return oapi_title, fmt.Errorf("GetStudio: %v", err) } - oapi_title = oapi.Title{ - - Id: title.ID, - Poster: &oapi_image, - Rating: title.Rating, - RatingCount: title.RatingCount, - ReleaseSeason: (*oapi.ReleaseSeason)(title.ReleaseSeason), - ReleaseYear: title.ReleaseYear, - Studio: &oapi_studio, - Tags: oapi_tag_names, - TitleNames: title_names, - TitleStatus: (*oapi.TitleStatus)(&title.TitleStatus), - EpisodesAired: title.EpisodesAired, - EpisodesAll: title.EpisodesAll, - EpisodesLen: &episodes_lens, + if title.ReleaseSeason != nil { + rs := oapi.ReleaseSeason(*title.ReleaseSeason) + oapi_title.ReleaseSeason = &rs + } else { + oapi_title.ReleaseSeason = nil } + + ts := oapi.TitleStatus(title.TitleStatus) + oapi_title.TitleStatus = &ts + + oapi_title.Id = title.ID + oapi_title.Poster = &oapi_image + oapi_title.Rating = title.Rating + oapi_title.RatingCount = title.RatingCount + oapi_title.ReleaseYear = title.ReleaseYear + oapi_title.Studio = &oapi_studio + oapi_title.Tags = oapi_tag_names + oapi_title.TitleNames = title_names + oapi_title.EpisodesAired = title.EpisodesAired + oapi_title.EpisodesAll = title.EpisodesAll + oapi_title.EpisodesLen = &episodes_lens + return oapi_title, nil } From f888ac9b70ae3514baa643fbbaa07c70b2de5e99 Mon Sep 17 00:00:00 2001 From: nihonium <nihonium@nekoea.red> Date: Mon, 17 Nov 2025 02:41:45 +0300 Subject: [PATCH 70/80] review: review notes for titles.go --- modules/backend/handlers/titles.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/backend/handlers/titles.go b/modules/backend/handlers/titles.go index e5fcf18..6e3967a 100644 --- a/modules/backend/handlers/titles.go +++ b/modules/backend/handlers/titles.go @@ -11,6 +11,7 @@ import ( ) func Word2Sqlc(s *string) *string { + // TODO: merge two ifs if s == nil { return nil } @@ -69,6 +70,7 @@ func (s Server) GetTagsByTitleId(ctx context.Context, id int64) (oapi.Tags, erro return nil, fmt.Errorf("query GetTitleTags: %v", err) } + // TODO: check if underlying slice initialized as nil var oapi_tag_names oapi.Tags for _, title_tag := range sqlc_title_tags { var oapi_tag_name map[string]string @@ -91,6 +93,7 @@ func (s Server) GetImage(ctx context.Context, id int64) (oapi.Image, error) { return oapi_image, fmt.Errorf("query GetImageByID: %v", err) } + // TODO: clearer comment //can cast and dont use brain cause all this fiels required oapi_image.Id = &sqlc_image.ID oapi_image.ImagePath = &sqlc_image.ImagePath @@ -101,7 +104,7 @@ func (s Server) GetImage(ctx context.Context, id int64) (oapi.Image, error) { } func (s Server) GetStudio(ctx context.Context, id int64) (oapi.Studio, error) { - + // TODO: check all possibly nil fields var oapi_studio oapi.Studio sqlc_studio, err := s.db.GetStudioByID(ctx, id) @@ -123,6 +126,7 @@ func (s Server) GetStudio(ctx context.Context, id int64) (oapi.Studio, error) { } func (s Server) mapTitle(ctx context.Context, title sqlc.Title) (oapi.Title, error) { + // TODO: check all possibly nil fields var oapi_title oapi.Title var title_names map[string][]string From 35a4e173f08898ccad3daaee18532ab8063e124f Mon Sep 17 00:00:00 2001 From: Iron_Felix <trubnikov.arseniy@mail.ru> Date: Mon, 17 Nov 2025 03:55:42 +0300 Subject: [PATCH 71/80] feat: query GetReviewById added --- modules/backend/queries.sql | 10 ++++---- sql/queries.sql.go | 49 +++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 5 deletions(-) diff --git a/modules/backend/queries.sql b/modules/backend/queries.sql index 0570604..a4ed1fe 100644 --- a/modules/backend/queries.sql +++ b/modules/backend/queries.sql @@ -135,10 +135,10 @@ OFFSET sqlc.narg('offset')::int; -- WHERE title_id = sqlc.arg('title_id') -- RETURNING *; --- -- name: GetReviewByID :one --- SELECT review_id, user_id, title_id, image_ids, review_text, creation_date --- FROM reviews --- WHERE review_id = $1; +-- name: GetReviewByID :one +SELECT * +FROM reviews +WHERE review_id = sqlc.arg('review_id')::bigint; -- -- name: CreateReview :one -- INSERT INTO reviews (user_id, title_id, image_ids, review_text, creation_date) @@ -157,7 +157,7 @@ OFFSET sqlc.narg('offset')::int; -- DELETE FROM reviews -- WHERE review_id = $1; --- -- name: ListReviewsByTitle :many +-- name: ListReviewsByTitle :many -- SELECT review_id, user_id, title_id, image_ids, review_text, creation_date -- FROM reviews -- WHERE title_id = $1 diff --git a/sql/queries.sql.go b/sql/queries.sql.go index 8539d8d..c5e6f8a 100644 --- a/sql/queries.sql.go +++ b/sql/queries.sql.go @@ -41,6 +41,55 @@ func (q *Queries) GetImageByID(ctx context.Context, illustID int64) (Image, erro return i, err } +const getReviewByID = `-- name: GetReviewByID :one + + +SELECT id, data, rating, illust_id, user_id, title_id, created_at +FROM reviews +WHERE review_id = $1::bigint +` + +// -- name: ListTitles :many +// SELECT title_id, title_names, studio_id, poster_id, signal_ids, +// +// title_status, rating, rating_count, release_year, release_season, +// season, episodes_aired, episodes_all, episodes_len +// +// FROM titles +// ORDER BY title_id +// LIMIT $1 OFFSET $2; +// -- name: UpdateTitle :one +// UPDATE titles +// SET +// +// title_names = COALESCE(sqlc.narg('title_names'), title_names), +// studio_id = COALESCE(sqlc.narg('studio_id'), studio_id), +// poster_id = COALESCE(sqlc.narg('poster_id'), poster_id), +// signal_ids = COALESCE(sqlc.narg('signal_ids'), signal_ids), +// title_status = COALESCE(sqlc.narg('title_status'), title_status), +// release_year = COALESCE(sqlc.narg('release_year'), release_year), +// release_season = COALESCE(sqlc.narg('release_season'), release_season), +// episodes_aired = COALESCE(sqlc.narg('episodes_aired'), episodes_aired), +// episodes_all = COALESCE(sqlc.narg('episodes_all'), episodes_all), +// episodes_len = COALESCE(sqlc.narg('episodes_len'), episodes_len) +// +// WHERE title_id = sqlc.arg('title_id') +// RETURNING *; +func (q *Queries) GetReviewByID(ctx context.Context, reviewID int64) (Review, error) { + row := q.db.QueryRow(ctx, getReviewByID, reviewID) + var i Review + err := row.Scan( + &i.ID, + &i.Data, + &i.Rating, + &i.IllustID, + &i.UserID, + &i.TitleID, + &i.CreatedAt, + ) + return i, err +} + const getStudioByID = `-- name: GetStudioByID :one SELECT id, studio_name, illust_id, studio_desc FROM studios From df45a327e6902348a5d80674757e53e1e1eef6bd Mon Sep 17 00:00:00 2001 From: Iron_Felix <trubnikov.arseniy@mail.ru> Date: Mon, 17 Nov 2025 09:26:58 +0300 Subject: [PATCH 72/80] fix --- api/api.gen.go | 12 ++++- api/openapi.yaml | 5 ++ modules/backend/handlers/titles.go | 74 +++++++++++++++++------------- sql/migrations/000001_init.up.sql | 2 +- sql/models.go | 2 +- 5 files changed, 60 insertions(+), 35 deletions(-) diff --git a/api/api.gen.go b/api/api.gen.go index 3f4f5dd..5222930 100644 --- a/api/api.gen.go +++ b/api/api.gen.go @@ -44,8 +44,8 @@ type ReleaseSeason string // Studio defines model for Studio. type Studio struct { Description *string `json:"description,omitempty"` - Id *int64 `json:"id,omitempty"` - Name *string `json:"name,omitempty"` + Id int64 `json:"id"` + Name string `json:"name"` Poster *Image `json:"poster,omitempty"` } @@ -639,6 +639,14 @@ func (response GetTitleTitleId200JSONResponse) VisitGetTitleTitleIdResponse(w ht return json.NewEncoder(w).Encode(response) } +type GetTitleTitleId204Response struct { +} + +func (response GetTitleTitleId204Response) VisitGetTitleTitleIdResponse(w http.ResponseWriter) error { + w.WriteHeader(204) + return nil +} + type GetTitleTitleId400Response struct { } diff --git a/api/openapi.yaml b/api/openapi.yaml index 9ea20f4..7c83426 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -94,6 +94,8 @@ paths: description: Request params are not correct '500': description: Unknown server error + '204': + description: No title found # patch: # summary: Update title info @@ -636,6 +638,9 @@ components: Studio: type: object + required: + - id + - name properties: id: type: integer diff --git a/modules/backend/handlers/titles.go b/modules/backend/handlers/titles.go index 6e3967a..c66fef5 100644 --- a/modules/backend/handlers/titles.go +++ b/modules/backend/handlers/titles.go @@ -2,6 +2,7 @@ package handlers import ( "context" + "database/sql" "encoding/json" "fmt" oapi "nyanimedb/api" @@ -11,13 +12,10 @@ import ( ) func Word2Sqlc(s *string) *string { - // TODO: merge two ifs - if s == nil { - return nil - } - if *s == "" { + if s == nil || *s == "" { return nil } + return s } @@ -59,21 +57,19 @@ func ReleaseSeason2sqlc(s *oapi.ReleaseSeason) (*sqlc.ReleaseSeasonT, error) { return &t, nil } -// type TitleNames map[string][]string -// type EpisodeLens map[string]float64 -// type TagNames []map[string]string - func (s Server) GetTagsByTitleId(ctx context.Context, id int64) (oapi.Tags, error) { sqlc_title_tags, err := s.db.GetTitleTags(ctx, id) if err != nil { + if err == sql.ErrNoRows { + return nil, nil + } return nil, fmt.Errorf("query GetTitleTags: %v", err) } - // TODO: check if underlying slice initialized as nil - var oapi_tag_names oapi.Tags + oapi_tag_names := make(oapi.Tags, 1) for _, title_tag := range sqlc_title_tags { - var oapi_tag_name map[string]string + oapi_tag_name := make(map[string]string, 1) err = json.Unmarshal(title_tag, &oapi_tag_name) if err != nil { return nil, fmt.Errorf("unmarshalling title_tag: %v", err) @@ -84,58 +80,65 @@ func (s Server) GetTagsByTitleId(ctx context.Context, id int64) (oapi.Tags, erro return oapi_tag_names, nil } -func (s Server) GetImage(ctx context.Context, id int64) (oapi.Image, error) { +func (s Server) GetImage(ctx context.Context, id int64) (*oapi.Image, error) { - var oapi_image oapi.Image + var oapi_image *oapi.Image sqlc_image, err := s.db.GetImageByID(ctx, id) if err != nil { + if err == sql.ErrNoRows { + return nil, nil + } return oapi_image, fmt.Errorf("query GetImageByID: %v", err) } - // TODO: clearer comment - //can cast and dont use brain cause all this fiels required + //can cast and dont use brain cause all this fields required in image table oapi_image.Id = &sqlc_image.ID oapi_image.ImagePath = &sqlc_image.ImagePath - storageTypeStr := string(sqlc_image.StorageType) // или fmt.Sprint(...), если int + storageTypeStr := string(sqlc_image.StorageType) oapi_image.StorageType = &storageTypeStr return oapi_image, nil } -func (s Server) GetStudio(ctx context.Context, id int64) (oapi.Studio, error) { - // TODO: check all possibly nil fields +func (s Server) GetStudio(ctx context.Context, id int64) (*oapi.Studio, error) { + var oapi_studio oapi.Studio sqlc_studio, err := s.db.GetStudioByID(ctx, id) if err != nil { - return oapi_studio, fmt.Errorf("query GetStudioByID: %v", err) + if err == sql.ErrNoRows { + return nil, nil + } + return &oapi_studio, fmt.Errorf("query GetStudioByID: %v", err) } - oapi_studio.Id = &sqlc_studio.ID + oapi_studio.Id = sqlc_studio.ID oapi_studio.Name = sqlc_studio.StudioName oapi_studio.Description = sqlc_studio.StudioDesc oapi_illust, err := s.GetImage(ctx, *sqlc_studio.IllustID) if err != nil { - return oapi_studio, fmt.Errorf("GetImage: %v", err) + return &oapi_studio, fmt.Errorf("GetImage: %v", err) + } + if oapi_illust != nil { + oapi_studio.Poster = oapi_illust } - oapi_studio.Poster = &oapi_illust - return oapi_studio, nil + return &oapi_studio, nil } func (s Server) mapTitle(ctx context.Context, title sqlc.Title) (oapi.Title, error) { - // TODO: check all possibly nil fields + var oapi_title oapi.Title - var title_names map[string][]string + title_names := make(map[string][]string, 1) err := json.Unmarshal(title.TitleNames, &title_names) if err != nil { return oapi_title, fmt.Errorf("unmarshal TitleNames: %v", err) } - var episodes_lens map[string]float64 + episodes_lens := make(map[string]float64, 1) err = json.Unmarshal(title.EpisodesLen, &episodes_lens) if err != nil { return oapi_title, fmt.Errorf("unmarshal EpisodesLen: %v", err) @@ -145,16 +148,25 @@ func (s Server) mapTitle(ctx context.Context, title sqlc.Title) (oapi.Title, err if err != nil { return oapi_title, fmt.Errorf("GetTagsByTitleId: %v", err) } + if oapi_tag_names != nil { + oapi_title.Tags = oapi_tag_names + } oapi_image, err := s.GetImage(ctx, *title.PosterID) if err != nil { return oapi_title, fmt.Errorf("GetImage: %v", err) } + if oapi_image != nil { + oapi_title.Poster = oapi_image + } oapi_studio, err := s.GetStudio(ctx, title.StudioID) if err != nil { return oapi_title, fmt.Errorf("GetStudio: %v", err) } + if oapi_studio != nil { + oapi_title.Studio = oapi_studio + } if title.ReleaseSeason != nil { rs := oapi.ReleaseSeason(*title.ReleaseSeason) @@ -167,12 +179,9 @@ func (s Server) mapTitle(ctx context.Context, title sqlc.Title) (oapi.Title, err oapi_title.TitleStatus = &ts oapi_title.Id = title.ID - oapi_title.Poster = &oapi_image oapi_title.Rating = title.Rating oapi_title.RatingCount = title.RatingCount oapi_title.ReleaseYear = title.ReleaseYear - oapi_title.Studio = &oapi_studio - oapi_title.Tags = oapi_tag_names oapi_title.TitleNames = title_names oapi_title.EpisodesAired = title.EpisodesAired oapi_title.EpisodesAll = title.EpisodesAll @@ -186,6 +195,9 @@ func (s Server) GetTitleTitleId(ctx context.Context, request oapi.GetTitleTitleI sqlc_title, err := s.db.GetTitleByID(ctx, request.TitleId) if err != nil { + if err == sql.ErrNoRows { + return oapi.GetTitleTitleId204Response{}, nil + } log.Errorf("%v", err) return oapi.GetTitleTitleId500Response{}, nil } @@ -200,7 +212,7 @@ func (s Server) GetTitleTitleId(ctx context.Context, request oapi.GetTitleTitleI } func (s Server) GetTitle(ctx context.Context, request oapi.GetTitleRequestObject) (oapi.GetTitleResponseObject, error) { - var opai_titles []oapi.Title + opai_titles := make([]oapi.Title, 1) word := Word2Sqlc(request.Params.Word) status, err := TitleStatus2Sqlc(request.Params.Status) diff --git a/sql/migrations/000001_init.up.sql b/sql/migrations/000001_init.up.sql index 97f881d..81f2801 100644 --- a/sql/migrations/000001_init.up.sql +++ b/sql/migrations/000001_init.up.sql @@ -54,7 +54,7 @@ CREATE TABLE users ( CREATE TABLE studios ( id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY, - studio_name text UNIQUE, + studio_name text NOT NULL UNIQUE, illust_id bigint REFERENCES images (id), studio_desc text ); diff --git a/sql/models.go b/sql/models.go index a36c6fa..a593504 100644 --- a/sql/models.go +++ b/sql/models.go @@ -233,7 +233,7 @@ type Signal struct { type Studio struct { ID int64 `json:"id"` - StudioName *string `json:"studio_name"` + StudioName string `json:"studio_name"` IllustID *int64 `json:"illust_id"` StudioDesc *string `json:"studio_desc"` } From 148ae646b1d301d8f71b1bf0a2fe4671a84e14b9 Mon Sep 17 00:00:00 2001 From: Iron_Felix <trubnikov.arseniy@mail.ru> Date: Mon, 17 Nov 2025 09:39:26 +0300 Subject: [PATCH 73/80] feat --- modules/backend/handlers/titles.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/backend/handlers/titles.go b/modules/backend/handlers/titles.go index c66fef5..45d4c9b 100644 --- a/modules/backend/handlers/titles.go +++ b/modules/backend/handlers/titles.go @@ -2,12 +2,12 @@ package handlers import ( "context" - "database/sql" "encoding/json" "fmt" oapi "nyanimedb/api" sqlc "nyanimedb/sql" + "github.com/jackc/pgx/v5" log "github.com/sirupsen/logrus" ) @@ -61,7 +61,7 @@ func (s Server) GetTagsByTitleId(ctx context.Context, id int64) (oapi.Tags, erro sqlc_title_tags, err := s.db.GetTitleTags(ctx, id) if err != nil { - if err == sql.ErrNoRows { + if err == pgx.ErrNoRows { return nil, nil } return nil, fmt.Errorf("query GetTitleTags: %v", err) @@ -82,14 +82,14 @@ func (s Server) GetTagsByTitleId(ctx context.Context, id int64) (oapi.Tags, erro func (s Server) GetImage(ctx context.Context, id int64) (*oapi.Image, error) { - var oapi_image *oapi.Image + var oapi_image oapi.Image sqlc_image, err := s.db.GetImageByID(ctx, id) if err != nil { - if err == sql.ErrNoRows { + if err == pgx.ErrNoRows { return nil, nil } - return oapi_image, fmt.Errorf("query GetImageByID: %v", err) + return &oapi_image, fmt.Errorf("query GetImageByID: %v", err) } //can cast and dont use brain cause all this fields required in image table @@ -98,7 +98,7 @@ func (s Server) GetImage(ctx context.Context, id int64) (*oapi.Image, error) { storageTypeStr := string(sqlc_image.StorageType) oapi_image.StorageType = &storageTypeStr - return oapi_image, nil + return &oapi_image, nil } func (s Server) GetStudio(ctx context.Context, id int64) (*oapi.Studio, error) { @@ -107,7 +107,7 @@ func (s Server) GetStudio(ctx context.Context, id int64) (*oapi.Studio, error) { sqlc_studio, err := s.db.GetStudioByID(ctx, id) if err != nil { - if err == sql.ErrNoRows { + if err == pgx.ErrNoRows { return nil, nil } return &oapi_studio, fmt.Errorf("query GetStudioByID: %v", err) @@ -195,7 +195,7 @@ func (s Server) GetTitleTitleId(ctx context.Context, request oapi.GetTitleTitleI sqlc_title, err := s.db.GetTitleByID(ctx, request.TitleId) if err != nil { - if err == sql.ErrNoRows { + if err == pgx.ErrNoRows { return oapi.GetTitleTitleId204Response{}, nil } log.Errorf("%v", err) From 83711211300f3dcb00eabe35b0bb38aec9aae4f1 Mon Sep 17 00:00:00 2001 From: Iron_Felix <trubnikov.arseniy@mail.ru> Date: Tue, 18 Nov 2025 03:12:16 +0300 Subject: [PATCH 74/80] fix --- modules/backend/handlers/titles.go | 17 +++++++++++------ sql/migrations/000001_init.up.sql | 2 ++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/modules/backend/handlers/titles.go b/modules/backend/handlers/titles.go index 45d4c9b..9f076d5 100644 --- a/modules/backend/handlers/titles.go +++ b/modules/backend/handlers/titles.go @@ -117,6 +117,9 @@ func (s Server) GetStudio(ctx context.Context, id int64) (*oapi.Studio, error) { oapi_studio.Name = sqlc_studio.StudioName oapi_studio.Description = sqlc_studio.StudioDesc + if sqlc_studio.IllustID == nil { + return &oapi_studio, nil + } oapi_illust, err := s.GetImage(ctx, *sqlc_studio.IllustID) if err != nil { return &oapi_studio, fmt.Errorf("GetImage: %v", err) @@ -152,12 +155,14 @@ func (s Server) mapTitle(ctx context.Context, title sqlc.Title) (oapi.Title, err oapi_title.Tags = oapi_tag_names } - oapi_image, err := s.GetImage(ctx, *title.PosterID) - if err != nil { - return oapi_title, fmt.Errorf("GetImage: %v", err) - } - if oapi_image != nil { - oapi_title.Poster = oapi_image + if title.PosterID != nil { + oapi_image, err := s.GetImage(ctx, *title.PosterID) + if err != nil { + return oapi_title, fmt.Errorf("GetImage: %v", err) + } + if oapi_image != nil { + oapi_title.Poster = oapi_image + } } oapi_studio, err := s.GetStudio(ctx, title.StudioID) diff --git a/sql/migrations/000001_init.up.sql b/sql/migrations/000001_init.up.sql index 81f2801..8bd40d1 100644 --- a/sql/migrations/000001_init.up.sql +++ b/sql/migrations/000001_init.up.sql @@ -60,6 +60,7 @@ CREATE TABLE studios ( ); CREATE TABLE titles ( + // TODO: anime type (film, season etc) id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY, -- example {"ru": ["Атака титанов", "Атака Титанов"],"en": ["Attack on Titan", "AoT"],"ja": ["進撃の巨人", "しんげきのきょじん"]} title_names jsonb NOT NULL, @@ -88,6 +89,7 @@ CREATE TABLE usertitles ( rate int CHECK (rate > 0 AND rate <= 10), review_text text, review_date timestamptz + // TODO: series status ); CREATE TABLE title_tags ( From 8deba7afd9e320d2b182e9888baf1afe9c415c51 Mon Sep 17 00:00:00 2001 From: Iron_Felix <trubnikov.arseniy@mail.ru> Date: Tue, 18 Nov 2025 04:19:34 +0300 Subject: [PATCH 75/80] fix --- api/openapi.yaml | 22 ++++++++++++++++++++++ modules/backend/handlers/titles.go | 4 ++-- modules/backend/queries.sql | 2 +- sql/migrations/000001_init.up.sql | 7 +++---- 4 files changed, 28 insertions(+), 7 deletions(-) diff --git a/api/openapi.yaml b/api/openapi.yaml index 7c83426..0bbedca 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -757,4 +757,26 @@ components: UserTitle: type: object + required: + - user_id + - title_id + - status + properties: + user_id: + type: integer + format: int64 + title_id: + type: integer + format: int64 + status: + $ref: '#components/schemas/UserTitleStatus' + rate: + type: integer + format: int32 + review_id: + type: integer + format: int64 + ctime: + type: string + format: date-time additionalProperties: true diff --git a/modules/backend/handlers/titles.go b/modules/backend/handlers/titles.go index 9f076d5..45f0ef0 100644 --- a/modules/backend/handlers/titles.go +++ b/modules/backend/handlers/titles.go @@ -87,7 +87,7 @@ func (s Server) GetImage(ctx context.Context, id int64) (*oapi.Image, error) { sqlc_image, err := s.db.GetImageByID(ctx, id) if err != nil { if err == pgx.ErrNoRows { - return nil, nil + return nil, nil //todo: error reference in db } return &oapi_image, fmt.Errorf("query GetImageByID: %v", err) } @@ -217,7 +217,7 @@ func (s Server) GetTitleTitleId(ctx context.Context, request oapi.GetTitleTitleI } func (s Server) GetTitle(ctx context.Context, request oapi.GetTitleRequestObject) (oapi.GetTitleResponseObject, error) { - opai_titles := make([]oapi.Title, 1) + opai_titles := make([]oapi.Title, 0) word := Word2Sqlc(request.Params.Word) status, err := TitleStatus2Sqlc(request.Params.Status) diff --git a/modules/backend/queries.sql b/modules/backend/queries.sql index a4ed1fe..423be37 100644 --- a/modules/backend/queries.sql +++ b/modules/backend/queries.sql @@ -1,7 +1,7 @@ -- name: GetImageByID :one SELECT id, storage_type, image_path FROM images -WHERE id = sqlc.arg('illust_id'); +WHERE id = sqlc.arg('illust_id')::bigint; -- name: CreateImage :one INSERT INTO images (storage_type, image_path) diff --git a/sql/migrations/000001_init.up.sql b/sql/migrations/000001_init.up.sql index 8bd40d1..7b79300 100644 --- a/sql/migrations/000001_init.up.sql +++ b/sql/migrations/000001_init.up.sql @@ -28,7 +28,6 @@ CREATE TABLE reviews ( id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY, data text NOT NULL, rating int CHECK (rating >= 0 AND rating <= 10), - illust_id bigint REFERENCES images (id), user_id bigint REFERENCES users (id), title_id bigint REFERENCES titles (id), created_at timestamptz DEFAULT NOW() @@ -87,9 +86,9 @@ CREATE TABLE usertitles ( title_id bigint NOT NULL REFERENCES titles (id), status usertitle_status_t NOT NULL, rate int CHECK (rate > 0 AND rate <= 10), - review_text text, - review_date timestamptz - // TODO: series status + review_id bigint NOT NULL REFERENCES reviews (id), + ctime timestamptz + -- // TODO: series status ); CREATE TABLE title_tags ( From 09d0d1eb4d511c91c4ec4d20f1c7237f9b9b06e7 Mon Sep 17 00:00:00 2001 From: Iron_Felix <trubnikov.arseniy@mail.ru> Date: Tue, 18 Nov 2025 04:59:19 +0300 Subject: [PATCH 76/80] feat: get user titles described --- api/api.gen.go | 447 ++++++++++++++++++++++++----- api/openapi.yaml | 99 ++++--- modules/backend/handlers/titles.go | 30 +- modules/backend/handlers/users.go | 7 + sql/migrations/000001_init.up.sql | 2 +- 5 files changed, 461 insertions(+), 124 deletions(-) diff --git a/api/api.gen.go b/api/api.gen.go index 5222930..74a2d52 100644 --- a/api/api.gen.go +++ b/api/api.gen.go @@ -26,9 +26,17 @@ const ( // Defines values for TitleStatus. const ( - Finished TitleStatus = "finished" - Ongoing TitleStatus = "ongoing" - Planned TitleStatus = "planned" + TitleStatusFinished TitleStatus = "finished" + TitleStatusOngoing TitleStatus = "ongoing" + TitleStatusPlanned TitleStatus = "planned" +) + +// Defines values for UserTitleStatus. +const ( + UserTitleStatusDropped UserTitleStatus = "dropped" + UserTitleStatusFinished UserTitleStatus = "finished" + UserTitleStatusInProgress UserTitleStatus = "in-progress" + UserTitleStatusPlanned UserTitleStatus = "planned" ) // Image defines model for Image. @@ -110,8 +118,27 @@ type User struct { UserDesc *string `json:"user_desc,omitempty"` } -// GetTitleParams defines parameters for GetTitle. -type GetTitleParams struct { +// UserTitle defines model for UserTitle. +type UserTitle struct { + Ctime *time.Time `json:"ctime,omitempty"` + Rate *int32 `json:"rate,omitempty"` + ReviewId *int64 `json:"review_id,omitempty"` + + // Status User's title status + Status UserTitleStatus `json:"status"` + TitleId int64 `json:"title_id"` + UserId int64 `json:"user_id"` + AdditionalProperties map[string]interface{} `json:"-"` +} + +// UserTitleStatus User's title status +type UserTitleStatus string + +// Cursor defines model for cursor. +type Cursor = string + +// GetTitlesParams defines parameters for GetTitles. +type GetTitlesParams struct { Word *string `form:"word,omitempty" json:"word,omitempty"` Status *TitleStatus `form:"status,omitempty" json:"status,omitempty"` Rating *float64 `form:"rating,omitempty" json:"rating,omitempty"` @@ -122,8 +149,8 @@ type GetTitleParams struct { Fields *string `form:"fields,omitempty" json:"fields,omitempty"` } -// GetTitleTitleIdParams defines parameters for GetTitleTitleId. -type GetTitleTitleIdParams struct { +// GetTitlesTitleIdParams defines parameters for GetTitlesTitleId. +type GetTitlesTitleIdParams struct { Fields *string `form:"fields,omitempty" json:"fields,omitempty"` } @@ -132,6 +159,15 @@ type GetUsersUserIdParams struct { Fields *string `form:"fields,omitempty" json:"fields,omitempty"` } +// GetUsersUserIdTitlesParams defines parameters for GetUsersUserIdTitles. +type GetUsersUserIdTitlesParams struct { + Cursor *Cursor `form:"cursor,omitempty" json:"cursor,omitempty"` + Query *string `form:"query,omitempty" json:"query,omitempty"` + Limit *int `form:"limit,omitempty" json:"limit,omitempty"` + Offset *int `form:"offset,omitempty" json:"offset,omitempty"` + Fields *string `form:"fields,omitempty" json:"fields,omitempty"` +} + // Getter for additional properties for Title. Returns the specified // element and whether it was found func (a Title) Get(fieldName string) (value interface{}, found bool) { @@ -374,17 +410,157 @@ func (a Title) MarshalJSON() ([]byte, error) { return json.Marshal(object) } +// Getter for additional properties for UserTitle. Returns the specified +// element and whether it was found +func (a UserTitle) Get(fieldName string) (value interface{}, found bool) { + if a.AdditionalProperties != nil { + value, found = a.AdditionalProperties[fieldName] + } + return +} + +// Setter for additional properties for UserTitle +func (a *UserTitle) Set(fieldName string, value interface{}) { + if a.AdditionalProperties == nil { + a.AdditionalProperties = make(map[string]interface{}) + } + a.AdditionalProperties[fieldName] = value +} + +// Override default JSON handling for UserTitle to handle AdditionalProperties +func (a *UserTitle) UnmarshalJSON(b []byte) error { + object := make(map[string]json.RawMessage) + err := json.Unmarshal(b, &object) + if err != nil { + return err + } + + if raw, found := object["ctime"]; found { + err = json.Unmarshal(raw, &a.Ctime) + if err != nil { + return fmt.Errorf("error reading 'ctime': %w", err) + } + delete(object, "ctime") + } + + if raw, found := object["rate"]; found { + err = json.Unmarshal(raw, &a.Rate) + if err != nil { + return fmt.Errorf("error reading 'rate': %w", err) + } + delete(object, "rate") + } + + if raw, found := object["review_id"]; found { + err = json.Unmarshal(raw, &a.ReviewId) + if err != nil { + return fmt.Errorf("error reading 'review_id': %w", err) + } + delete(object, "review_id") + } + + if raw, found := object["status"]; found { + err = json.Unmarshal(raw, &a.Status) + if err != nil { + return fmt.Errorf("error reading 'status': %w", err) + } + delete(object, "status") + } + + if raw, found := object["title_id"]; found { + err = json.Unmarshal(raw, &a.TitleId) + if err != nil { + return fmt.Errorf("error reading 'title_id': %w", err) + } + delete(object, "title_id") + } + + if raw, found := object["user_id"]; found { + err = json.Unmarshal(raw, &a.UserId) + if err != nil { + return fmt.Errorf("error reading 'user_id': %w", err) + } + delete(object, "user_id") + } + + if len(object) != 0 { + a.AdditionalProperties = make(map[string]interface{}) + for fieldName, fieldBuf := range object { + var fieldVal interface{} + err := json.Unmarshal(fieldBuf, &fieldVal) + if err != nil { + return fmt.Errorf("error unmarshaling field %s: %w", fieldName, err) + } + a.AdditionalProperties[fieldName] = fieldVal + } + } + return nil +} + +// Override default JSON handling for UserTitle to handle AdditionalProperties +func (a UserTitle) MarshalJSON() ([]byte, error) { + var err error + object := make(map[string]json.RawMessage) + + if a.Ctime != nil { + object["ctime"], err = json.Marshal(a.Ctime) + if err != nil { + return nil, fmt.Errorf("error marshaling 'ctime': %w", err) + } + } + + if a.Rate != nil { + object["rate"], err = json.Marshal(a.Rate) + if err != nil { + return nil, fmt.Errorf("error marshaling 'rate': %w", err) + } + } + + if a.ReviewId != nil { + object["review_id"], err = json.Marshal(a.ReviewId) + if err != nil { + return nil, fmt.Errorf("error marshaling 'review_id': %w", err) + } + } + + object["status"], err = json.Marshal(a.Status) + if err != nil { + return nil, fmt.Errorf("error marshaling 'status': %w", err) + } + + object["title_id"], err = json.Marshal(a.TitleId) + if err != nil { + return nil, fmt.Errorf("error marshaling 'title_id': %w", err) + } + + object["user_id"], err = json.Marshal(a.UserId) + if err != nil { + return nil, fmt.Errorf("error marshaling 'user_id': %w", err) + } + + for fieldName, field := range a.AdditionalProperties { + object[fieldName], err = json.Marshal(field) + if err != nil { + return nil, fmt.Errorf("error marshaling '%s': %w", fieldName, err) + } + } + return json.Marshal(object) +} + // ServerInterface represents all server handlers. type ServerInterface interface { // Get titles - // (GET /title) - GetTitle(c *gin.Context, params GetTitleParams) + // (GET /titles) + GetTitles(c *gin.Context, params GetTitlesParams) // Get title description - // (GET /title/{title_id}) - GetTitleTitleId(c *gin.Context, titleId int64, params GetTitleTitleIdParams) + // (GET /titles/{title_id}) + GetTitlesTitleId(c *gin.Context, titleId int64, params GetTitlesTitleIdParams) // Get user info // (GET /users/{user_id}) GetUsersUserId(c *gin.Context, userId string, params GetUsersUserIdParams) + // Get user titles + // (GET /users/{user_id}/titles/) + GetUsersUserIdTitles(c *gin.Context, userId string, params GetUsersUserIdTitlesParams) } // ServerInterfaceWrapper converts contexts to parameters. @@ -396,13 +572,13 @@ type ServerInterfaceWrapper struct { type MiddlewareFunc func(c *gin.Context) -// GetTitle operation middleware -func (siw *ServerInterfaceWrapper) GetTitle(c *gin.Context) { +// GetTitles operation middleware +func (siw *ServerInterfaceWrapper) GetTitles(c *gin.Context) { var err error // Parameter object where we will unmarshal all parameters from the context - var params GetTitleParams + var params GetTitlesParams // ------------- Optional query parameter "word" ------------- @@ -475,11 +651,11 @@ func (siw *ServerInterfaceWrapper) GetTitle(c *gin.Context) { } } - siw.Handler.GetTitle(c, params) + siw.Handler.GetTitles(c, params) } -// GetTitleTitleId operation middleware -func (siw *ServerInterfaceWrapper) GetTitleTitleId(c *gin.Context) { +// GetTitlesTitleId operation middleware +func (siw *ServerInterfaceWrapper) GetTitlesTitleId(c *gin.Context) { var err error @@ -493,7 +669,7 @@ func (siw *ServerInterfaceWrapper) GetTitleTitleId(c *gin.Context) { } // Parameter object where we will unmarshal all parameters from the context - var params GetTitleTitleIdParams + var params GetTitlesTitleIdParams // ------------- Optional query parameter "fields" ------------- @@ -510,7 +686,7 @@ func (siw *ServerInterfaceWrapper) GetTitleTitleId(c *gin.Context) { } } - siw.Handler.GetTitleTitleId(c, titleId, params) + siw.Handler.GetTitlesTitleId(c, titleId, params) } // GetUsersUserId operation middleware @@ -548,6 +724,73 @@ func (siw *ServerInterfaceWrapper) GetUsersUserId(c *gin.Context) { siw.Handler.GetUsersUserId(c, userId, params) } +// GetUsersUserIdTitles operation middleware +func (siw *ServerInterfaceWrapper) GetUsersUserIdTitles(c *gin.Context) { + + var err error + + // ------------- Path parameter "user_id" ------------- + var userId string + + err = runtime.BindStyledParameterWithOptions("simple", "user_id", c.Param("user_id"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true}) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter user_id: %w", err), http.StatusBadRequest) + return + } + + // Parameter object where we will unmarshal all parameters from the context + var params GetUsersUserIdTitlesParams + + // ------------- Optional query parameter "cursor" ------------- + + err = runtime.BindQueryParameter("form", true, false, "cursor", c.Request.URL.Query(), ¶ms.Cursor) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter cursor: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "query" ------------- + + err = runtime.BindQueryParameter("form", true, false, "query", c.Request.URL.Query(), ¶ms.Query) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter query: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "limit" ------------- + + err = runtime.BindQueryParameter("form", true, false, "limit", c.Request.URL.Query(), ¶ms.Limit) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter limit: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "offset" ------------- + + err = runtime.BindQueryParameter("form", true, false, "offset", c.Request.URL.Query(), ¶ms.Offset) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter offset: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "fields" ------------- + + err = runtime.BindQueryParameter("form", true, false, "fields", c.Request.URL.Query(), ¶ms.Fields) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter fields: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.GetUsersUserIdTitles(c, userId, params) +} + // GinServerOptions provides options for the Gin server. type GinServerOptions struct { BaseURL string @@ -575,98 +818,99 @@ func RegisterHandlersWithOptions(router gin.IRouter, si ServerInterface, options ErrorHandler: errorHandler, } - router.GET(options.BaseURL+"/title", wrapper.GetTitle) - router.GET(options.BaseURL+"/title/:title_id", wrapper.GetTitleTitleId) + router.GET(options.BaseURL+"/titles", wrapper.GetTitles) + router.GET(options.BaseURL+"/titles/:title_id", wrapper.GetTitlesTitleId) router.GET(options.BaseURL+"/users/:user_id", wrapper.GetUsersUserId) + router.GET(options.BaseURL+"/users/:user_id/titles/", wrapper.GetUsersUserIdTitles) } -type GetTitleRequestObject struct { - Params GetTitleParams +type GetTitlesRequestObject struct { + Params GetTitlesParams } -type GetTitleResponseObject interface { - VisitGetTitleResponse(w http.ResponseWriter) error +type GetTitlesResponseObject interface { + VisitGetTitlesResponse(w http.ResponseWriter) error } -type GetTitle200JSONResponse []Title +type GetTitles200JSONResponse []Title -func (response GetTitle200JSONResponse) VisitGetTitleResponse(w http.ResponseWriter) error { +func (response GetTitles200JSONResponse) VisitGetTitlesResponse(w http.ResponseWriter) error { w.Header().Set("Content-Type", "application/json") w.WriteHeader(200) return json.NewEncoder(w).Encode(response) } -type GetTitle204Response struct { +type GetTitles204Response struct { } -func (response GetTitle204Response) VisitGetTitleResponse(w http.ResponseWriter) error { +func (response GetTitles204Response) VisitGetTitlesResponse(w http.ResponseWriter) error { w.WriteHeader(204) return nil } -type GetTitle400Response struct { +type GetTitles400Response struct { } -func (response GetTitle400Response) VisitGetTitleResponse(w http.ResponseWriter) error { +func (response GetTitles400Response) VisitGetTitlesResponse(w http.ResponseWriter) error { w.WriteHeader(400) return nil } -type GetTitle500Response struct { +type GetTitles500Response struct { } -func (response GetTitle500Response) VisitGetTitleResponse(w http.ResponseWriter) error { +func (response GetTitles500Response) VisitGetTitlesResponse(w http.ResponseWriter) error { w.WriteHeader(500) return nil } -type GetTitleTitleIdRequestObject struct { +type GetTitlesTitleIdRequestObject struct { TitleId int64 `json:"title_id"` - Params GetTitleTitleIdParams + Params GetTitlesTitleIdParams } -type GetTitleTitleIdResponseObject interface { - VisitGetTitleTitleIdResponse(w http.ResponseWriter) error +type GetTitlesTitleIdResponseObject interface { + VisitGetTitlesTitleIdResponse(w http.ResponseWriter) error } -type GetTitleTitleId200JSONResponse Title +type GetTitlesTitleId200JSONResponse Title -func (response GetTitleTitleId200JSONResponse) VisitGetTitleTitleIdResponse(w http.ResponseWriter) error { +func (response GetTitlesTitleId200JSONResponse) VisitGetTitlesTitleIdResponse(w http.ResponseWriter) error { w.Header().Set("Content-Type", "application/json") w.WriteHeader(200) return json.NewEncoder(w).Encode(response) } -type GetTitleTitleId204Response struct { +type GetTitlesTitleId204Response struct { } -func (response GetTitleTitleId204Response) VisitGetTitleTitleIdResponse(w http.ResponseWriter) error { +func (response GetTitlesTitleId204Response) VisitGetTitlesTitleIdResponse(w http.ResponseWriter) error { w.WriteHeader(204) return nil } -type GetTitleTitleId400Response struct { +type GetTitlesTitleId400Response struct { } -func (response GetTitleTitleId400Response) VisitGetTitleTitleIdResponse(w http.ResponseWriter) error { +func (response GetTitlesTitleId400Response) VisitGetTitlesTitleIdResponse(w http.ResponseWriter) error { w.WriteHeader(400) return nil } -type GetTitleTitleId404Response struct { +type GetTitlesTitleId404Response struct { } -func (response GetTitleTitleId404Response) VisitGetTitleTitleIdResponse(w http.ResponseWriter) error { +func (response GetTitlesTitleId404Response) VisitGetTitlesTitleIdResponse(w http.ResponseWriter) error { w.WriteHeader(404) return nil } -type GetTitleTitleId500Response struct { +type GetTitlesTitleId500Response struct { } -func (response GetTitleTitleId500Response) VisitGetTitleTitleIdResponse(w http.ResponseWriter) error { +func (response GetTitlesTitleId500Response) VisitGetTitlesTitleIdResponse(w http.ResponseWriter) error { w.WriteHeader(500) return nil } @@ -713,17 +957,62 @@ func (response GetUsersUserId500Response) VisitGetUsersUserIdResponse(w http.Res return nil } +type GetUsersUserIdTitlesRequestObject struct { + UserId string `json:"user_id"` + Params GetUsersUserIdTitlesParams +} + +type GetUsersUserIdTitlesResponseObject interface { + VisitGetUsersUserIdTitlesResponse(w http.ResponseWriter) error +} + +type GetUsersUserIdTitles200JSONResponse []UserTitle + +func (response GetUsersUserIdTitles200JSONResponse) VisitGetUsersUserIdTitlesResponse(w http.ResponseWriter) error { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) + + return json.NewEncoder(w).Encode(response) +} + +type GetUsersUserIdTitles204Response struct { +} + +func (response GetUsersUserIdTitles204Response) VisitGetUsersUserIdTitlesResponse(w http.ResponseWriter) error { + w.WriteHeader(204) + return nil +} + +type GetUsersUserIdTitles400Response struct { +} + +func (response GetUsersUserIdTitles400Response) VisitGetUsersUserIdTitlesResponse(w http.ResponseWriter) error { + w.WriteHeader(400) + return nil +} + +type GetUsersUserIdTitles500Response struct { +} + +func (response GetUsersUserIdTitles500Response) VisitGetUsersUserIdTitlesResponse(w http.ResponseWriter) error { + w.WriteHeader(500) + return nil +} + // StrictServerInterface represents all server handlers. type StrictServerInterface interface { // Get titles - // (GET /title) - GetTitle(ctx context.Context, request GetTitleRequestObject) (GetTitleResponseObject, error) + // (GET /titles) + GetTitles(ctx context.Context, request GetTitlesRequestObject) (GetTitlesResponseObject, error) // Get title description - // (GET /title/{title_id}) - GetTitleTitleId(ctx context.Context, request GetTitleTitleIdRequestObject) (GetTitleTitleIdResponseObject, error) + // (GET /titles/{title_id}) + GetTitlesTitleId(ctx context.Context, request GetTitlesTitleIdRequestObject) (GetTitlesTitleIdResponseObject, error) // Get user info // (GET /users/{user_id}) GetUsersUserId(ctx context.Context, request GetUsersUserIdRequestObject) (GetUsersUserIdResponseObject, error) + // Get user titles + // (GET /users/{user_id}/titles/) + GetUsersUserIdTitles(ctx context.Context, request GetUsersUserIdTitlesRequestObject) (GetUsersUserIdTitlesResponseObject, error) } type StrictHandlerFunc = strictgin.StrictGinHandlerFunc @@ -738,17 +1027,17 @@ type strictHandler struct { middlewares []StrictMiddlewareFunc } -// GetTitle operation middleware -func (sh *strictHandler) GetTitle(ctx *gin.Context, params GetTitleParams) { - var request GetTitleRequestObject +// GetTitles operation middleware +func (sh *strictHandler) GetTitles(ctx *gin.Context, params GetTitlesParams) { + var request GetTitlesRequestObject request.Params = params handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.GetTitle(ctx, request.(GetTitleRequestObject)) + return sh.ssi.GetTitles(ctx, request.(GetTitlesRequestObject)) } for _, middleware := range sh.middlewares { - handler = middleware(handler, "GetTitle") + handler = middleware(handler, "GetTitles") } response, err := handler(ctx, request) @@ -756,8 +1045,8 @@ func (sh *strictHandler) GetTitle(ctx *gin.Context, params GetTitleParams) { if err != nil { ctx.Error(err) ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(GetTitleResponseObject); ok { - if err := validResponse.VisitGetTitleResponse(ctx.Writer); err != nil { + } else if validResponse, ok := response.(GetTitlesResponseObject); ok { + if err := validResponse.VisitGetTitlesResponse(ctx.Writer); err != nil { ctx.Error(err) } } else if response != nil { @@ -765,18 +1054,18 @@ func (sh *strictHandler) GetTitle(ctx *gin.Context, params GetTitleParams) { } } -// GetTitleTitleId operation middleware -func (sh *strictHandler) GetTitleTitleId(ctx *gin.Context, titleId int64, params GetTitleTitleIdParams) { - var request GetTitleTitleIdRequestObject +// GetTitlesTitleId operation middleware +func (sh *strictHandler) GetTitlesTitleId(ctx *gin.Context, titleId int64, params GetTitlesTitleIdParams) { + var request GetTitlesTitleIdRequestObject request.TitleId = titleId request.Params = params handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { - return sh.ssi.GetTitleTitleId(ctx, request.(GetTitleTitleIdRequestObject)) + return sh.ssi.GetTitlesTitleId(ctx, request.(GetTitlesTitleIdRequestObject)) } for _, middleware := range sh.middlewares { - handler = middleware(handler, "GetTitleTitleId") + handler = middleware(handler, "GetTitlesTitleId") } response, err := handler(ctx, request) @@ -784,8 +1073,8 @@ func (sh *strictHandler) GetTitleTitleId(ctx *gin.Context, titleId int64, params if err != nil { ctx.Error(err) ctx.Status(http.StatusInternalServerError) - } else if validResponse, ok := response.(GetTitleTitleIdResponseObject); ok { - if err := validResponse.VisitGetTitleTitleIdResponse(ctx.Writer); err != nil { + } else if validResponse, ok := response.(GetTitlesTitleIdResponseObject); ok { + if err := validResponse.VisitGetTitlesTitleIdResponse(ctx.Writer); err != nil { ctx.Error(err) } } else if response != nil { @@ -820,3 +1109,31 @@ func (sh *strictHandler) GetUsersUserId(ctx *gin.Context, userId string, params ctx.Error(fmt.Errorf("unexpected response type: %T", response)) } } + +// GetUsersUserIdTitles operation middleware +func (sh *strictHandler) GetUsersUserIdTitles(ctx *gin.Context, userId string, params GetUsersUserIdTitlesParams) { + var request GetUsersUserIdTitlesRequestObject + + request.UserId = userId + request.Params = params + + handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + return sh.ssi.GetUsersUserIdTitles(ctx, request.(GetUsersUserIdTitlesRequestObject)) + } + for _, middleware := range sh.middlewares { + handler = middleware(handler, "GetUsersUserIdTitles") + } + + response, err := handler(ctx, request) + + if err != nil { + ctx.Error(err) + ctx.Status(http.StatusInternalServerError) + } else if validResponse, ok := response.(GetUsersUserIdTitlesResponseObject); ok { + if err := validResponse.VisitGetUsersUserIdTitlesResponse(ctx.Writer); err != nil { + ctx.Error(err) + } + } else if response != nil { + ctx.Error(fmt.Errorf("unexpected response type: %T", response)) + } +} diff --git a/api/openapi.yaml b/api/openapi.yaml index 0bbedca..bc7fb15 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -7,7 +7,7 @@ servers: - url: /api/v1 paths: - /title: + /titles: get: summary: Get titles parameters: @@ -66,7 +66,7 @@ paths: '500': description: Unknown server error - /title/{title_id}: + /titles/{title_id}: get: summary: Get title description parameters: @@ -126,7 +126,7 @@ paths: # user_json: # $ref: '#/components/schemas/User' -# /title/{title_id}/reviews: +# /titles/{title_id}/reviews: # get: # summary: Get title reviews # parameters: @@ -278,45 +278,50 @@ paths: # user_json: # $ref: '#/components/schemas/User' -# /users/{user_id}/titles: -# get: -# summary: Get user titles -# parameters: -# - in: path -# name: user_id -# required: true -# schema: -# type: string -# - in: query -# name: query -# schema: -# type: string -# - in: query -# name: limit -# schema: -# type: integer -# default: 10 -# - in: query -# name: offset -# schema: -# type: integer -# default: 0 -# - in: query -# name: fields -# schema: -# type: string -# default: all -# responses: -# '200': -# description: List of user titles -# content: -# application/json: -# schema: -# type: array -# items: -# $ref: '#/components/schemas/UserTitle' -# '204': -# description: No titles found + /users/{user_id}/titles/: + get: + summary: Get user titles + parameters: + - $ref: '#/components/parameters/cursor' + - in: path + name: user_id + required: true + schema: + type: string + - in: query + name: query + schema: + type: string + - in: query + name: limit + schema: + type: integer + default: 10 + - in: query + name: offset + schema: + type: integer + default: 0 + - in: query + name: fields + schema: + type: string + default: all + responses: + '200': + description: List of user titles + content: + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/UserTitle' + '204': + description: No titles found + '400': + description: Request params are not correct + '500': + description: Unknown server error # post: # summary: Add user title @@ -571,6 +576,14 @@ paths: # type: string components: + parameters: + cursor: + in: query + name: cursor + required: false + schema: + type: string + schemas: Image: type: object @@ -769,7 +782,7 @@ components: type: integer format: int64 status: - $ref: '#components/schemas/UserTitleStatus' + $ref: '#/components/schemas/UserTitleStatus' rate: type: integer format: int32 diff --git a/modules/backend/handlers/titles.go b/modules/backend/handlers/titles.go index 45f0ef0..46ff982 100644 --- a/modules/backend/handlers/titles.go +++ b/modules/backend/handlers/titles.go @@ -25,11 +25,11 @@ func TitleStatus2Sqlc(s *oapi.TitleStatus) (*sqlc.TitleStatusT, error) { } var t sqlc.TitleStatusT switch *s { - case oapi.Finished: + case oapi.TitleStatusFinished: t = sqlc.TitleStatusTFinished - case oapi.Ongoing: + case oapi.TitleStatusOngoing: t = sqlc.TitleStatusTOngoing - case oapi.Planned: + case oapi.TitleStatusPlanned: t = sqlc.TitleStatusTPlanned default: return nil, fmt.Errorf("unexpected tittle status: %s", *s) @@ -195,40 +195,40 @@ func (s Server) mapTitle(ctx context.Context, title sqlc.Title) (oapi.Title, err return oapi_title, nil } -func (s Server) GetTitleTitleId(ctx context.Context, request oapi.GetTitleTitleIdRequestObject) (oapi.GetTitleTitleIdResponseObject, error) { +func (s Server) GetTitlesTitleId(ctx context.Context, request oapi.GetTitlesTitleIdRequestObject) (oapi.GetTitlesTitleIdResponseObject, error) { var oapi_title oapi.Title sqlc_title, err := s.db.GetTitleByID(ctx, request.TitleId) if err != nil { if err == pgx.ErrNoRows { - return oapi.GetTitleTitleId204Response{}, nil + return oapi.GetTitlesTitleId204Response{}, nil } log.Errorf("%v", err) - return oapi.GetTitleTitleId500Response{}, nil + return oapi.GetTitlesTitleId500Response{}, nil } oapi_title, err = s.mapTitle(ctx, sqlc_title) if err != nil { log.Errorf("%v", err) - return oapi.GetTitleTitleId500Response{}, nil + return oapi.GetTitlesTitleId500Response{}, nil } - return oapi.GetTitleTitleId200JSONResponse(oapi_title), nil + return oapi.GetTitlesTitleId200JSONResponse(oapi_title), nil } -func (s Server) GetTitle(ctx context.Context, request oapi.GetTitleRequestObject) (oapi.GetTitleResponseObject, error) { +func (s Server) GetTitles(ctx context.Context, request oapi.GetTitlesRequestObject) (oapi.GetTitlesResponseObject, error) { opai_titles := make([]oapi.Title, 0) word := Word2Sqlc(request.Params.Word) status, err := TitleStatus2Sqlc(request.Params.Status) if err != nil { log.Errorf("%v", err) - return oapi.GetTitle400Response{}, err + return oapi.GetTitles400Response{}, err } season, err := ReleaseSeason2sqlc(request.Params.ReleaseSeason) if err != nil { log.Errorf("%v", err) - return oapi.GetTitle400Response{}, err + return oapi.GetTitles400Response{}, err } // param = nil means it will not be used titles, err := s.db.SearchTitles(ctx, sqlc.SearchTitlesParams{ @@ -242,10 +242,10 @@ func (s Server) GetTitle(ctx context.Context, request oapi.GetTitleRequestObject }) if err != nil { log.Errorf("%v", err) - return oapi.GetTitle500Response{}, nil + return oapi.GetTitles500Response{}, nil } if len(titles) == 0 { - return oapi.GetTitle204Response{}, nil + return oapi.GetTitles204Response{}, nil } for _, title := range titles { @@ -253,10 +253,10 @@ func (s Server) GetTitle(ctx context.Context, request oapi.GetTitleRequestObject t, err := s.mapTitle(ctx, title) if err != nil { log.Errorf("%v", err) - return oapi.GetTitle500Response{}, nil + return oapi.GetTitles500Response{}, nil } opai_titles = append(opai_titles, t) } - return oapi.GetTitle200JSONResponse(opai_titles), nil + return oapi.GetTitles200JSONResponse(opai_titles), nil } diff --git a/modules/backend/handlers/users.go b/modules/backend/handlers/users.go index 9e59261..2179977 100644 --- a/modules/backend/handlers/users.go +++ b/modules/backend/handlers/users.go @@ -48,3 +48,10 @@ func (s Server) GetUsersUserId(ctx context.Context, req oapi.GetUsersUserIdReque } return oapi.GetUsersUserId200JSONResponse(mapUser(user)), nil } + +func (s Server) GetUsersUserIdTitles(ctx context.Context, request oapi.GetUsersUserIdTitlesRequestObject) (oapi.GetUsersUserIdTitlesResponseObject, error) { + + // oapi_user_titles := make([]oapi.UserTitle, 0) + + return nil, nil +} diff --git a/sql/migrations/000001_init.up.sql b/sql/migrations/000001_init.up.sql index 7b79300..49cca3d 100644 --- a/sql/migrations/000001_init.up.sql +++ b/sql/migrations/000001_init.up.sql @@ -86,7 +86,7 @@ CREATE TABLE usertitles ( title_id bigint NOT NULL REFERENCES titles (id), status usertitle_status_t NOT NULL, rate int CHECK (rate > 0 AND rate <= 10), - review_id bigint NOT NULL REFERENCES reviews (id), + review_id bigint REFERENCES reviews (id), ctime timestamptz -- // TODO: series status ); From 6836cfa057a7cea8fd7d2ec5b8dac202190d114c Mon Sep 17 00:00:00 2001 From: Iron_Felix <trubnikov.arseniy@mail.ru> Date: Tue, 18 Nov 2025 05:11:35 +0300 Subject: [PATCH 77/80] feat: stub for get user titles written --- api/openapi.yaml | 2 +- modules/backend/handlers/users.go | 30 ++++++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/api/openapi.yaml b/api/openapi.yaml index bc7fb15..a33fe89 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -233,7 +233,7 @@ paths: # error: # type: string - /users: + # /users: # get: # summary: Search user # parameters: diff --git a/modules/backend/handlers/users.go b/modules/backend/handlers/users.go index 2179977..0fa903f 100644 --- a/modules/backend/handlers/users.go +++ b/modules/backend/handlers/users.go @@ -4,6 +4,7 @@ import ( "context" oapi "nyanimedb/api" sqlc "nyanimedb/sql" + "time" "github.com/jackc/pgx/v5" "github.com/oapi-codegen/runtime/types" @@ -51,7 +52,32 @@ func (s Server) GetUsersUserId(ctx context.Context, req oapi.GetUsersUserIdReque func (s Server) GetUsersUserIdTitles(ctx context.Context, request oapi.GetUsersUserIdTitlesRequestObject) (oapi.GetUsersUserIdTitlesResponseObject, error) { - // oapi_user_titles := make([]oapi.UserTitle, 0) + var rate int32 = 9 + var review_id int64 = 3 + time := time.Date(2025, 1, 15, 10, 30, 0, 0, time.UTC) - return nil, nil + var userTitles = []oapi.UserTitle{ + { + UserId: 101, + TitleId: 2001, + Status: oapi.UserTitleStatusFinished, + Rate: &rate, + Ctime: &time, + }, + { + UserId: 102, + TitleId: 2002, + Status: oapi.UserTitleStatusInProgress, + ReviewId: &review_id, + Ctime: &time, + }, + { + UserId: 103, + TitleId: 2003, + Status: oapi.UserTitleStatusDropped, + Ctime: &time, + }, + } + + return oapi.GetUsersUserIdTitles200JSONResponse(userTitles), nil } From b976c35b8ead35dae8511f77a344559dc5b56418 Mon Sep 17 00:00:00 2001 From: nihonium <nihonium@nekoea.red> Date: Tue, 18 Nov 2025 05:15:38 +0300 Subject: [PATCH 78/80] feat: titles page --- modules/frontend/src/App.tsx | 4 +- modules/frontend/src/api/index.ts | 7 + modules/frontend/src/api/models/Image.ts | 10 + .../frontend/src/api/models/ReleaseSeason.ts | 13 + modules/frontend/src/api/models/Studio.ts | 12 + modules/frontend/src/api/models/Tag.ts | 5 +- modules/frontend/src/api/models/Tags.ts | 9 + .../frontend/src/api/models/TitleStatus.ts | 12 + modules/frontend/src/api/models/User.ts | 4 +- .../src/api/models/UserTitleStatus.ts | 13 + modules/frontend/src/api/models/cursor.ts | 5 + .../src/api/services/DefaultService.ts | 113 ++++++ modules/frontend/src/api_/core/ApiError.ts | 25 ++ .../src/api_/core/ApiRequestOptions.ts | 17 + modules/frontend/src/api_/core/ApiResult.ts | 11 + .../src/api_/core/CancelablePromise.ts | 131 +++++++ modules/frontend/src/api_/core/OpenAPI.ts | 32 ++ modules/frontend/src/api_/core/request.ts | 323 ++++++++++++++++++ modules/frontend/src/api_/index.ts | 23 ++ modules/frontend/src/api_/models/Image.ts | 10 + .../frontend/src/api_/models/ReleaseSeason.ts | 13 + modules/frontend/src/api_/models/Review.ts | 5 + modules/frontend/src/api_/models/Studio.ts | 12 + modules/frontend/src/api_/models/Tag.ts | 8 + modules/frontend/src/api_/models/Tags.ts | 9 + modules/frontend/src/api_/models/Title.ts | 5 + .../frontend/src/api_/models/TitleStatus.ts | 12 + modules/frontend/src/api_/models/User.ts | 35 ++ modules/frontend/src/api_/models/UserTitle.ts | 5 + .../src/api_/models/UserTitleStatus.ts | 13 + modules/frontend/src/api_/models/cursor.ts | 5 + .../src/api_/services/DefaultService.ts | 148 ++++++++ .../src/components/ListView/ListView.tsx | 52 +++ .../src/components/ListView/useListView.tsx | 37 ++ .../components/UserPage/UserPage.module.css | 97 ------ .../components/cards/TitleCardHorizontal.tsx | 22 ++ .../src/components/cards/TitleCardSquare.tsx | 22 ++ .../src/pages/TitlePage/TitlePage.module.css | 0 .../src/pages/TitlePage/TitlePage.tsx | 64 ++++ .../pages/TitlesPage/TitlesPage.module.css | 59 ++++ .../src/pages/TitlesPage/TitlesPage.tsx | 114 +++++++ .../src/pages/UserPage/UserPage.module.css | 103 ++++++ .../UserPage/UserPage.tsx | 15 +- modules/frontend/src/types/list.ts | 12 + 44 files changed, 1539 insertions(+), 107 deletions(-) create mode 100644 modules/frontend/src/api/models/Image.ts create mode 100644 modules/frontend/src/api/models/ReleaseSeason.ts create mode 100644 modules/frontend/src/api/models/Studio.ts create mode 100644 modules/frontend/src/api/models/Tags.ts create mode 100644 modules/frontend/src/api/models/TitleStatus.ts create mode 100644 modules/frontend/src/api/models/UserTitleStatus.ts create mode 100644 modules/frontend/src/api/models/cursor.ts create mode 100644 modules/frontend/src/api_/core/ApiError.ts create mode 100644 modules/frontend/src/api_/core/ApiRequestOptions.ts create mode 100644 modules/frontend/src/api_/core/ApiResult.ts create mode 100644 modules/frontend/src/api_/core/CancelablePromise.ts create mode 100644 modules/frontend/src/api_/core/OpenAPI.ts create mode 100644 modules/frontend/src/api_/core/request.ts create mode 100644 modules/frontend/src/api_/index.ts create mode 100644 modules/frontend/src/api_/models/Image.ts create mode 100644 modules/frontend/src/api_/models/ReleaseSeason.ts create mode 100644 modules/frontend/src/api_/models/Review.ts create mode 100644 modules/frontend/src/api_/models/Studio.ts create mode 100644 modules/frontend/src/api_/models/Tag.ts create mode 100644 modules/frontend/src/api_/models/Tags.ts create mode 100644 modules/frontend/src/api_/models/Title.ts create mode 100644 modules/frontend/src/api_/models/TitleStatus.ts create mode 100644 modules/frontend/src/api_/models/User.ts create mode 100644 modules/frontend/src/api_/models/UserTitle.ts create mode 100644 modules/frontend/src/api_/models/UserTitleStatus.ts create mode 100644 modules/frontend/src/api_/models/cursor.ts create mode 100644 modules/frontend/src/api_/services/DefaultService.ts create mode 100644 modules/frontend/src/components/ListView/ListView.tsx create mode 100644 modules/frontend/src/components/ListView/useListView.tsx delete mode 100644 modules/frontend/src/components/UserPage/UserPage.module.css create mode 100644 modules/frontend/src/components/cards/TitleCardHorizontal.tsx create mode 100644 modules/frontend/src/components/cards/TitleCardSquare.tsx create mode 100644 modules/frontend/src/pages/TitlePage/TitlePage.module.css create mode 100644 modules/frontend/src/pages/TitlePage/TitlePage.tsx create mode 100644 modules/frontend/src/pages/TitlesPage/TitlesPage.module.css create mode 100644 modules/frontend/src/pages/TitlesPage/TitlesPage.tsx create mode 100644 modules/frontend/src/pages/UserPage/UserPage.module.css rename modules/frontend/src/{components => pages}/UserPage/UserPage.tsx (88%) create mode 100644 modules/frontend/src/types/list.ts diff --git a/modules/frontend/src/App.tsx b/modules/frontend/src/App.tsx index a88ad57..1256086 100644 --- a/modules/frontend/src/App.tsx +++ b/modules/frontend/src/App.tsx @@ -1,12 +1,14 @@ import React from "react"; import { BrowserRouter as Router, Routes, Route } from "react-router-dom"; -import UserPage from "./components/UserPage/UserPage"; +import UserPage from "./pages/UserPage/UserPage"; +import TitlesPage from "./pages/UserPage/UserPage"; const App: React.FC = () => { return ( <Router> <Routes> <Route path="/users/:id" element={<UserPage />} /> + <Route path="/titles" element={<TitlesPage />} /> </Routes> </Router> ); diff --git a/modules/frontend/src/api/index.ts b/modules/frontend/src/api/index.ts index e4f4ef4..f0d09ee 100644 --- a/modules/frontend/src/api/index.ts +++ b/modules/frontend/src/api/index.ts @@ -7,10 +7,17 @@ export { CancelablePromise, CancelError } from './core/CancelablePromise'; export { OpenAPI } from './core/OpenAPI'; export type { OpenAPIConfig } from './core/OpenAPI'; +export type { cursor } from './models/cursor'; +export type { Image } from './models/Image'; +export { ReleaseSeason } from './models/ReleaseSeason'; export type { Review } from './models/Review'; +export type { Studio } from './models/Studio'; export type { Tag } from './models/Tag'; +export type { Tags } from './models/Tags'; export type { Title } from './models/Title'; +export { TitleStatus } from './models/TitleStatus'; export type { User } from './models/User'; export type { UserTitle } from './models/UserTitle'; +export { UserTitleStatus } from './models/UserTitleStatus'; export { DefaultService } from './services/DefaultService'; diff --git a/modules/frontend/src/api/models/Image.ts b/modules/frontend/src/api/models/Image.ts new file mode 100644 index 0000000..1317db7 --- /dev/null +++ b/modules/frontend/src/api/models/Image.ts @@ -0,0 +1,10 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +export type Image = { + id?: number; + storage_type?: string; + image_path?: string; +}; + diff --git a/modules/frontend/src/api/models/ReleaseSeason.ts b/modules/frontend/src/api/models/ReleaseSeason.ts new file mode 100644 index 0000000..182b980 --- /dev/null +++ b/modules/frontend/src/api/models/ReleaseSeason.ts @@ -0,0 +1,13 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +/** + * Title release season + */ +export enum ReleaseSeason { + WINTER = 'winter', + SPRING = 'spring', + SUMMER = 'summer', + FALL = 'fall', +} diff --git a/modules/frontend/src/api/models/Studio.ts b/modules/frontend/src/api/models/Studio.ts new file mode 100644 index 0000000..062695a --- /dev/null +++ b/modules/frontend/src/api/models/Studio.ts @@ -0,0 +1,12 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +import type { Image } from './Image'; +export type Studio = { + id: number; + name: string; + poster?: Image; + description?: string; +}; + diff --git a/modules/frontend/src/api/models/Tag.ts b/modules/frontend/src/api/models/Tag.ts index 9560ea8..665c724 100644 --- a/modules/frontend/src/api/models/Tag.ts +++ b/modules/frontend/src/api/models/Tag.ts @@ -2,4 +2,7 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ -export type Tag = Record<string, any>; +/** + * A localized tag: keys are language codes (ISO 639-1), values are tag names + */ +export type Tag = Record<string, string>; diff --git a/modules/frontend/src/api/models/Tags.ts b/modules/frontend/src/api/models/Tags.ts new file mode 100644 index 0000000..748f066 --- /dev/null +++ b/modules/frontend/src/api/models/Tags.ts @@ -0,0 +1,9 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +import type { Tag } from './Tag'; +/** + * Array of localized tags + */ +export type Tags = Array<Tag>; diff --git a/modules/frontend/src/api/models/TitleStatus.ts b/modules/frontend/src/api/models/TitleStatus.ts new file mode 100644 index 0000000..811ece8 --- /dev/null +++ b/modules/frontend/src/api/models/TitleStatus.ts @@ -0,0 +1,12 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +/** + * Title status + */ +export enum TitleStatus { + FINISHED = 'finished', + ONGOING = 'ongoing', + PLANNED = 'planned', +} diff --git a/modules/frontend/src/api/models/User.ts b/modules/frontend/src/api/models/User.ts index b03d22f..541028e 100644 --- a/modules/frontend/src/api/models/User.ts +++ b/modules/frontend/src/api/models/User.ts @@ -6,7 +6,7 @@ export type User = { /** * Unique user ID (primary key) */ - id?: number; + id: number; /** * ID of the user avatar (references images table) */ @@ -30,6 +30,6 @@ export type User = { /** * Timestamp when the user was created */ - creation_date: string; + creation_date?: string; }; diff --git a/modules/frontend/src/api/models/UserTitleStatus.ts b/modules/frontend/src/api/models/UserTitleStatus.ts new file mode 100644 index 0000000..20651fe --- /dev/null +++ b/modules/frontend/src/api/models/UserTitleStatus.ts @@ -0,0 +1,13 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +/** + * User's title status + */ +export enum UserTitleStatus { + FINISHED = 'finished', + PLANNED = 'planned', + DROPPED = 'dropped', + IN_PROGRESS = 'in-progress', +} diff --git a/modules/frontend/src/api/models/cursor.ts b/modules/frontend/src/api/models/cursor.ts new file mode 100644 index 0000000..5788e14 --- /dev/null +++ b/modules/frontend/src/api/models/cursor.ts @@ -0,0 +1,5 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +export type cursor = string; diff --git a/modules/frontend/src/api/services/DefaultService.ts b/modules/frontend/src/api/services/DefaultService.ts index 7ebd129..b0ae54d 100644 --- a/modules/frontend/src/api/services/DefaultService.ts +++ b/modules/frontend/src/api/services/DefaultService.ts @@ -2,11 +2,84 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ +import type { ReleaseSeason } from '../models/ReleaseSeason'; +import type { Title } from '../models/Title'; +import type { TitleStatus } from '../models/TitleStatus'; import type { User } from '../models/User'; +import type { UserTitle } from '../models/UserTitle'; import type { CancelablePromise } from '../core/CancelablePromise'; import { OpenAPI } from '../core/OpenAPI'; import { request as __request } from '../core/request'; export class DefaultService { + /** + * Get titles + * @param word + * @param status + * @param rating + * @param releaseYear + * @param releaseSeason + * @param limit + * @param offset + * @param fields + * @returns Title List of titles + * @throws ApiError + */ + public static getTitles( + word?: string, + status?: TitleStatus, + rating?: number, + releaseYear?: number, + releaseSeason?: ReleaseSeason, + limit: number = 10, + offset?: number, + fields: string = 'all', + ): CancelablePromise<Array<Title>> { + return __request(OpenAPI, { + method: 'GET', + url: '/titles', + query: { + 'word': word, + 'status': status, + 'rating': rating, + 'release_year': releaseYear, + 'release_season': releaseSeason, + 'limit': limit, + 'offset': offset, + 'fields': fields, + }, + errors: { + 400: `Request params are not correct`, + 500: `Unknown server error`, + }, + }); + } + /** + * Get title description + * @param titleId + * @param fields + * @returns Title Title description + * @throws ApiError + */ + public static getTitles1( + titleId: number, + fields: string = 'all', + ): CancelablePromise<Title> { + return __request(OpenAPI, { + method: 'GET', + url: '/titles/{title_id}', + path: { + 'title_id': titleId, + }, + query: { + 'fields': fields, + }, + errors: { + 400: `Request params are not correct`, + 404: `Title not found`, + 500: `Unknown server error`, + }, + }); + } /** * Get user info * @param userId @@ -28,7 +101,47 @@ export class DefaultService { 'fields': fields, }, errors: { + 400: `Request params are not correct`, 404: `User not found`, + 500: `Unknown server error`, + }, + }); + } + /** + * Get user titles + * @param userId + * @param cursor + * @param query + * @param limit + * @param offset + * @param fields + * @returns UserTitle List of user titles + * @throws ApiError + */ + public static getUsersTitles( + userId: string, + cursor?: string, + query?: string, + limit: number = 10, + offset?: number, + fields: string = 'all', + ): CancelablePromise<Array<UserTitle>> { + return __request(OpenAPI, { + method: 'GET', + url: '/users/{user_id}/titles', + path: { + 'user_id': userId, + }, + query: { + 'cursor': cursor, + 'query': query, + 'limit': limit, + 'offset': offset, + 'fields': fields, + }, + errors: { + 400: `Request params are not correct`, + 500: `Unknown server error`, }, }); } diff --git a/modules/frontend/src/api_/core/ApiError.ts b/modules/frontend/src/api_/core/ApiError.ts new file mode 100644 index 0000000..ec7b16a --- /dev/null +++ b/modules/frontend/src/api_/core/ApiError.ts @@ -0,0 +1,25 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +import type { ApiRequestOptions } from './ApiRequestOptions'; +import type { ApiResult } from './ApiResult'; + +export class ApiError extends Error { + public readonly url: string; + public readonly status: number; + public readonly statusText: string; + public readonly body: any; + public readonly request: ApiRequestOptions; + + constructor(request: ApiRequestOptions, response: ApiResult, message: string) { + super(message); + + this.name = 'ApiError'; + this.url = response.url; + this.status = response.status; + this.statusText = response.statusText; + this.body = response.body; + this.request = request; + } +} diff --git a/modules/frontend/src/api_/core/ApiRequestOptions.ts b/modules/frontend/src/api_/core/ApiRequestOptions.ts new file mode 100644 index 0000000..93143c3 --- /dev/null +++ b/modules/frontend/src/api_/core/ApiRequestOptions.ts @@ -0,0 +1,17 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +export type ApiRequestOptions = { + readonly method: 'GET' | 'PUT' | 'POST' | 'DELETE' | 'OPTIONS' | 'HEAD' | 'PATCH'; + readonly url: string; + readonly path?: Record<string, any>; + readonly cookies?: Record<string, any>; + readonly headers?: Record<string, any>; + readonly query?: Record<string, any>; + readonly formData?: Record<string, any>; + readonly body?: any; + readonly mediaType?: string; + readonly responseHeader?: string; + readonly errors?: Record<number, string>; +}; diff --git a/modules/frontend/src/api_/core/ApiResult.ts b/modules/frontend/src/api_/core/ApiResult.ts new file mode 100644 index 0000000..ee1126e --- /dev/null +++ b/modules/frontend/src/api_/core/ApiResult.ts @@ -0,0 +1,11 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +export type ApiResult = { + readonly url: string; + readonly ok: boolean; + readonly status: number; + readonly statusText: string; + readonly body: any; +}; diff --git a/modules/frontend/src/api_/core/CancelablePromise.ts b/modules/frontend/src/api_/core/CancelablePromise.ts new file mode 100644 index 0000000..d70de92 --- /dev/null +++ b/modules/frontend/src/api_/core/CancelablePromise.ts @@ -0,0 +1,131 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +export class CancelError extends Error { + + constructor(message: string) { + super(message); + this.name = 'CancelError'; + } + + public get isCancelled(): boolean { + return true; + } +} + +export interface OnCancel { + readonly isResolved: boolean; + readonly isRejected: boolean; + readonly isCancelled: boolean; + + (cancelHandler: () => void): void; +} + +export class CancelablePromise<T> implements Promise<T> { + #isResolved: boolean; + #isRejected: boolean; + #isCancelled: boolean; + readonly #cancelHandlers: (() => void)[]; + readonly #promise: Promise<T>; + #resolve?: (value: T | PromiseLike<T>) => void; + #reject?: (reason?: any) => void; + + constructor( + executor: ( + resolve: (value: T | PromiseLike<T>) => void, + reject: (reason?: any) => void, + onCancel: OnCancel + ) => void + ) { + this.#isResolved = false; + this.#isRejected = false; + this.#isCancelled = false; + this.#cancelHandlers = []; + this.#promise = new Promise<T>((resolve, reject) => { + this.#resolve = resolve; + this.#reject = reject; + + const onResolve = (value: T | PromiseLike<T>): void => { + if (this.#isResolved || this.#isRejected || this.#isCancelled) { + return; + } + this.#isResolved = true; + if (this.#resolve) this.#resolve(value); + }; + + const onReject = (reason?: any): void => { + if (this.#isResolved || this.#isRejected || this.#isCancelled) { + return; + } + this.#isRejected = true; + if (this.#reject) this.#reject(reason); + }; + + const onCancel = (cancelHandler: () => void): void => { + if (this.#isResolved || this.#isRejected || this.#isCancelled) { + return; + } + this.#cancelHandlers.push(cancelHandler); + }; + + Object.defineProperty(onCancel, 'isResolved', { + get: (): boolean => this.#isResolved, + }); + + Object.defineProperty(onCancel, 'isRejected', { + get: (): boolean => this.#isRejected, + }); + + Object.defineProperty(onCancel, 'isCancelled', { + get: (): boolean => this.#isCancelled, + }); + + return executor(onResolve, onReject, onCancel as OnCancel); + }); + } + + get [Symbol.toStringTag]() { + return "Cancellable Promise"; + } + + public then<TResult1 = T, TResult2 = never>( + onFulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | null, + onRejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null + ): Promise<TResult1 | TResult2> { + return this.#promise.then(onFulfilled, onRejected); + } + + public catch<TResult = never>( + onRejected?: ((reason: any) => TResult | PromiseLike<TResult>) | null + ): Promise<T | TResult> { + return this.#promise.catch(onRejected); + } + + public finally(onFinally?: (() => void) | null): Promise<T> { + return this.#promise.finally(onFinally); + } + + public cancel(): void { + if (this.#isResolved || this.#isRejected || this.#isCancelled) { + return; + } + this.#isCancelled = true; + if (this.#cancelHandlers.length) { + try { + for (const cancelHandler of this.#cancelHandlers) { + cancelHandler(); + } + } catch (error) { + console.warn('Cancellation threw an error', error); + return; + } + } + this.#cancelHandlers.length = 0; + if (this.#reject) this.#reject(new CancelError('Request aborted')); + } + + public get isCancelled(): boolean { + return this.#isCancelled; + } +} diff --git a/modules/frontend/src/api_/core/OpenAPI.ts b/modules/frontend/src/api_/core/OpenAPI.ts new file mode 100644 index 0000000..185e5c3 --- /dev/null +++ b/modules/frontend/src/api_/core/OpenAPI.ts @@ -0,0 +1,32 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +import type { ApiRequestOptions } from './ApiRequestOptions'; + +type Resolver<T> = (options: ApiRequestOptions) => Promise<T>; +type Headers = Record<string, string>; + +export type OpenAPIConfig = { + BASE: string; + VERSION: string; + WITH_CREDENTIALS: boolean; + CREDENTIALS: 'include' | 'omit' | 'same-origin'; + TOKEN?: string | Resolver<string> | undefined; + USERNAME?: string | Resolver<string> | undefined; + PASSWORD?: string | Resolver<string> | undefined; + HEADERS?: Headers | Resolver<Headers> | undefined; + ENCODE_PATH?: ((path: string) => string) | undefined; +}; + +export const OpenAPI: OpenAPIConfig = { + BASE: '/api/v1', + VERSION: '1.0.0', + WITH_CREDENTIALS: false, + CREDENTIALS: 'include', + TOKEN: undefined, + USERNAME: undefined, + PASSWORD: undefined, + HEADERS: undefined, + ENCODE_PATH: undefined, +}; diff --git a/modules/frontend/src/api_/core/request.ts b/modules/frontend/src/api_/core/request.ts new file mode 100644 index 0000000..1dc6fef --- /dev/null +++ b/modules/frontend/src/api_/core/request.ts @@ -0,0 +1,323 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +import axios from 'axios'; +import type { AxiosError, AxiosRequestConfig, AxiosResponse, AxiosInstance } from 'axios'; +import FormData from 'form-data'; + +import { ApiError } from './ApiError'; +import type { ApiRequestOptions } from './ApiRequestOptions'; +import type { ApiResult } from './ApiResult'; +import { CancelablePromise } from './CancelablePromise'; +import type { OnCancel } from './CancelablePromise'; +import type { OpenAPIConfig } from './OpenAPI'; + +export const isDefined = <T>(value: T | null | undefined): value is Exclude<T, null | undefined> => { + return value !== undefined && value !== null; +}; + +export const isString = (value: any): value is string => { + return typeof value === 'string'; +}; + +export const isStringWithValue = (value: any): value is string => { + return isString(value) && value !== ''; +}; + +export const isBlob = (value: any): value is Blob => { + return ( + typeof value === 'object' && + typeof value.type === 'string' && + typeof value.stream === 'function' && + typeof value.arrayBuffer === 'function' && + typeof value.constructor === 'function' && + typeof value.constructor.name === 'string' && + /^(Blob|File)$/.test(value.constructor.name) && + /^(Blob|File)$/.test(value[Symbol.toStringTag]) + ); +}; + +export const isFormData = (value: any): value is FormData => { + return value instanceof FormData; +}; + +export const isSuccess = (status: number): boolean => { + return status >= 200 && status < 300; +}; + +export const base64 = (str: string): string => { + try { + return btoa(str); + } catch (err) { + // @ts-ignore + return Buffer.from(str).toString('base64'); + } +}; + +export const getQueryString = (params: Record<string, any>): string => { + const qs: string[] = []; + + const append = (key: string, value: any) => { + qs.push(`${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`); + }; + + const process = (key: string, value: any) => { + if (isDefined(value)) { + if (Array.isArray(value)) { + value.forEach(v => { + process(key, v); + }); + } else if (typeof value === 'object') { + Object.entries(value).forEach(([k, v]) => { + process(`${key}[${k}]`, v); + }); + } else { + append(key, value); + } + } + }; + + Object.entries(params).forEach(([key, value]) => { + process(key, value); + }); + + if (qs.length > 0) { + return `?${qs.join('&')}`; + } + + return ''; +}; + +const getUrl = (config: OpenAPIConfig, options: ApiRequestOptions): string => { + const encoder = config.ENCODE_PATH || encodeURI; + + const path = options.url + .replace('{api-version}', config.VERSION) + .replace(/{(.*?)}/g, (substring: string, group: string) => { + if (options.path?.hasOwnProperty(group)) { + return encoder(String(options.path[group])); + } + return substring; + }); + + const url = `${config.BASE}${path}`; + if (options.query) { + return `${url}${getQueryString(options.query)}`; + } + return url; +}; + +export const getFormData = (options: ApiRequestOptions): FormData | undefined => { + if (options.formData) { + const formData = new FormData(); + + const process = (key: string, value: any) => { + if (isString(value) || isBlob(value)) { + formData.append(key, value); + } else { + formData.append(key, JSON.stringify(value)); + } + }; + + Object.entries(options.formData) + .filter(([_, value]) => isDefined(value)) + .forEach(([key, value]) => { + if (Array.isArray(value)) { + value.forEach(v => process(key, v)); + } else { + process(key, value); + } + }); + + return formData; + } + return undefined; +}; + +type Resolver<T> = (options: ApiRequestOptions) => Promise<T>; + +export const resolve = async <T>(options: ApiRequestOptions, resolver?: T | Resolver<T>): Promise<T | undefined> => { + if (typeof resolver === 'function') { + return (resolver as Resolver<T>)(options); + } + return resolver; +}; + +export const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions, formData?: FormData): Promise<Record<string, string>> => { + const [token, username, password, additionalHeaders] = await Promise.all([ + resolve(options, config.TOKEN), + resolve(options, config.USERNAME), + resolve(options, config.PASSWORD), + resolve(options, config.HEADERS), + ]); + + const formHeaders = typeof formData?.getHeaders === 'function' && formData?.getHeaders() || {} + + const headers = Object.entries({ + Accept: 'application/json', + ...additionalHeaders, + ...options.headers, + ...formHeaders, + }) + .filter(([_, value]) => isDefined(value)) + .reduce((headers, [key, value]) => ({ + ...headers, + [key]: String(value), + }), {} as Record<string, string>); + + if (isStringWithValue(token)) { + headers['Authorization'] = `Bearer ${token}`; + } + + if (isStringWithValue(username) && isStringWithValue(password)) { + const credentials = base64(`${username}:${password}`); + headers['Authorization'] = `Basic ${credentials}`; + } + + if (options.body !== undefined) { + if (options.mediaType) { + headers['Content-Type'] = options.mediaType; + } else if (isBlob(options.body)) { + headers['Content-Type'] = options.body.type || 'application/octet-stream'; + } else if (isString(options.body)) { + headers['Content-Type'] = 'text/plain'; + } else if (!isFormData(options.body)) { + headers['Content-Type'] = 'application/json'; + } + } + + return headers; +}; + +export const getRequestBody = (options: ApiRequestOptions): any => { + if (options.body) { + return options.body; + } + return undefined; +}; + +export const sendRequest = async <T>( + config: OpenAPIConfig, + options: ApiRequestOptions, + url: string, + body: any, + formData: FormData | undefined, + headers: Record<string, string>, + onCancel: OnCancel, + axiosClient: AxiosInstance +): Promise<AxiosResponse<T>> => { + const source = axios.CancelToken.source(); + + const requestConfig: AxiosRequestConfig = { + url, + headers, + data: body ?? formData, + method: options.method, + withCredentials: config.WITH_CREDENTIALS, + withXSRFToken: config.CREDENTIALS === 'include' ? config.WITH_CREDENTIALS : false, + cancelToken: source.token, + }; + + onCancel(() => source.cancel('The user aborted a request.')); + + try { + return await axiosClient.request(requestConfig); + } catch (error) { + const axiosError = error as AxiosError<T>; + if (axiosError.response) { + return axiosError.response; + } + throw error; + } +}; + +export const getResponseHeader = (response: AxiosResponse<any>, responseHeader?: string): string | undefined => { + if (responseHeader) { + const content = response.headers[responseHeader]; + if (isString(content)) { + return content; + } + } + return undefined; +}; + +export const getResponseBody = (response: AxiosResponse<any>): any => { + if (response.status !== 204) { + return response.data; + } + return undefined; +}; + +export const catchErrorCodes = (options: ApiRequestOptions, result: ApiResult): void => { + const errors: Record<number, string> = { + 400: 'Bad Request', + 401: 'Unauthorized', + 403: 'Forbidden', + 404: 'Not Found', + 500: 'Internal Server Error', + 502: 'Bad Gateway', + 503: 'Service Unavailable', + ...options.errors, + } + + const error = errors[result.status]; + if (error) { + throw new ApiError(options, result, error); + } + + if (!result.ok) { + const errorStatus = result.status ?? 'unknown'; + const errorStatusText = result.statusText ?? 'unknown'; + const errorBody = (() => { + try { + return JSON.stringify(result.body, null, 2); + } catch (e) { + return undefined; + } + })(); + + throw new ApiError(options, result, + `Generic Error: status: ${errorStatus}; status text: ${errorStatusText}; body: ${errorBody}` + ); + } +}; + +/** + * Request method + * @param config The OpenAPI configuration object + * @param options The request options from the service + * @param axiosClient The axios client instance to use + * @returns CancelablePromise<T> + * @throws ApiError + */ +export const request = <T>(config: OpenAPIConfig, options: ApiRequestOptions, axiosClient: AxiosInstance = axios): CancelablePromise<T> => { + return new CancelablePromise(async (resolve, reject, onCancel) => { + try { + const url = getUrl(config, options); + const formData = getFormData(options); + const body = getRequestBody(options); + const headers = await getHeaders(config, options, formData); + + if (!onCancel.isCancelled) { + const response = await sendRequest<T>(config, options, url, body, formData, headers, onCancel, axiosClient); + const responseBody = getResponseBody(response); + const responseHeader = getResponseHeader(response, options.responseHeader); + + const result: ApiResult = { + url, + ok: isSuccess(response.status), + status: response.status, + statusText: response.statusText, + body: responseHeader ?? responseBody, + }; + + catchErrorCodes(options, result); + + resolve(result.body); + } + } catch (error) { + reject(error); + } + }); +}; diff --git a/modules/frontend/src/api_/index.ts b/modules/frontend/src/api_/index.ts new file mode 100644 index 0000000..f0d09ee --- /dev/null +++ b/modules/frontend/src/api_/index.ts @@ -0,0 +1,23 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +export { ApiError } from './core/ApiError'; +export { CancelablePromise, CancelError } from './core/CancelablePromise'; +export { OpenAPI } from './core/OpenAPI'; +export type { OpenAPIConfig } from './core/OpenAPI'; + +export type { cursor } from './models/cursor'; +export type { Image } from './models/Image'; +export { ReleaseSeason } from './models/ReleaseSeason'; +export type { Review } from './models/Review'; +export type { Studio } from './models/Studio'; +export type { Tag } from './models/Tag'; +export type { Tags } from './models/Tags'; +export type { Title } from './models/Title'; +export { TitleStatus } from './models/TitleStatus'; +export type { User } from './models/User'; +export type { UserTitle } from './models/UserTitle'; +export { UserTitleStatus } from './models/UserTitleStatus'; + +export { DefaultService } from './services/DefaultService'; diff --git a/modules/frontend/src/api_/models/Image.ts b/modules/frontend/src/api_/models/Image.ts new file mode 100644 index 0000000..1317db7 --- /dev/null +++ b/modules/frontend/src/api_/models/Image.ts @@ -0,0 +1,10 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +export type Image = { + id?: number; + storage_type?: string; + image_path?: string; +}; + diff --git a/modules/frontend/src/api_/models/ReleaseSeason.ts b/modules/frontend/src/api_/models/ReleaseSeason.ts new file mode 100644 index 0000000..182b980 --- /dev/null +++ b/modules/frontend/src/api_/models/ReleaseSeason.ts @@ -0,0 +1,13 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +/** + * Title release season + */ +export enum ReleaseSeason { + WINTER = 'winter', + SPRING = 'spring', + SUMMER = 'summer', + FALL = 'fall', +} diff --git a/modules/frontend/src/api_/models/Review.ts b/modules/frontend/src/api_/models/Review.ts new file mode 100644 index 0000000..9b453b7 --- /dev/null +++ b/modules/frontend/src/api_/models/Review.ts @@ -0,0 +1,5 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +export type Review = Record<string, any>; diff --git a/modules/frontend/src/api_/models/Studio.ts b/modules/frontend/src/api_/models/Studio.ts new file mode 100644 index 0000000..062695a --- /dev/null +++ b/modules/frontend/src/api_/models/Studio.ts @@ -0,0 +1,12 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +import type { Image } from './Image'; +export type Studio = { + id: number; + name: string; + poster?: Image; + description?: string; +}; + diff --git a/modules/frontend/src/api_/models/Tag.ts b/modules/frontend/src/api_/models/Tag.ts new file mode 100644 index 0000000..665c724 --- /dev/null +++ b/modules/frontend/src/api_/models/Tag.ts @@ -0,0 +1,8 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +/** + * A localized tag: keys are language codes (ISO 639-1), values are tag names + */ +export type Tag = Record<string, string>; diff --git a/modules/frontend/src/api_/models/Tags.ts b/modules/frontend/src/api_/models/Tags.ts new file mode 100644 index 0000000..748f066 --- /dev/null +++ b/modules/frontend/src/api_/models/Tags.ts @@ -0,0 +1,9 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +import type { Tag } from './Tag'; +/** + * Array of localized tags + */ +export type Tags = Array<Tag>; diff --git a/modules/frontend/src/api_/models/Title.ts b/modules/frontend/src/api_/models/Title.ts new file mode 100644 index 0000000..4da7aa3 --- /dev/null +++ b/modules/frontend/src/api_/models/Title.ts @@ -0,0 +1,5 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +export type Title = Record<string, any>; diff --git a/modules/frontend/src/api_/models/TitleStatus.ts b/modules/frontend/src/api_/models/TitleStatus.ts new file mode 100644 index 0000000..811ece8 --- /dev/null +++ b/modules/frontend/src/api_/models/TitleStatus.ts @@ -0,0 +1,12 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +/** + * Title status + */ +export enum TitleStatus { + FINISHED = 'finished', + ONGOING = 'ongoing', + PLANNED = 'planned', +} diff --git a/modules/frontend/src/api_/models/User.ts b/modules/frontend/src/api_/models/User.ts new file mode 100644 index 0000000..541028e --- /dev/null +++ b/modules/frontend/src/api_/models/User.ts @@ -0,0 +1,35 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +export type User = { + /** + * Unique user ID (primary key) + */ + id: number; + /** + * ID of the user avatar (references images table) + */ + avatar_id?: number | null; + /** + * User email + */ + mail?: string; + /** + * Username (alphanumeric + _ or -) + */ + nickname: string; + /** + * Display name + */ + disp_name?: string; + /** + * User description + */ + user_desc?: string; + /** + * Timestamp when the user was created + */ + creation_date?: string; +}; + diff --git a/modules/frontend/src/api_/models/UserTitle.ts b/modules/frontend/src/api_/models/UserTitle.ts new file mode 100644 index 0000000..26d5ddc --- /dev/null +++ b/modules/frontend/src/api_/models/UserTitle.ts @@ -0,0 +1,5 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +export type UserTitle = Record<string, any>; diff --git a/modules/frontend/src/api_/models/UserTitleStatus.ts b/modules/frontend/src/api_/models/UserTitleStatus.ts new file mode 100644 index 0000000..20651fe --- /dev/null +++ b/modules/frontend/src/api_/models/UserTitleStatus.ts @@ -0,0 +1,13 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +/** + * User's title status + */ +export enum UserTitleStatus { + FINISHED = 'finished', + PLANNED = 'planned', + DROPPED = 'dropped', + IN_PROGRESS = 'in-progress', +} diff --git a/modules/frontend/src/api_/models/cursor.ts b/modules/frontend/src/api_/models/cursor.ts new file mode 100644 index 0000000..5788e14 --- /dev/null +++ b/modules/frontend/src/api_/models/cursor.ts @@ -0,0 +1,5 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +export type cursor = string; diff --git a/modules/frontend/src/api_/services/DefaultService.ts b/modules/frontend/src/api_/services/DefaultService.ts new file mode 100644 index 0000000..b0ae54d --- /dev/null +++ b/modules/frontend/src/api_/services/DefaultService.ts @@ -0,0 +1,148 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +import type { ReleaseSeason } from '../models/ReleaseSeason'; +import type { Title } from '../models/Title'; +import type { TitleStatus } from '../models/TitleStatus'; +import type { User } from '../models/User'; +import type { UserTitle } from '../models/UserTitle'; +import type { CancelablePromise } from '../core/CancelablePromise'; +import { OpenAPI } from '../core/OpenAPI'; +import { request as __request } from '../core/request'; +export class DefaultService { + /** + * Get titles + * @param word + * @param status + * @param rating + * @param releaseYear + * @param releaseSeason + * @param limit + * @param offset + * @param fields + * @returns Title List of titles + * @throws ApiError + */ + public static getTitles( + word?: string, + status?: TitleStatus, + rating?: number, + releaseYear?: number, + releaseSeason?: ReleaseSeason, + limit: number = 10, + offset?: number, + fields: string = 'all', + ): CancelablePromise<Array<Title>> { + return __request(OpenAPI, { + method: 'GET', + url: '/titles', + query: { + 'word': word, + 'status': status, + 'rating': rating, + 'release_year': releaseYear, + 'release_season': releaseSeason, + 'limit': limit, + 'offset': offset, + 'fields': fields, + }, + errors: { + 400: `Request params are not correct`, + 500: `Unknown server error`, + }, + }); + } + /** + * Get title description + * @param titleId + * @param fields + * @returns Title Title description + * @throws ApiError + */ + public static getTitles1( + titleId: number, + fields: string = 'all', + ): CancelablePromise<Title> { + return __request(OpenAPI, { + method: 'GET', + url: '/titles/{title_id}', + path: { + 'title_id': titleId, + }, + query: { + 'fields': fields, + }, + errors: { + 400: `Request params are not correct`, + 404: `Title not found`, + 500: `Unknown server error`, + }, + }); + } + /** + * Get user info + * @param userId + * @param fields + * @returns User User info + * @throws ApiError + */ + public static getUsers( + userId: string, + fields: string = 'all', + ): CancelablePromise<User> { + return __request(OpenAPI, { + method: 'GET', + url: '/users/{user_id}', + path: { + 'user_id': userId, + }, + query: { + 'fields': fields, + }, + errors: { + 400: `Request params are not correct`, + 404: `User not found`, + 500: `Unknown server error`, + }, + }); + } + /** + * Get user titles + * @param userId + * @param cursor + * @param query + * @param limit + * @param offset + * @param fields + * @returns UserTitle List of user titles + * @throws ApiError + */ + public static getUsersTitles( + userId: string, + cursor?: string, + query?: string, + limit: number = 10, + offset?: number, + fields: string = 'all', + ): CancelablePromise<Array<UserTitle>> { + return __request(OpenAPI, { + method: 'GET', + url: '/users/{user_id}/titles', + path: { + 'user_id': userId, + }, + query: { + 'cursor': cursor, + 'query': query, + 'limit': limit, + 'offset': offset, + 'fields': fields, + }, + errors: { + 400: `Request params are not correct`, + 500: `Unknown server error`, + }, + }); + } +} diff --git a/modules/frontend/src/components/ListView/ListView.tsx b/modules/frontend/src/components/ListView/ListView.tsx new file mode 100644 index 0000000..77fea97 --- /dev/null +++ b/modules/frontend/src/components/ListView/ListView.tsx @@ -0,0 +1,52 @@ +import React from "react"; + +interface ListViewProps<TItem> { + hook: ReturnType<typeof import("./useListView.tsx").useListView<TItem>>; + renderHorizontal: (item: TItem) => React.ReactNode; + renderSquare: (item: TItem) => React.ReactNode; +} + +export function ListView<TItem>({ + hook, + renderHorizontal, + renderSquare +}: ListViewProps<TItem>) { + const { items, search, setSearch, viewMode, setViewMode, loadMore, hasMore } = hook; + + return ( + <div> + {/* Search + Layout Switcher */} + <div style={{ display: "flex", gap: 8, marginBottom: 16 }}> + <input + placeholder="Search..." + value={search} + onChange={e => setSearch(e.target.value)} + /> + + <button onClick={() => setViewMode("horizontal")}>Horizontal</button> + <button onClick={() => setViewMode("square")}>Square</button> + </div> + + {/* Items */} + <div + style={{ + display: "grid", + gridTemplateColumns: viewMode === "square" ? "repeat(auto-fill, 160px)" : "1fr", + gap: 12 + }} + > + {items.map(item => + viewMode === "horizontal" + ? renderHorizontal(item) + : renderSquare(item) + )} + </div> + + {hasMore && ( + <button onClick={loadMore} style={{ marginTop: 16 }}> + Load More + </button> + )} + </div> + ); +} \ No newline at end of file diff --git a/modules/frontend/src/components/ListView/useListView.tsx b/modules/frontend/src/components/ListView/useListView.tsx new file mode 100644 index 0000000..20c3597 --- /dev/null +++ b/modules/frontend/src/components/ListView/useListView.tsx @@ -0,0 +1,37 @@ +import { useState, useEffect } from "react"; +import type { FetchFunction } from "../../types/list"; + +export function useListView<TItem>(fetchFn: FetchFunction<TItem>) { + const [items, setItems] = useState<TItem[]>([]); + const [cursor, setCursor] = useState<string | undefined>(); + const [search, setSearch] = useState(""); + const [viewMode, setViewMode] = useState<"horizontal" | "square">("horizontal"); + const [isLoading, setIsLoading] = useState(false); + + useEffect(() => { + loadItems(true); + }, [search]); + + const loadItems = async (reset = false) => { + setIsLoading(true); + const result = await fetchFn({ + search, + cursor: reset ? undefined : cursor, + }); + + setItems(prev => reset ? result.items : [...prev, ...result.items]); + setCursor(result.nextCursor); + setIsLoading(false); + }; + + return { + items, + search, + setSearch, + viewMode, + setViewMode, + loadMore: () => loadItems(), + hasMore: Boolean(cursor), + isLoading, + }; +} \ No newline at end of file diff --git a/modules/frontend/src/components/UserPage/UserPage.module.css b/modules/frontend/src/components/UserPage/UserPage.module.css deleted file mode 100644 index 75195bf..0000000 --- a/modules/frontend/src/components/UserPage/UserPage.module.css +++ /dev/null @@ -1,97 +0,0 @@ -.container { - display: flex; - justify-content: center; - align-items: flex-start; - padding: 3rem 1rem; - background-color: #f5f6fa; - min-height: 100vh; - font-family: "Inter", sans-serif; -} - -.card { - background-color: #ffffff; - border-radius: 1rem; - box-shadow: 0 8px 20px rgba(0, 0, 0, 0.1); - padding: 2rem; - max-width: 400px; - width: 100%; - display: flex; - flex-direction: column; - align-items: center; - text-align: center; -} - -.avatar { - margin-bottom: 1.5rem; -} - -.avatarImg { - width: 120px; - height: 120px; - border-radius: 50%; - object-fit: cover; - border: 3px solid #4a90e2; -} - -.avatarPlaceholder { - width: 120px; - height: 120px; - border-radius: 50%; - background-color: #dcdde1; - display: flex; - align-items: center; - justify-content: center; - font-size: 3rem; - color: #4a4a4a; - font-weight: bold; - border: 3px solid #4a90e2; -} - -.info { - display: flex; - flex-direction: column; - align-items: center; -} - -.name { - font-size: 1.8rem; - font-weight: 700; - margin: 0.25rem 0; - color: #2f3640; -} - -.nickname { - font-size: 1rem; - color: #718093; - margin-bottom: 1rem; -} - -.desc { - font-size: 1rem; - color: #353b48; - margin-bottom: 1rem; -} - -.created { - font-size: 0.9rem; - color: #7f8fa6; -} - -.loader { - display: flex; - justify-content: center; - align-items: center; - height: 80vh; - font-size: 1.5rem; - color: #4a90e2; -} - -.error { - display: flex; - justify-content: center; - align-items: center; - height: 80vh; - color: #e84118; - font-weight: 600; - font-size: 1.2rem; -} diff --git a/modules/frontend/src/components/cards/TitleCardHorizontal.tsx b/modules/frontend/src/components/cards/TitleCardHorizontal.tsx new file mode 100644 index 0000000..c3a8159 --- /dev/null +++ b/modules/frontend/src/components/cards/TitleCardHorizontal.tsx @@ -0,0 +1,22 @@ +import type { Title } from "../../api/models/Title"; + +export function TitleCardHorizontal({ title }: { title: Title }) { + return ( + <div style={{ + display: "flex", + gap: 12, + padding: 12, + border: "1px solid #ddd", + borderRadius: 8 + }}> + {title.posterUrl && ( + <img src={title.posterUrl} width={80} /> + )} + <div> + <h3>{title.name}</h3> + <p>{title.year} · {title.season} · Rating: {title.rating}</p> + <p>Status: {title.status}</p> + </div> + </div> + ); +} diff --git a/modules/frontend/src/components/cards/TitleCardSquare.tsx b/modules/frontend/src/components/cards/TitleCardSquare.tsx new file mode 100644 index 0000000..0fc0339 --- /dev/null +++ b/modules/frontend/src/components/cards/TitleCardSquare.tsx @@ -0,0 +1,22 @@ +// TitleCardSquare.tsx +import type { Title } from "../../api/models/Title"; + +export function TitleCardSquare({ title }: { title: Title }) { + return ( + <div style={{ + width: 160, + border: "1px solid #ddd", + padding: 8, + borderRadius: 8, + textAlign: "center" + }}> + {title.posterUrl && ( + <img src={title.posterUrl} width={140} /> + )} + <div> + <h4>{title.name}</h4> + <small>{title.year} • {title.rating}</small> + </div> + </div> + ); +} diff --git a/modules/frontend/src/pages/TitlePage/TitlePage.module.css b/modules/frontend/src/pages/TitlePage/TitlePage.module.css new file mode 100644 index 0000000..e69de29 diff --git a/modules/frontend/src/pages/TitlePage/TitlePage.tsx b/modules/frontend/src/pages/TitlePage/TitlePage.tsx new file mode 100644 index 0000000..7fe9de7 --- /dev/null +++ b/modules/frontend/src/pages/TitlePage/TitlePage.tsx @@ -0,0 +1,64 @@ +// import React, { useEffect, useState } from "react"; +// import { useParams } from "react-router-dom"; +// import { DefaultService } from "../../api/services/DefaultService"; +// import type { User } from "../../api/models/User"; +// import styles from "./UserPage.module.css"; + +// const UserPage: React.FC = () => { +// const { id } = useParams<{ id: string }>(); +// const [user, setUser] = useState<User | null>(null); +// const [loading, setLoading] = useState(true); +// const [error, setError] = useState<string | null>(null); + +// useEffect(() => { +// if (!id) return; + +// const getTitleInfo = async () => { +// try { +// const userInfo = await DefaultService.getTitle(id, "all"); +// setUser(userInfo); +// } catch (err) { +// console.error(err); +// setError("Failed to fetch user info."); +// } finally { +// setLoading(false); +// } +// }; +// getTitleInfo(); +// }, [id]); + +// if (loading) return <div className={styles.loader}>Loading...</div>; +// if (error) return <div className={styles.error}>{error}</div>; +// if (!user) return <div className={styles.error}>User not found.</div>; + +// return ( +// <div className={styles.container}> +// <div className={styles.card}> +// <div className={styles.avatar}> +// {user.avatar_id ? ( +// <img +// src={`/images/${user.avatar_id}.png`} +// alt="User Avatar" +// className={styles.avatarImg} +// /> +// ) : ( +// <div className={styles.avatarPlaceholder}> +// {user.disp_name?.[0] || "U"} +// </div> +// )} +// </div> + +// <div className={styles.info}> +// <h1 className={styles.name}>{user.disp_name || user.nickname}</h1> +// <p className={styles.nickname}>@{user.nickname}</p> +// {user.user_desc && <p className={styles.desc}>{user.user_desc}</p>} +// <p className={styles.created}> +// Joined: {new Date(user.creation_date).toLocaleDateString()} +// </p> +// </div> +// </div> +// </div> +// ); +// }; + +// export default UserPage; diff --git a/modules/frontend/src/pages/TitlesPage/TitlesPage.module.css b/modules/frontend/src/pages/TitlesPage/TitlesPage.module.css new file mode 100644 index 0000000..9cc728b --- /dev/null +++ b/modules/frontend/src/pages/TitlesPage/TitlesPage.module.css @@ -0,0 +1,59 @@ +.container { + padding: 24px; +} + +.header { + display: flex; + justify-content: space-between; + margin-bottom: 16px; +} + +.searchInput { + padding: 8px; + width: 240px; +} + +.list { + display: grid; + gap: 12px; +} + +.card { + display: flex; + padding: 10px; + border: 1px solid #ddd; + border-radius: 8px; + gap: 12px; +} + +.poster { + width: 80px; + height: 120px; + object-fit: cover; + border-radius: 4px; +} + +.posterPlaceholder { + width: 80px; + height: 120px; + background: #eee; + display: flex; + align-items: center; + justify-content: center; +} + +.cardInfo { + display: flex; + flex-direction: column; +} + +.loadMore { + margin-top: 16px; + padding: 8px 16px; +} + +.loader, +.error { + padding: 20px; + text-align: center; +} diff --git a/modules/frontend/src/pages/TitlesPage/TitlesPage.tsx b/modules/frontend/src/pages/TitlesPage/TitlesPage.tsx new file mode 100644 index 0000000..438d828 --- /dev/null +++ b/modules/frontend/src/pages/TitlesPage/TitlesPage.tsx @@ -0,0 +1,114 @@ +import React, { useEffect, useState } from "react"; +import { DefaultService } from "../../api/services/DefaultService"; +import type { Title } from "../../api/models/Title"; +import styles from "./TitlesPage.module.css"; + +const LIMIT = 20; + +const TitlesPage: React.FC = () => { + const [titles, setTitles] = useState<Title[]>([]); + const [search, setSearch] = useState(""); + const [offset, setOffset] = useState(0); + + const [loading, setLoading] = useState(true); + const [loadingMore, setLoadingMore] = useState(false); + const [error, setError] = useState<string | null>(null); + + const fetchTitles = async (reset: boolean) => { + try { + if (reset) { + setLoading(true); + setOffset(0); + } else { + setLoadingMore(true); + } + + const result = await DefaultService.getTitles( + search || undefined, + undefined, // status + undefined, // rating + undefined, // release_year + undefined, // release_season + LIMIT, + reset ? 0 : offset, + "all" + ); + + if (reset) { + setTitles(result); + } else { + setTitles(prev => [...prev, ...result]); + } + + if (result.length > 0) { + setOffset(prev => prev + LIMIT); + } + + } catch (err) { + console.error(err); + setError("Failed to fetch titles."); + } finally { + setLoading(false); + setLoadingMore(false); + } + }; + + useEffect(() => { + fetchTitles(true); + }, [search]); + + if (loading) return <div className={styles.loader}>Loading...</div>; + if (error) return <div className={styles.error}>{error}</div>; + + return ( + <div className={styles.container}> + <div className={styles.header}> + <h1>Titles</h1> + + <input + className={styles.searchInput} + placeholder="Search titles..." + value={search} + onChange={e => setSearch(e.target.value)} + /> + </div> + + <div className={styles.list}> + {titles.map((t) => ( + <div key={t.id} className={styles.card}> + {t.poster_id ? ( + <img + src={`/images/${t.poster_id}.png`} + alt="Poster" + className={styles.poster} + /> + ) : ( + <div className={styles.posterPlaceholder}>No Image</div> + )} + + <div className={styles.cardInfo}> + <h3 className={styles.titleName}>{t.name}</h3> + <p className={styles.meta}> + {t.release_year} • {t.release_season} + </p> + <p className={styles.rating}>Rating: {t.rating}</p> + <p className={styles.status}>{t.status}</p> + </div> + </div> + ))} + </div> + + {titles.length > 0 && ( + <button + className={styles.loadMore} + onClick={() => fetchTitles(false)} + disabled={loadingMore} + > + {loadingMore ? "Loading..." : "Load More"} + </button> + )} + </div> + ); +}; + +export default TitlesPage; diff --git a/modules/frontend/src/pages/UserPage/UserPage.module.css b/modules/frontend/src/pages/UserPage/UserPage.module.css new file mode 100644 index 0000000..7f350c8 --- /dev/null +++ b/modules/frontend/src/pages/UserPage/UserPage.module.css @@ -0,0 +1,103 @@ +body, +html { + width: 100%; + margin: 0; + background-color: #777; + color: #fff; +} + +html, +body, +#root { + height: 100%; +} + +.header { + width: 100vw; + padding: 30px 40px; + background: #f7f7f7; + display: flex; + align-items: center; + gap: 25px; + box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05); + border-bottom: 1px solid #e5e5e5; + color: #000000; +} + +.avatarWrapper { + width: 120px; + height: 120px; + min-width: 120px; + border-radius: 50%; + overflow: hidden; + display: flex; + align-items: center; + justify-content: center; + background: #ddd; +} + +.avatarImg { + width: 100%; + height: 100%; + object-fit: cover; +} + +.avatarPlaceholder { + width: 100%; + height: 100%; + border-radius: 50%; + background: #ccc; + font-size: 42px; + font-weight: bold; + color: #555; + display: flex; + align-items: center; + justify-content: center; +} + +.userInfo { + display: flex; + flex-direction: column; +} + +.name { + font-size: 32px; + font-weight: 700; + margin: 0; +} + +.nickname { + font-size: 18px; + color: #666; + margin-top: 6px; +} + +.container { + max-width: 100vw; + width: 100%; + position: absolute; + top: 0%; + /* margin: 25px auto; */ + /* padding: 0 20px; */ +} + +.content { + margin-top: 20px; +} + +.desc { + font-size: 18px; + margin-bottom: 10px; +} + +.created { + font-size: 16px; + color: #888; +} + +.loader, +.error { + text-align: center; + margin-top: 40px; + font-size: 18px; +} diff --git a/modules/frontend/src/components/UserPage/UserPage.tsx b/modules/frontend/src/pages/UserPage/UserPage.tsx similarity index 88% rename from modules/frontend/src/components/UserPage/UserPage.tsx rename to modules/frontend/src/pages/UserPage/UserPage.tsx index 0a83679..52c5574 100644 --- a/modules/frontend/src/components/UserPage/UserPage.tsx +++ b/modules/frontend/src/pages/UserPage/UserPage.tsx @@ -33,8 +33,8 @@ const UserPage: React.FC = () => { return ( <div className={styles.container}> - <div className={styles.card}> - <div className={styles.avatar}> + <div className={styles.header}> + <div className={styles.avatarWrapper}> {user.avatar_id ? ( <img src={`/images/${user.avatar_id}.png`} @@ -48,13 +48,16 @@ const UserPage: React.FC = () => { )} </div> - <div className={styles.info}> + <div className={styles.userInfo}> <h1 className={styles.name}>{user.disp_name || user.nickname}</h1> <p className={styles.nickname}>@{user.nickname}</p> - {user.user_desc && <p className={styles.desc}>{user.user_desc}</p>} - <p className={styles.created}> + {/* <p className={styles.created}> Joined: {new Date(user.creation_date).toLocaleDateString()} - </p> + </p> */} + </div> + + <div className={styles.content}> + {user.user_desc && <p className={styles.desc}>{user.user_desc}</p>} </div> </div> </div> diff --git a/modules/frontend/src/types/list.ts b/modules/frontend/src/types/list.ts new file mode 100644 index 0000000..582da39 --- /dev/null +++ b/modules/frontend/src/types/list.ts @@ -0,0 +1,12 @@ +export interface PaginatedResult<TItem> { + items: TItem[]; + nextCursor?: string; +} + +export interface FetchParams { + search: string; + cursor?: string; +} + +export type FetchFunction<TItem> = + (params: FetchParams) => Promise<PaginatedResult<TItem>>; From cdfa14cece9584ad059c10dbff061d4a00028098 Mon Sep 17 00:00:00 2001 From: Iron_Felix <trubnikov.arseniy@mail.ru> Date: Wed, 19 Nov 2025 00:41:54 +0300 Subject: [PATCH 79/80] feat: cursor added --- api/api.gen.go | 106 ++++++++++++++++++++++++++++++++++++++++------- api/openapi.yaml | 56 +++++++++++++++++++++---- 2 files changed, 139 insertions(+), 23 deletions(-) diff --git a/api/api.gen.go b/api/api.gen.go index 74a2d52..427f5af 100644 --- a/api/api.gen.go +++ b/api/api.gen.go @@ -24,6 +24,14 @@ const ( Winter ReleaseSeason = "winter" ) +// Defines values for TitleSort. +const ( + Id TitleSort = "id" + Rating TitleSort = "rating" + Views TitleSort = "views" + Year TitleSort = "year" +) + // Defines values for TitleStatus. const ( TitleStatusFinished TitleStatus = "finished" @@ -91,6 +99,9 @@ type Title struct { AdditionalProperties map[string]interface{} `json:"-"` } +// TitleSort Title sort order +type TitleSort string + // TitleStatus Title status type TitleStatus string @@ -139,6 +150,9 @@ type Cursor = string // GetTitlesParams defines parameters for GetTitles. type GetTitlesParams struct { + Cursor *Cursor `form:"cursor,omitempty" json:"cursor,omitempty"` + Sort *TitleSort `form:"sort,omitempty" json:"sort,omitempty"` + SortForward *bool `form:"sort_forward,omitempty" json:"sort_forward,omitempty"` Word *string `form:"word,omitempty" json:"word,omitempty"` Status *TitleStatus `form:"status,omitempty" json:"status,omitempty"` Rating *float64 `form:"rating,omitempty" json:"rating,omitempty"` @@ -161,11 +175,15 @@ type GetUsersUserIdParams struct { // GetUsersUserIdTitlesParams defines parameters for GetUsersUserIdTitles. type GetUsersUserIdTitlesParams struct { - Cursor *Cursor `form:"cursor,omitempty" json:"cursor,omitempty"` - Query *string `form:"query,omitempty" json:"query,omitempty"` - Limit *int `form:"limit,omitempty" json:"limit,omitempty"` - Offset *int `form:"offset,omitempty" json:"offset,omitempty"` - Fields *string `form:"fields,omitempty" json:"fields,omitempty"` + Cursor *Cursor `form:"cursor,omitempty" json:"cursor,omitempty"` + Word *string `form:"word,omitempty" json:"word,omitempty"` + Status *TitleStatus `form:"status,omitempty" json:"status,omitempty"` + WatchStatus *UserTitleStatus `form:"watch_status,omitempty" json:"watch_status,omitempty"` + Rating *float64 `form:"rating,omitempty" json:"rating,omitempty"` + ReleaseYear *int32 `form:"release_year,omitempty" json:"release_year,omitempty"` + ReleaseSeason *ReleaseSeason `form:"release_season,omitempty" json:"release_season,omitempty"` + Limit *int32 `form:"limit,omitempty" json:"limit,omitempty"` + Fields *string `form:"fields,omitempty" json:"fields,omitempty"` } // Getter for additional properties for Title. Returns the specified @@ -580,6 +598,30 @@ func (siw *ServerInterfaceWrapper) GetTitles(c *gin.Context) { // Parameter object where we will unmarshal all parameters from the context var params GetTitlesParams + // ------------- Optional query parameter "cursor" ------------- + + err = runtime.BindQueryParameter("form", true, false, "cursor", c.Request.URL.Query(), ¶ms.Cursor) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter cursor: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "sort" ------------- + + err = runtime.BindQueryParameter("form", true, false, "sort", c.Request.URL.Query(), ¶ms.Sort) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter sort: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "sort_forward" ------------- + + err = runtime.BindQueryParameter("form", true, false, "sort_forward", c.Request.URL.Query(), ¶ms.SortForward) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter sort_forward: %w", err), http.StatusBadRequest) + return + } + // ------------- Optional query parameter "word" ------------- err = runtime.BindQueryParameter("form", true, false, "word", c.Request.URL.Query(), ¶ms.Word) @@ -749,11 +791,51 @@ func (siw *ServerInterfaceWrapper) GetUsersUserIdTitles(c *gin.Context) { return } - // ------------- Optional query parameter "query" ------------- + // ------------- Optional query parameter "word" ------------- - err = runtime.BindQueryParameter("form", true, false, "query", c.Request.URL.Query(), ¶ms.Query) + err = runtime.BindQueryParameter("form", true, false, "word", c.Request.URL.Query(), ¶ms.Word) if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter query: %w", err), http.StatusBadRequest) + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter word: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "status" ------------- + + err = runtime.BindQueryParameter("form", true, false, "status", c.Request.URL.Query(), ¶ms.Status) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter status: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "watch_status" ------------- + + err = runtime.BindQueryParameter("form", true, false, "watch_status", c.Request.URL.Query(), ¶ms.WatchStatus) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter watch_status: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "rating" ------------- + + err = runtime.BindQueryParameter("form", true, false, "rating", c.Request.URL.Query(), ¶ms.Rating) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter rating: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "release_year" ------------- + + err = runtime.BindQueryParameter("form", true, false, "release_year", c.Request.URL.Query(), ¶ms.ReleaseYear) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter release_year: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "release_season" ------------- + + err = runtime.BindQueryParameter("form", true, false, "release_season", c.Request.URL.Query(), ¶ms.ReleaseSeason) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter release_season: %w", err), http.StatusBadRequest) return } @@ -765,14 +847,6 @@ func (siw *ServerInterfaceWrapper) GetUsersUserIdTitles(c *gin.Context) { return } - // ------------- Optional query parameter "offset" ------------- - - err = runtime.BindQueryParameter("form", true, false, "offset", c.Request.URL.Query(), ¶ms.Offset) - if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter offset: %w", err), http.StatusBadRequest) - return - } - // ------------- Optional query parameter "fields" ------------- err = runtime.BindQueryParameter("form", true, false, "fields", c.Request.URL.Query(), ¶ms.Fields) diff --git a/api/openapi.yaml b/api/openapi.yaml index a33fe89..a6ae12c 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -11,6 +11,13 @@ paths: get: summary: Get titles parameters: + - $ref: '#/components/parameters/cursor' + - $ref: '#/components/parameters/title_sort' + - in: query + name: sort_forward + default: true + schema: + type: boolean - in: query name: word schema: @@ -289,19 +296,37 @@ paths: schema: type: string - in: query - name: query + name: word schema: type: string + - in: query + name: status + schema: + $ref: '#/components/schemas/TitleStatus' + - in: query + name: watch_status + schema: + $ref: '#/components/schemas/UserTitleStatus' + - in: query + name: rating + schema: + type: number + format: double + - in: query + name: release_year + schema: + type: integer + format: int32 + - in: query + name: release_season + schema: + $ref: '#/components/schemas/ReleaseSeason' - in: query name: limit schema: type: integer + format: int32 default: 10 - - in: query - name: offset - schema: - type: integer - default: 0 - in: query name: fields schema: @@ -577,14 +602,31 @@ paths: components: parameters: - cursor: + cursor: # example base64( {id: 1, param: 2019}) in: query name: cursor required: false schema: type: string + + title_sort: + in: query + name: sort + required: false + schema: + $ref: '#/components/schemas/TitleSort' schemas: + TitleSort: + type: string + description: Title sort order + default: id + enum: + - id + - year + - rating + - views + Image: type: object properties: From 397d2bcf70c07aad5fc443f7864eea65895ea0b2 Mon Sep 17 00:00:00 2001 From: nihonium <nihonium@nekoea.red> Date: Wed, 19 Nov 2025 10:54:52 +0300 Subject: [PATCH 80/80] feat: /titles page implementation with cursor pagination --- modules/frontend/package-lock.json | 651 ++++++++++++++++-- modules/frontend/package.json | 5 +- modules/frontend/src/App.tsx | 2 +- modules/frontend/src/api/index.ts | 9 +- .../cursor.ts => api/models/CursorObj.ts} | 6 +- .../frontend/src/api/models/ReleaseSeason.ts | 7 +- .../Tags.ts => api/models/TitleSort.ts} | 5 +- .../frontend/src/api/models/TitleStatus.ts | 6 +- modules/frontend/src/api/models/User.ts | 4 +- .../src/api/models/UserTitleStatus.ts | 7 +- .../Title.ts => api/models/title_sort.ts} | 3 +- .../src/api/services/DefaultService.ts | 48 +- modules/frontend/src/api_/core/ApiError.ts | 25 - .../src/api_/core/ApiRequestOptions.ts | 17 - modules/frontend/src/api_/core/ApiResult.ts | 11 - .../src/api_/core/CancelablePromise.ts | 131 ---- modules/frontend/src/api_/core/OpenAPI.ts | 32 - modules/frontend/src/api_/core/request.ts | 323 --------- modules/frontend/src/api_/index.ts | 23 - modules/frontend/src/api_/models/Image.ts | 10 - .../frontend/src/api_/models/ReleaseSeason.ts | 13 - modules/frontend/src/api_/models/Review.ts | 5 - modules/frontend/src/api_/models/Studio.ts | 12 - modules/frontend/src/api_/models/Tag.ts | 8 - .../frontend/src/api_/models/TitleStatus.ts | 12 - modules/frontend/src/api_/models/User.ts | 35 - modules/frontend/src/api_/models/UserTitle.ts | 5 - .../src/api_/models/UserTitleStatus.ts | 13 - .../src/api_/services/DefaultService.ts | 148 ---- .../src/components/ListView/ListView.tsx | 133 ++-- .../src/components/ListView/useListView.tsx | 37 - .../components/cards/TitleCardHorizontal.tsx | 10 +- .../src/components/cards/TitleCardSquare.tsx | 8 +- modules/frontend/src/index.css | 72 +- .../pages/TitlesPage/TitlesPage.module.css | 60 +- .../src/pages/TitlesPage/TitlesPage.tsx | 142 ++-- modules/frontend/vite.config.ts | 6 +- 37 files changed, 797 insertions(+), 1247 deletions(-) rename modules/frontend/src/{api_/models/cursor.ts => api/models/CursorObj.ts} (66%) rename modules/frontend/src/{api_/models/Tags.ts => api/models/TitleSort.ts} (60%) rename modules/frontend/src/{api_/models/Title.ts => api/models/title_sort.ts} (61%) delete mode 100644 modules/frontend/src/api_/core/ApiError.ts delete mode 100644 modules/frontend/src/api_/core/ApiRequestOptions.ts delete mode 100644 modules/frontend/src/api_/core/ApiResult.ts delete mode 100644 modules/frontend/src/api_/core/CancelablePromise.ts delete mode 100644 modules/frontend/src/api_/core/OpenAPI.ts delete mode 100644 modules/frontend/src/api_/core/request.ts delete mode 100644 modules/frontend/src/api_/index.ts delete mode 100644 modules/frontend/src/api_/models/Image.ts delete mode 100644 modules/frontend/src/api_/models/ReleaseSeason.ts delete mode 100644 modules/frontend/src/api_/models/Review.ts delete mode 100644 modules/frontend/src/api_/models/Studio.ts delete mode 100644 modules/frontend/src/api_/models/Tag.ts delete mode 100644 modules/frontend/src/api_/models/TitleStatus.ts delete mode 100644 modules/frontend/src/api_/models/User.ts delete mode 100644 modules/frontend/src/api_/models/UserTitle.ts delete mode 100644 modules/frontend/src/api_/models/UserTitleStatus.ts delete mode 100644 modules/frontend/src/api_/services/DefaultService.ts delete mode 100644 modules/frontend/src/components/ListView/useListView.tsx diff --git a/modules/frontend/package-lock.json b/modules/frontend/package-lock.json index 6a06afb..f5dde46 100644 --- a/modules/frontend/package-lock.json +++ b/modules/frontend/package-lock.json @@ -8,10 +8,13 @@ "name": "nyanimedb-frontend", "version": "0.0.0", "dependencies": { + "@heroicons/react": "^2.2.0", + "@tailwindcss/vite": "^4.1.17", "axios": "^1.12.2", "react": "^19.1.1", "react-dom": "^19.1.1", - "react-router-dom": "^7.9.4" + "react-router-dom": "^7.9.4", + "tailwindcss": "^4.1.17" }, "devDependencies": { "@eslint/js": "^9.36.0", @@ -337,7 +340,6 @@ "cpu": [ "ppc64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -354,7 +356,6 @@ "cpu": [ "arm" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -371,7 +372,6 @@ "cpu": [ "arm64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -388,7 +388,6 @@ "cpu": [ "x64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -405,7 +404,6 @@ "cpu": [ "arm64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -422,7 +420,6 @@ "cpu": [ "x64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -439,7 +436,6 @@ "cpu": [ "arm64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -456,7 +452,6 @@ "cpu": [ "x64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -473,7 +468,6 @@ "cpu": [ "arm" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -490,7 +484,6 @@ "cpu": [ "arm64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -507,7 +500,6 @@ "cpu": [ "ia32" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -524,7 +516,6 @@ "cpu": [ "loong64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -541,7 +532,6 @@ "cpu": [ "mips64el" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -558,7 +548,6 @@ "cpu": [ "ppc64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -575,7 +564,6 @@ "cpu": [ "riscv64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -592,7 +580,6 @@ "cpu": [ "s390x" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -609,7 +596,6 @@ "cpu": [ "x64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -626,7 +612,6 @@ "cpu": [ "arm64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -643,7 +628,6 @@ "cpu": [ "x64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -660,7 +644,6 @@ "cpu": [ "arm64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -677,7 +660,6 @@ "cpu": [ "x64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -694,7 +676,6 @@ "cpu": [ "arm64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -711,7 +692,6 @@ "cpu": [ "x64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -728,7 +708,6 @@ "cpu": [ "arm64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -745,7 +724,6 @@ "cpu": [ "ia32" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -762,7 +740,6 @@ "cpu": [ "x64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -929,6 +906,15 @@ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, + "node_modules/@heroicons/react": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@heroicons/react/-/react-2.2.0.tgz", + "integrity": "sha512-LMcepvRaS9LYHJGsF0zzmgKCUim/X3N/DQKc4jepAXJ7l8QxJ1PmxJzqplF2Z3FE4PqBAIGyJAQ/w4B5dsqbtQ==", + "license": "MIT", + "peerDependencies": { + "react": ">= 16 || ^19.0.0-rc" + } + }, "node_modules/@humanfs/core": { "version": "0.19.1", "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", @@ -985,7 +971,6 @@ "version": "0.3.13", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz", "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==", - "dev": true, "license": "MIT", "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.0", @@ -996,7 +981,6 @@ "version": "2.3.5", "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz", "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==", - "dev": true, "license": "MIT", "dependencies": { "@jridgewell/gen-mapping": "^0.3.5", @@ -1007,7 +991,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", - "dev": true, "license": "MIT", "engines": { "node": ">=6.0.0" @@ -1017,14 +1000,12 @@ "version": "1.5.5", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", - "dev": true, "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { "version": "0.3.31", "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz", "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==", - "dev": true, "license": "MIT", "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", @@ -1090,7 +1071,6 @@ "cpu": [ "arm" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -1104,7 +1084,6 @@ "cpu": [ "arm64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -1118,7 +1097,6 @@ "cpu": [ "arm64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -1132,7 +1110,6 @@ "cpu": [ "x64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -1146,7 +1123,6 @@ "cpu": [ "arm64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -1160,7 +1136,6 @@ "cpu": [ "x64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -1174,7 +1149,6 @@ "cpu": [ "arm" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -1188,7 +1162,6 @@ "cpu": [ "arm" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -1202,7 +1175,6 @@ "cpu": [ "arm64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -1216,7 +1188,6 @@ "cpu": [ "arm64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -1230,7 +1201,6 @@ "cpu": [ "loong64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -1244,7 +1214,6 @@ "cpu": [ "ppc64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -1258,7 +1227,6 @@ "cpu": [ "riscv64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -1272,7 +1240,6 @@ "cpu": [ "riscv64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -1286,7 +1253,6 @@ "cpu": [ "s390x" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -1300,7 +1266,6 @@ "cpu": [ "x64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -1314,7 +1279,6 @@ "cpu": [ "x64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -1328,7 +1292,6 @@ "cpu": [ "arm64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -1342,7 +1305,6 @@ "cpu": [ "arm64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -1356,7 +1318,6 @@ "cpu": [ "ia32" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -1370,7 +1331,6 @@ "cpu": [ "x64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -1384,13 +1344,269 @@ "cpu": [ "x64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ "win32" ] }, + "node_modules/@tailwindcss/node": { + "version": "4.1.17", + "resolved": "https://registry.npmjs.org/@tailwindcss/node/-/node-4.1.17.tgz", + "integrity": "sha512-csIkHIgLb3JisEFQ0vxr2Y57GUNYh447C8xzwj89U/8fdW8LhProdxvnVH6U8M2Y73QKiTIH+LWbK3V2BBZsAg==", + "license": "MIT", + "dependencies": { + "@jridgewell/remapping": "^2.3.4", + "enhanced-resolve": "^5.18.3", + "jiti": "^2.6.1", + "lightningcss": "1.30.2", + "magic-string": "^0.30.21", + "source-map-js": "^1.2.1", + "tailwindcss": "4.1.17" + } + }, + "node_modules/@tailwindcss/oxide": { + "version": "4.1.17", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide/-/oxide-4.1.17.tgz", + "integrity": "sha512-F0F7d01fmkQhsTjXezGBLdrl1KresJTcI3DB8EkScCldyKp3Msz4hub4uyYaVnk88BAS1g5DQjjF6F5qczheLA==", + "license": "MIT", + "engines": { + "node": ">= 10" + }, + "optionalDependencies": { + "@tailwindcss/oxide-android-arm64": "4.1.17", + "@tailwindcss/oxide-darwin-arm64": "4.1.17", + "@tailwindcss/oxide-darwin-x64": "4.1.17", + "@tailwindcss/oxide-freebsd-x64": "4.1.17", + "@tailwindcss/oxide-linux-arm-gnueabihf": "4.1.17", + "@tailwindcss/oxide-linux-arm64-gnu": "4.1.17", + "@tailwindcss/oxide-linux-arm64-musl": "4.1.17", + "@tailwindcss/oxide-linux-x64-gnu": "4.1.17", + "@tailwindcss/oxide-linux-x64-musl": "4.1.17", + "@tailwindcss/oxide-wasm32-wasi": "4.1.17", + "@tailwindcss/oxide-win32-arm64-msvc": "4.1.17", + "@tailwindcss/oxide-win32-x64-msvc": "4.1.17" + } + }, + "node_modules/@tailwindcss/oxide-android-arm64": { + "version": "4.1.17", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.1.17.tgz", + "integrity": "sha512-BMqpkJHgOZ5z78qqiGE6ZIRExyaHyuxjgrJ6eBO5+hfrfGkuya0lYfw8fRHG77gdTjWkNWEEm+qeG2cDMxArLQ==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tailwindcss/oxide-darwin-arm64": { + "version": "4.1.17", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.1.17.tgz", + "integrity": "sha512-EquyumkQweUBNk1zGEU/wfZo2qkp/nQKRZM8bUYO0J+Lums5+wl2CcG1f9BgAjn/u9pJzdYddHWBiFXJTcxmOg==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tailwindcss/oxide-darwin-x64": { + "version": "4.1.17", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.1.17.tgz", + "integrity": "sha512-gdhEPLzke2Pog8s12oADwYu0IAw04Y2tlmgVzIN0+046ytcgx8uZmCzEg4VcQh+AHKiS7xaL8kGo/QTiNEGRog==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tailwindcss/oxide-freebsd-x64": { + "version": "4.1.17", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.1.17.tgz", + "integrity": "sha512-hxGS81KskMxML9DXsaXT1H0DyA+ZBIbyG/sSAjWNe2EDl7TkPOBI42GBV3u38itzGUOmFfCzk1iAjDXds8Oh0g==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tailwindcss/oxide-linux-arm-gnueabihf": { + "version": "4.1.17", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.1.17.tgz", + "integrity": "sha512-k7jWk5E3ldAdw0cNglhjSgv501u7yrMf8oeZ0cElhxU6Y2o7f8yqelOp3fhf7evjIS6ujTI3U8pKUXV2I4iXHQ==", + "cpu": [ + "arm" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tailwindcss/oxide-linux-arm64-gnu": { + "version": "4.1.17", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.1.17.tgz", + "integrity": "sha512-HVDOm/mxK6+TbARwdW17WrgDYEGzmoYayrCgmLEw7FxTPLcp/glBisuyWkFz/jb7ZfiAXAXUACfyItn+nTgsdQ==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tailwindcss/oxide-linux-arm64-musl": { + "version": "4.1.17", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.1.17.tgz", + "integrity": "sha512-HvZLfGr42i5anKtIeQzxdkw/wPqIbpeZqe7vd3V9vI3RQxe3xU1fLjss0TjyhxWcBaipk7NYwSrwTwK1hJARMg==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tailwindcss/oxide-linux-x64-gnu": { + "version": "4.1.17", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.1.17.tgz", + "integrity": "sha512-M3XZuORCGB7VPOEDH+nzpJ21XPvK5PyjlkSFkFziNHGLc5d6g3di2McAAblmaSUNl8IOmzYwLx9NsE7bplNkwQ==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tailwindcss/oxide-linux-x64-musl": { + "version": "4.1.17", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.1.17.tgz", + "integrity": "sha512-k7f+pf9eXLEey4pBlw+8dgfJHY4PZ5qOUFDyNf7SI6lHjQ9Zt7+NcscjpwdCEbYi6FI5c2KDTDWyf2iHcCSyyQ==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tailwindcss/oxide-wasm32-wasi": { + "version": "4.1.17", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-wasm32-wasi/-/oxide-wasm32-wasi-4.1.17.tgz", + "integrity": "sha512-cEytGqSSoy7zK4JRWiTCx43FsKP/zGr0CsuMawhH67ONlH+T79VteQeJQRO/X7L0juEUA8ZyuYikcRBf0vsxhg==", + "bundleDependencies": [ + "@napi-rs/wasm-runtime", + "@emnapi/core", + "@emnapi/runtime", + "@tybys/wasm-util", + "@emnapi/wasi-threads", + "tslib" + ], + "cpu": [ + "wasm32" + ], + "license": "MIT", + "optional": true, + "dependencies": { + "@emnapi/core": "^1.6.0", + "@emnapi/runtime": "^1.6.0", + "@emnapi/wasi-threads": "^1.1.0", + "@napi-rs/wasm-runtime": "^1.0.7", + "@tybys/wasm-util": "^0.10.1", + "tslib": "^2.4.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@tailwindcss/oxide-win32-arm64-msvc": { + "version": "4.1.17", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.1.17.tgz", + "integrity": "sha512-JU5AHr7gKbZlOGvMdb4722/0aYbU+tN6lv1kONx0JK2cGsh7g148zVWLM0IKR3NeKLv+L90chBVYcJ8uJWbC9A==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tailwindcss/oxide-win32-x64-msvc": { + "version": "4.1.17", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.1.17.tgz", + "integrity": "sha512-SKWM4waLuqx0IH+FMDUw6R66Hu4OuTALFgnleKbqhgGU30DY20NORZMZUKgLRjQXNN2TLzKvh48QXTig4h4bGw==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tailwindcss/vite": { + "version": "4.1.17", + "resolved": "https://registry.npmjs.org/@tailwindcss/vite/-/vite-4.1.17.tgz", + "integrity": "sha512-4+9w8ZHOiGnpcGI6z1TVVfWaX/koK7fKeSYF3qlYg2xpBtbteP2ddBxiarL+HVgfSJGeK5RIxRQmKm4rTJJAwA==", + "license": "MIT", + "dependencies": { + "@tailwindcss/node": "4.1.17", + "@tailwindcss/oxide": "4.1.17", + "tailwindcss": "4.1.17" + }, + "peerDependencies": { + "vite": "^5.2.0 || ^6 || ^7" + } + }, "node_modules/@types/babel__core": { "version": "7.20.5", "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", @@ -1440,7 +1656,6 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==", - "dev": true, "license": "MIT" }, "node_modules/@types/json-schema": { @@ -1454,7 +1669,7 @@ "version": "24.7.0", "resolved": "https://registry.npmjs.org/@types/node/-/node-24.7.0.tgz", "integrity": "sha512-IbKooQVqUBrlzWTi79E8Fw78l8k1RNtlDDNWsFZs7XonuQSJ8oNYfEeclhprUldXISRMLzBpILuKgPlIxm+/Yw==", - "dev": true, + "devOptional": true, "license": "MIT", "peer": true, "dependencies": { @@ -2127,6 +2342,15 @@ "node": ">=0.4.0" } }, + "node_modules/detect-libc": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz", + "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==", + "license": "Apache-2.0", + "engines": { + "node": ">=8" + } + }, "node_modules/dunder-proto": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", @@ -2148,6 +2372,19 @@ "dev": true, "license": "ISC" }, + "node_modules/enhanced-resolve": { + "version": "5.18.3", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz", + "integrity": "sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==", + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, "node_modules/es-define-property": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", @@ -2197,7 +2434,6 @@ "version": "0.25.10", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.10.tgz", "integrity": "sha512-9RiGKvCwaqxO2owP61uQ4BgNborAQskMR6QusfWzQqv7AZOg5oGehdY2pRJMTKuwxd1IDBP4rSbI5lHzU7SMsQ==", - "dev": true, "hasInstallScript": true, "license": "MIT", "bin": { @@ -2617,7 +2853,6 @@ "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, "hasInstallScript": true, "license": "MIT", "optional": true, @@ -2726,7 +2961,6 @@ "version": "4.2.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "dev": true, "license": "ISC" }, "node_modules/graphemer": { @@ -2884,6 +3118,15 @@ "dev": true, "license": "ISC" }, + "node_modules/jiti": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.6.1.tgz", + "integrity": "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==", + "license": "MIT", + "bin": { + "jiti": "lib/jiti-cli.mjs" + } + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -2988,6 +3231,255 @@ "node": ">= 0.8.0" } }, + "node_modules/lightningcss": { + "version": "1.30.2", + "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.30.2.tgz", + "integrity": "sha512-utfs7Pr5uJyyvDETitgsaqSyjCb2qNRAtuqUeWIAKztsOYdcACf2KtARYXg2pSvhkt+9NfoaNY7fxjl6nuMjIQ==", + "license": "MPL-2.0", + "dependencies": { + "detect-libc": "^2.0.3" + }, + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + }, + "optionalDependencies": { + "lightningcss-android-arm64": "1.30.2", + "lightningcss-darwin-arm64": "1.30.2", + "lightningcss-darwin-x64": "1.30.2", + "lightningcss-freebsd-x64": "1.30.2", + "lightningcss-linux-arm-gnueabihf": "1.30.2", + "lightningcss-linux-arm64-gnu": "1.30.2", + "lightningcss-linux-arm64-musl": "1.30.2", + "lightningcss-linux-x64-gnu": "1.30.2", + "lightningcss-linux-x64-musl": "1.30.2", + "lightningcss-win32-arm64-msvc": "1.30.2", + "lightningcss-win32-x64-msvc": "1.30.2" + } + }, + "node_modules/lightningcss-android-arm64": { + "version": "1.30.2", + "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.30.2.tgz", + "integrity": "sha512-BH9sEdOCahSgmkVhBLeU7Hc9DWeZ1Eb6wNS6Da8igvUwAe0sqROHddIlvU06q3WyXVEOYDZ6ykBZQnjTbmo4+A==", + "cpu": [ + "arm64" + ], + "license": "MPL-2.0", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-darwin-arm64": { + "version": "1.30.2", + "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.30.2.tgz", + "integrity": "sha512-ylTcDJBN3Hp21TdhRT5zBOIi73P6/W0qwvlFEk22fkdXchtNTOU4Qc37SkzV+EKYxLouZ6M4LG9NfZ1qkhhBWA==", + "cpu": [ + "arm64" + ], + "license": "MPL-2.0", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-darwin-x64": { + "version": "1.30.2", + "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.30.2.tgz", + "integrity": "sha512-oBZgKchomuDYxr7ilwLcyms6BCyLn0z8J0+ZZmfpjwg9fRVZIR5/GMXd7r9RH94iDhld3UmSjBM6nXWM2TfZTQ==", + "cpu": [ + "x64" + ], + "license": "MPL-2.0", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-freebsd-x64": { + "version": "1.30.2", + "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.30.2.tgz", + "integrity": "sha512-c2bH6xTrf4BDpK8MoGG4Bd6zAMZDAXS569UxCAGcA7IKbHNMlhGQ89eRmvpIUGfKWNVdbhSbkQaWhEoMGmGslA==", + "cpu": [ + "x64" + ], + "license": "MPL-2.0", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-linux-arm-gnueabihf": { + "version": "1.30.2", + "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.30.2.tgz", + "integrity": "sha512-eVdpxh4wYcm0PofJIZVuYuLiqBIakQ9uFZmipf6LF/HRj5Bgm0eb3qL/mr1smyXIS1twwOxNWndd8z0E374hiA==", + "cpu": [ + "arm" + ], + "license": "MPL-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-linux-arm64-gnu": { + "version": "1.30.2", + "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.30.2.tgz", + "integrity": "sha512-UK65WJAbwIJbiBFXpxrbTNArtfuznvxAJw4Q2ZGlU8kPeDIWEX1dg3rn2veBVUylA2Ezg89ktszWbaQnxD/e3A==", + "cpu": [ + "arm64" + ], + "license": "MPL-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-linux-arm64-musl": { + "version": "1.30.2", + "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.30.2.tgz", + "integrity": "sha512-5Vh9dGeblpTxWHpOx8iauV02popZDsCYMPIgiuw97OJ5uaDsL86cnqSFs5LZkG3ghHoX5isLgWzMs+eD1YzrnA==", + "cpu": [ + "arm64" + ], + "license": "MPL-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-linux-x64-gnu": { + "version": "1.30.2", + "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.30.2.tgz", + "integrity": "sha512-Cfd46gdmj1vQ+lR6VRTTadNHu6ALuw2pKR9lYq4FnhvgBc4zWY1EtZcAc6EffShbb1MFrIPfLDXD6Xprbnni4w==", + "cpu": [ + "x64" + ], + "license": "MPL-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-linux-x64-musl": { + "version": "1.30.2", + "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.30.2.tgz", + "integrity": "sha512-XJaLUUFXb6/QG2lGIW6aIk6jKdtjtcffUT0NKvIqhSBY3hh9Ch+1LCeH80dR9q9LBjG3ewbDjnumefsLsP6aiA==", + "cpu": [ + "x64" + ], + "license": "MPL-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-win32-arm64-msvc": { + "version": "1.30.2", + "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.30.2.tgz", + "integrity": "sha512-FZn+vaj7zLv//D/192WFFVA0RgHawIcHqLX9xuWiQt7P0PtdFEVaxgF9rjM/IRYHQXNnk61/H/gb2Ei+kUQ4xQ==", + "cpu": [ + "arm64" + ], + "license": "MPL-2.0", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-win32-x64-msvc": { + "version": "1.30.2", + "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.30.2.tgz", + "integrity": "sha512-5g1yc73p+iAkid5phb4oVFMB45417DkRevRbt/El/gKXJk4jid+vPFF/AXbxn05Aky8PapwzZrdJShv5C0avjw==", + "cpu": [ + "x64" + ], + "license": "MPL-2.0", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, "node_modules/locate-path": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", @@ -3021,6 +3513,15 @@ "yallist": "^3.0.2" } }, + "node_modules/magic-string": { + "version": "0.30.21", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz", + "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==", + "license": "MIT", + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.5.5" + } + }, "node_modules/math-intrinsics": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", @@ -3109,7 +3610,6 @@ "version": "3.3.11", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", - "dev": true, "funding": [ { "type": "github", @@ -3249,7 +3749,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", - "dev": true, "license": "ISC" }, "node_modules/picomatch": { @@ -3269,7 +3768,6 @@ "version": "8.5.6", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz", "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==", - "dev": true, "funding": [ { "type": "opencollective", @@ -3437,7 +3935,6 @@ "version": "4.52.4", "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.52.4.tgz", "integrity": "sha512-CLEVl+MnPAiKh5pl4dEWSyMTpuflgNQiLGhMv8ezD5W/qP8AKvmYpCOKRRNOh7oRKnauBZ4SyeYkMS+1VSyKwQ==", - "dev": true, "license": "MIT", "dependencies": { "@types/estree": "1.0.8" @@ -3558,7 +4055,6 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", - "dev": true, "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" @@ -3590,11 +4086,29 @@ "node": ">=8" } }, + "node_modules/tailwindcss": { + "version": "4.1.17", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.17.tgz", + "integrity": "sha512-j9Ee2YjuQqYT9bbRTfTZht9W/ytp5H+jJpZKiYdP/bpnXARAuELt9ofP0lPnmHjbga7SNQIxdTAXCmtKVYjN+Q==", + "license": "MIT" + }, + "node_modules/tapable": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.0.tgz", + "integrity": "sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==", + "license": "MIT", + "engines": { + "node": ">=6" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + } + }, "node_modules/tinyglobby": { "version": "0.2.15", "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz", "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==", - "dev": true, "license": "MIT", "dependencies": { "fdir": "^6.5.0", @@ -3611,7 +4125,6 @@ "version": "6.5.0", "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==", - "dev": true, "license": "MIT", "engines": { "node": ">=12.0.0" @@ -3629,7 +4142,6 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", - "dev": true, "license": "MIT", "peer": true, "engines": { @@ -3735,7 +4247,7 @@ "version": "7.14.0", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.14.0.tgz", "integrity": "sha512-QQiYxHuyZ9gQUIrmPo3IA+hUl4KYk8uSA7cHrcKd/l3p1OTpZcM0Tbp9x7FAtXdAYhlasd60ncPpgu6ihG6TOA==", - "dev": true, + "devOptional": true, "license": "MIT" }, "node_modules/universalify": { @@ -3793,7 +4305,6 @@ "version": "7.1.9", "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.9.tgz", "integrity": "sha512-4nVGliEpxmhCL8DslSAUdxlB6+SMrhB0a1v5ijlh1xB1nEPuy1mxaHxysVucLHuWryAxLWg6a5ei+U4TLn/rFg==", - "dev": true, "license": "MIT", "peer": true, "dependencies": { @@ -3869,7 +4380,6 @@ "version": "6.5.0", "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==", - "dev": true, "license": "MIT", "engines": { "node": ">=12.0.0" @@ -3887,7 +4397,6 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", - "dev": true, "license": "MIT", "peer": true, "engines": { diff --git a/modules/frontend/package.json b/modules/frontend/package.json index b4977aa..beb2b2a 100644 --- a/modules/frontend/package.json +++ b/modules/frontend/package.json @@ -10,10 +10,13 @@ "preview": "vite preview" }, "dependencies": { + "@heroicons/react": "^2.2.0", + "@tailwindcss/vite": "^4.1.17", "axios": "^1.12.2", "react": "^19.1.1", "react-dom": "^19.1.1", - "react-router-dom": "^7.9.4" + "react-router-dom": "^7.9.4", + "tailwindcss": "^4.1.17" }, "devDependencies": { "@eslint/js": "^9.36.0", diff --git a/modules/frontend/src/App.tsx b/modules/frontend/src/App.tsx index 1256086..f67c37e 100644 --- a/modules/frontend/src/App.tsx +++ b/modules/frontend/src/App.tsx @@ -1,7 +1,7 @@ import React from "react"; import { BrowserRouter as Router, Routes, Route } from "react-router-dom"; import UserPage from "./pages/UserPage/UserPage"; -import TitlesPage from "./pages/UserPage/UserPage"; +import TitlesPage from "./pages/TitlesPage/TitlesPage"; const App: React.FC = () => { return ( diff --git a/modules/frontend/src/api/index.ts b/modules/frontend/src/api/index.ts index f0d09ee..80ae491 100644 --- a/modules/frontend/src/api/index.ts +++ b/modules/frontend/src/api/index.ts @@ -8,16 +8,19 @@ export { OpenAPI } from './core/OpenAPI'; export type { OpenAPIConfig } from './core/OpenAPI'; export type { cursor } from './models/cursor'; +export type { CursorObj } from './models/CursorObj'; export type { Image } from './models/Image'; -export { ReleaseSeason } from './models/ReleaseSeason'; +export type { ReleaseSeason } from './models/ReleaseSeason'; export type { Review } from './models/Review'; export type { Studio } from './models/Studio'; export type { Tag } from './models/Tag'; export type { Tags } from './models/Tags'; export type { Title } from './models/Title'; -export { TitleStatus } from './models/TitleStatus'; +export type { title_sort } from './models/title_sort'; +export type { TitleSort } from './models/TitleSort'; +export type { TitleStatus } from './models/TitleStatus'; export type { User } from './models/User'; export type { UserTitle } from './models/UserTitle'; -export { UserTitleStatus } from './models/UserTitleStatus'; +export type { UserTitleStatus } from './models/UserTitleStatus'; export { DefaultService } from './services/DefaultService'; diff --git a/modules/frontend/src/api_/models/cursor.ts b/modules/frontend/src/api/models/CursorObj.ts similarity index 66% rename from modules/frontend/src/api_/models/cursor.ts rename to modules/frontend/src/api/models/CursorObj.ts index 5788e14..f54abb1 100644 --- a/modules/frontend/src/api_/models/cursor.ts +++ b/modules/frontend/src/api/models/CursorObj.ts @@ -2,4 +2,8 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ -export type cursor = string; +export type CursorObj = { + id: number; + param?: string; +}; + diff --git a/modules/frontend/src/api/models/ReleaseSeason.ts b/modules/frontend/src/api/models/ReleaseSeason.ts index 182b980..ad9f930 100644 --- a/modules/frontend/src/api/models/ReleaseSeason.ts +++ b/modules/frontend/src/api/models/ReleaseSeason.ts @@ -5,9 +5,4 @@ /** * Title release season */ -export enum ReleaseSeason { - WINTER = 'winter', - SPRING = 'spring', - SUMMER = 'summer', - FALL = 'fall', -} +export type ReleaseSeason = 'winter' | 'spring' | 'summer' | 'fall'; diff --git a/modules/frontend/src/api_/models/Tags.ts b/modules/frontend/src/api/models/TitleSort.ts similarity index 60% rename from modules/frontend/src/api_/models/Tags.ts rename to modules/frontend/src/api/models/TitleSort.ts index 748f066..1c9385e 100644 --- a/modules/frontend/src/api_/models/Tags.ts +++ b/modules/frontend/src/api/models/TitleSort.ts @@ -2,8 +2,7 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ -import type { Tag } from './Tag'; /** - * Array of localized tags + * Title sort order */ -export type Tags = Array<Tag>; +export type TitleSort = 'id' | 'year' | 'rating' | 'views'; diff --git a/modules/frontend/src/api/models/TitleStatus.ts b/modules/frontend/src/api/models/TitleStatus.ts index 811ece8..72e0261 100644 --- a/modules/frontend/src/api/models/TitleStatus.ts +++ b/modules/frontend/src/api/models/TitleStatus.ts @@ -5,8 +5,4 @@ /** * Title status */ -export enum TitleStatus { - FINISHED = 'finished', - ONGOING = 'ongoing', - PLANNED = 'planned', -} +export type TitleStatus = 'finished' | 'ongoing' | 'planned'; diff --git a/modules/frontend/src/api/models/User.ts b/modules/frontend/src/api/models/User.ts index 541028e..cd76dbe 100644 --- a/modules/frontend/src/api/models/User.ts +++ b/modules/frontend/src/api/models/User.ts @@ -6,11 +6,11 @@ export type User = { /** * Unique user ID (primary key) */ - id: number; + id?: number; /** * ID of the user avatar (references images table) */ - avatar_id?: number | null; + avatar_id?: number; /** * User email */ diff --git a/modules/frontend/src/api/models/UserTitleStatus.ts b/modules/frontend/src/api/models/UserTitleStatus.ts index 20651fe..0a29626 100644 --- a/modules/frontend/src/api/models/UserTitleStatus.ts +++ b/modules/frontend/src/api/models/UserTitleStatus.ts @@ -5,9 +5,4 @@ /** * User's title status */ -export enum UserTitleStatus { - FINISHED = 'finished', - PLANNED = 'planned', - DROPPED = 'dropped', - IN_PROGRESS = 'in-progress', -} +export type UserTitleStatus = 'finished' | 'planned' | 'dropped' | 'in-progress'; diff --git a/modules/frontend/src/api_/models/Title.ts b/modules/frontend/src/api/models/title_sort.ts similarity index 61% rename from modules/frontend/src/api_/models/Title.ts rename to modules/frontend/src/api/models/title_sort.ts index 4da7aa3..69b01a7 100644 --- a/modules/frontend/src/api_/models/Title.ts +++ b/modules/frontend/src/api/models/title_sort.ts @@ -2,4 +2,5 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ -export type Title = Record<string, any>; +import type { TitleSort } from './TitleSort'; +export type title_sort = TitleSort; diff --git a/modules/frontend/src/api/services/DefaultService.ts b/modules/frontend/src/api/services/DefaultService.ts index b0ae54d..52321b8 100644 --- a/modules/frontend/src/api/services/DefaultService.ts +++ b/modules/frontend/src/api/services/DefaultService.ts @@ -2,17 +2,23 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ +import type { CursorObj } from '../models/CursorObj'; import type { ReleaseSeason } from '../models/ReleaseSeason'; import type { Title } from '../models/Title'; +import type { TitleSort } from '../models/TitleSort'; import type { TitleStatus } from '../models/TitleStatus'; import type { User } from '../models/User'; import type { UserTitle } from '../models/UserTitle'; +import type { UserTitleStatus } from '../models/UserTitleStatus'; import type { CancelablePromise } from '../core/CancelablePromise'; import { OpenAPI } from '../core/OpenAPI'; import { request as __request } from '../core/request'; export class DefaultService { /** * Get titles + * @param cursor + * @param sort + * @param sortForward * @param word * @param status * @param rating @@ -21,10 +27,13 @@ export class DefaultService { * @param limit * @param offset * @param fields - * @returns Title List of titles + * @returns any List of titles with cursor * @throws ApiError */ public static getTitles( + cursor?: string, + sort?: TitleSort, + sortForward: boolean = true, word?: string, status?: TitleStatus, rating?: number, @@ -33,11 +42,20 @@ export class DefaultService { limit: number = 10, offset?: number, fields: string = 'all', - ): CancelablePromise<Array<Title>> { + ): CancelablePromise<{ + /** + * List of titles + */ + data: Array<Title>; + cursor: CursorObj; + }> { return __request(OpenAPI, { method: 'GET', url: '/titles', query: { + 'cursor': cursor, + 'sort': sort, + 'sort_forward': sortForward, 'word': word, 'status': status, 'rating': rating, @@ -111,9 +129,13 @@ export class DefaultService { * Get user titles * @param userId * @param cursor - * @param query + * @param word + * @param status + * @param watchStatus + * @param rating + * @param releaseYear + * @param releaseSeason * @param limit - * @param offset * @param fields * @returns UserTitle List of user titles * @throws ApiError @@ -121,22 +143,30 @@ export class DefaultService { public static getUsersTitles( userId: string, cursor?: string, - query?: string, + word?: string, + status?: TitleStatus, + watchStatus?: UserTitleStatus, + rating?: number, + releaseYear?: number, + releaseSeason?: ReleaseSeason, limit: number = 10, - offset?: number, fields: string = 'all', ): CancelablePromise<Array<UserTitle>> { return __request(OpenAPI, { method: 'GET', - url: '/users/{user_id}/titles', + url: '/users/{user_id}/titles/', path: { 'user_id': userId, }, query: { 'cursor': cursor, - 'query': query, + 'word': word, + 'status': status, + 'watch_status': watchStatus, + 'rating': rating, + 'release_year': releaseYear, + 'release_season': releaseSeason, 'limit': limit, - 'offset': offset, 'fields': fields, }, errors: { diff --git a/modules/frontend/src/api_/core/ApiError.ts b/modules/frontend/src/api_/core/ApiError.ts deleted file mode 100644 index ec7b16a..0000000 --- a/modules/frontend/src/api_/core/ApiError.ts +++ /dev/null @@ -1,25 +0,0 @@ -/* generated using openapi-typescript-codegen -- do not edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ -import type { ApiRequestOptions } from './ApiRequestOptions'; -import type { ApiResult } from './ApiResult'; - -export class ApiError extends Error { - public readonly url: string; - public readonly status: number; - public readonly statusText: string; - public readonly body: any; - public readonly request: ApiRequestOptions; - - constructor(request: ApiRequestOptions, response: ApiResult, message: string) { - super(message); - - this.name = 'ApiError'; - this.url = response.url; - this.status = response.status; - this.statusText = response.statusText; - this.body = response.body; - this.request = request; - } -} diff --git a/modules/frontend/src/api_/core/ApiRequestOptions.ts b/modules/frontend/src/api_/core/ApiRequestOptions.ts deleted file mode 100644 index 93143c3..0000000 --- a/modules/frontend/src/api_/core/ApiRequestOptions.ts +++ /dev/null @@ -1,17 +0,0 @@ -/* generated using openapi-typescript-codegen -- do not edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ -export type ApiRequestOptions = { - readonly method: 'GET' | 'PUT' | 'POST' | 'DELETE' | 'OPTIONS' | 'HEAD' | 'PATCH'; - readonly url: string; - readonly path?: Record<string, any>; - readonly cookies?: Record<string, any>; - readonly headers?: Record<string, any>; - readonly query?: Record<string, any>; - readonly formData?: Record<string, any>; - readonly body?: any; - readonly mediaType?: string; - readonly responseHeader?: string; - readonly errors?: Record<number, string>; -}; diff --git a/modules/frontend/src/api_/core/ApiResult.ts b/modules/frontend/src/api_/core/ApiResult.ts deleted file mode 100644 index ee1126e..0000000 --- a/modules/frontend/src/api_/core/ApiResult.ts +++ /dev/null @@ -1,11 +0,0 @@ -/* generated using openapi-typescript-codegen -- do not edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ -export type ApiResult = { - readonly url: string; - readonly ok: boolean; - readonly status: number; - readonly statusText: string; - readonly body: any; -}; diff --git a/modules/frontend/src/api_/core/CancelablePromise.ts b/modules/frontend/src/api_/core/CancelablePromise.ts deleted file mode 100644 index d70de92..0000000 --- a/modules/frontend/src/api_/core/CancelablePromise.ts +++ /dev/null @@ -1,131 +0,0 @@ -/* generated using openapi-typescript-codegen -- do not edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ -export class CancelError extends Error { - - constructor(message: string) { - super(message); - this.name = 'CancelError'; - } - - public get isCancelled(): boolean { - return true; - } -} - -export interface OnCancel { - readonly isResolved: boolean; - readonly isRejected: boolean; - readonly isCancelled: boolean; - - (cancelHandler: () => void): void; -} - -export class CancelablePromise<T> implements Promise<T> { - #isResolved: boolean; - #isRejected: boolean; - #isCancelled: boolean; - readonly #cancelHandlers: (() => void)[]; - readonly #promise: Promise<T>; - #resolve?: (value: T | PromiseLike<T>) => void; - #reject?: (reason?: any) => void; - - constructor( - executor: ( - resolve: (value: T | PromiseLike<T>) => void, - reject: (reason?: any) => void, - onCancel: OnCancel - ) => void - ) { - this.#isResolved = false; - this.#isRejected = false; - this.#isCancelled = false; - this.#cancelHandlers = []; - this.#promise = new Promise<T>((resolve, reject) => { - this.#resolve = resolve; - this.#reject = reject; - - const onResolve = (value: T | PromiseLike<T>): void => { - if (this.#isResolved || this.#isRejected || this.#isCancelled) { - return; - } - this.#isResolved = true; - if (this.#resolve) this.#resolve(value); - }; - - const onReject = (reason?: any): void => { - if (this.#isResolved || this.#isRejected || this.#isCancelled) { - return; - } - this.#isRejected = true; - if (this.#reject) this.#reject(reason); - }; - - const onCancel = (cancelHandler: () => void): void => { - if (this.#isResolved || this.#isRejected || this.#isCancelled) { - return; - } - this.#cancelHandlers.push(cancelHandler); - }; - - Object.defineProperty(onCancel, 'isResolved', { - get: (): boolean => this.#isResolved, - }); - - Object.defineProperty(onCancel, 'isRejected', { - get: (): boolean => this.#isRejected, - }); - - Object.defineProperty(onCancel, 'isCancelled', { - get: (): boolean => this.#isCancelled, - }); - - return executor(onResolve, onReject, onCancel as OnCancel); - }); - } - - get [Symbol.toStringTag]() { - return "Cancellable Promise"; - } - - public then<TResult1 = T, TResult2 = never>( - onFulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | null, - onRejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null - ): Promise<TResult1 | TResult2> { - return this.#promise.then(onFulfilled, onRejected); - } - - public catch<TResult = never>( - onRejected?: ((reason: any) => TResult | PromiseLike<TResult>) | null - ): Promise<T | TResult> { - return this.#promise.catch(onRejected); - } - - public finally(onFinally?: (() => void) | null): Promise<T> { - return this.#promise.finally(onFinally); - } - - public cancel(): void { - if (this.#isResolved || this.#isRejected || this.#isCancelled) { - return; - } - this.#isCancelled = true; - if (this.#cancelHandlers.length) { - try { - for (const cancelHandler of this.#cancelHandlers) { - cancelHandler(); - } - } catch (error) { - console.warn('Cancellation threw an error', error); - return; - } - } - this.#cancelHandlers.length = 0; - if (this.#reject) this.#reject(new CancelError('Request aborted')); - } - - public get isCancelled(): boolean { - return this.#isCancelled; - } -} diff --git a/modules/frontend/src/api_/core/OpenAPI.ts b/modules/frontend/src/api_/core/OpenAPI.ts deleted file mode 100644 index 185e5c3..0000000 --- a/modules/frontend/src/api_/core/OpenAPI.ts +++ /dev/null @@ -1,32 +0,0 @@ -/* generated using openapi-typescript-codegen -- do not edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ -import type { ApiRequestOptions } from './ApiRequestOptions'; - -type Resolver<T> = (options: ApiRequestOptions) => Promise<T>; -type Headers = Record<string, string>; - -export type OpenAPIConfig = { - BASE: string; - VERSION: string; - WITH_CREDENTIALS: boolean; - CREDENTIALS: 'include' | 'omit' | 'same-origin'; - TOKEN?: string | Resolver<string> | undefined; - USERNAME?: string | Resolver<string> | undefined; - PASSWORD?: string | Resolver<string> | undefined; - HEADERS?: Headers | Resolver<Headers> | undefined; - ENCODE_PATH?: ((path: string) => string) | undefined; -}; - -export const OpenAPI: OpenAPIConfig = { - BASE: '/api/v1', - VERSION: '1.0.0', - WITH_CREDENTIALS: false, - CREDENTIALS: 'include', - TOKEN: undefined, - USERNAME: undefined, - PASSWORD: undefined, - HEADERS: undefined, - ENCODE_PATH: undefined, -}; diff --git a/modules/frontend/src/api_/core/request.ts b/modules/frontend/src/api_/core/request.ts deleted file mode 100644 index 1dc6fef..0000000 --- a/modules/frontend/src/api_/core/request.ts +++ /dev/null @@ -1,323 +0,0 @@ -/* generated using openapi-typescript-codegen -- do not edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ -import axios from 'axios'; -import type { AxiosError, AxiosRequestConfig, AxiosResponse, AxiosInstance } from 'axios'; -import FormData from 'form-data'; - -import { ApiError } from './ApiError'; -import type { ApiRequestOptions } from './ApiRequestOptions'; -import type { ApiResult } from './ApiResult'; -import { CancelablePromise } from './CancelablePromise'; -import type { OnCancel } from './CancelablePromise'; -import type { OpenAPIConfig } from './OpenAPI'; - -export const isDefined = <T>(value: T | null | undefined): value is Exclude<T, null | undefined> => { - return value !== undefined && value !== null; -}; - -export const isString = (value: any): value is string => { - return typeof value === 'string'; -}; - -export const isStringWithValue = (value: any): value is string => { - return isString(value) && value !== ''; -}; - -export const isBlob = (value: any): value is Blob => { - return ( - typeof value === 'object' && - typeof value.type === 'string' && - typeof value.stream === 'function' && - typeof value.arrayBuffer === 'function' && - typeof value.constructor === 'function' && - typeof value.constructor.name === 'string' && - /^(Blob|File)$/.test(value.constructor.name) && - /^(Blob|File)$/.test(value[Symbol.toStringTag]) - ); -}; - -export const isFormData = (value: any): value is FormData => { - return value instanceof FormData; -}; - -export const isSuccess = (status: number): boolean => { - return status >= 200 && status < 300; -}; - -export const base64 = (str: string): string => { - try { - return btoa(str); - } catch (err) { - // @ts-ignore - return Buffer.from(str).toString('base64'); - } -}; - -export const getQueryString = (params: Record<string, any>): string => { - const qs: string[] = []; - - const append = (key: string, value: any) => { - qs.push(`${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`); - }; - - const process = (key: string, value: any) => { - if (isDefined(value)) { - if (Array.isArray(value)) { - value.forEach(v => { - process(key, v); - }); - } else if (typeof value === 'object') { - Object.entries(value).forEach(([k, v]) => { - process(`${key}[${k}]`, v); - }); - } else { - append(key, value); - } - } - }; - - Object.entries(params).forEach(([key, value]) => { - process(key, value); - }); - - if (qs.length > 0) { - return `?${qs.join('&')}`; - } - - return ''; -}; - -const getUrl = (config: OpenAPIConfig, options: ApiRequestOptions): string => { - const encoder = config.ENCODE_PATH || encodeURI; - - const path = options.url - .replace('{api-version}', config.VERSION) - .replace(/{(.*?)}/g, (substring: string, group: string) => { - if (options.path?.hasOwnProperty(group)) { - return encoder(String(options.path[group])); - } - return substring; - }); - - const url = `${config.BASE}${path}`; - if (options.query) { - return `${url}${getQueryString(options.query)}`; - } - return url; -}; - -export const getFormData = (options: ApiRequestOptions): FormData | undefined => { - if (options.formData) { - const formData = new FormData(); - - const process = (key: string, value: any) => { - if (isString(value) || isBlob(value)) { - formData.append(key, value); - } else { - formData.append(key, JSON.stringify(value)); - } - }; - - Object.entries(options.formData) - .filter(([_, value]) => isDefined(value)) - .forEach(([key, value]) => { - if (Array.isArray(value)) { - value.forEach(v => process(key, v)); - } else { - process(key, value); - } - }); - - return formData; - } - return undefined; -}; - -type Resolver<T> = (options: ApiRequestOptions) => Promise<T>; - -export const resolve = async <T>(options: ApiRequestOptions, resolver?: T | Resolver<T>): Promise<T | undefined> => { - if (typeof resolver === 'function') { - return (resolver as Resolver<T>)(options); - } - return resolver; -}; - -export const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions, formData?: FormData): Promise<Record<string, string>> => { - const [token, username, password, additionalHeaders] = await Promise.all([ - resolve(options, config.TOKEN), - resolve(options, config.USERNAME), - resolve(options, config.PASSWORD), - resolve(options, config.HEADERS), - ]); - - const formHeaders = typeof formData?.getHeaders === 'function' && formData?.getHeaders() || {} - - const headers = Object.entries({ - Accept: 'application/json', - ...additionalHeaders, - ...options.headers, - ...formHeaders, - }) - .filter(([_, value]) => isDefined(value)) - .reduce((headers, [key, value]) => ({ - ...headers, - [key]: String(value), - }), {} as Record<string, string>); - - if (isStringWithValue(token)) { - headers['Authorization'] = `Bearer ${token}`; - } - - if (isStringWithValue(username) && isStringWithValue(password)) { - const credentials = base64(`${username}:${password}`); - headers['Authorization'] = `Basic ${credentials}`; - } - - if (options.body !== undefined) { - if (options.mediaType) { - headers['Content-Type'] = options.mediaType; - } else if (isBlob(options.body)) { - headers['Content-Type'] = options.body.type || 'application/octet-stream'; - } else if (isString(options.body)) { - headers['Content-Type'] = 'text/plain'; - } else if (!isFormData(options.body)) { - headers['Content-Type'] = 'application/json'; - } - } - - return headers; -}; - -export const getRequestBody = (options: ApiRequestOptions): any => { - if (options.body) { - return options.body; - } - return undefined; -}; - -export const sendRequest = async <T>( - config: OpenAPIConfig, - options: ApiRequestOptions, - url: string, - body: any, - formData: FormData | undefined, - headers: Record<string, string>, - onCancel: OnCancel, - axiosClient: AxiosInstance -): Promise<AxiosResponse<T>> => { - const source = axios.CancelToken.source(); - - const requestConfig: AxiosRequestConfig = { - url, - headers, - data: body ?? formData, - method: options.method, - withCredentials: config.WITH_CREDENTIALS, - withXSRFToken: config.CREDENTIALS === 'include' ? config.WITH_CREDENTIALS : false, - cancelToken: source.token, - }; - - onCancel(() => source.cancel('The user aborted a request.')); - - try { - return await axiosClient.request(requestConfig); - } catch (error) { - const axiosError = error as AxiosError<T>; - if (axiosError.response) { - return axiosError.response; - } - throw error; - } -}; - -export const getResponseHeader = (response: AxiosResponse<any>, responseHeader?: string): string | undefined => { - if (responseHeader) { - const content = response.headers[responseHeader]; - if (isString(content)) { - return content; - } - } - return undefined; -}; - -export const getResponseBody = (response: AxiosResponse<any>): any => { - if (response.status !== 204) { - return response.data; - } - return undefined; -}; - -export const catchErrorCodes = (options: ApiRequestOptions, result: ApiResult): void => { - const errors: Record<number, string> = { - 400: 'Bad Request', - 401: 'Unauthorized', - 403: 'Forbidden', - 404: 'Not Found', - 500: 'Internal Server Error', - 502: 'Bad Gateway', - 503: 'Service Unavailable', - ...options.errors, - } - - const error = errors[result.status]; - if (error) { - throw new ApiError(options, result, error); - } - - if (!result.ok) { - const errorStatus = result.status ?? 'unknown'; - const errorStatusText = result.statusText ?? 'unknown'; - const errorBody = (() => { - try { - return JSON.stringify(result.body, null, 2); - } catch (e) { - return undefined; - } - })(); - - throw new ApiError(options, result, - `Generic Error: status: ${errorStatus}; status text: ${errorStatusText}; body: ${errorBody}` - ); - } -}; - -/** - * Request method - * @param config The OpenAPI configuration object - * @param options The request options from the service - * @param axiosClient The axios client instance to use - * @returns CancelablePromise<T> - * @throws ApiError - */ -export const request = <T>(config: OpenAPIConfig, options: ApiRequestOptions, axiosClient: AxiosInstance = axios): CancelablePromise<T> => { - return new CancelablePromise(async (resolve, reject, onCancel) => { - try { - const url = getUrl(config, options); - const formData = getFormData(options); - const body = getRequestBody(options); - const headers = await getHeaders(config, options, formData); - - if (!onCancel.isCancelled) { - const response = await sendRequest<T>(config, options, url, body, formData, headers, onCancel, axiosClient); - const responseBody = getResponseBody(response); - const responseHeader = getResponseHeader(response, options.responseHeader); - - const result: ApiResult = { - url, - ok: isSuccess(response.status), - status: response.status, - statusText: response.statusText, - body: responseHeader ?? responseBody, - }; - - catchErrorCodes(options, result); - - resolve(result.body); - } - } catch (error) { - reject(error); - } - }); -}; diff --git a/modules/frontend/src/api_/index.ts b/modules/frontend/src/api_/index.ts deleted file mode 100644 index f0d09ee..0000000 --- a/modules/frontend/src/api_/index.ts +++ /dev/null @@ -1,23 +0,0 @@ -/* generated using openapi-typescript-codegen -- do not edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ -export { ApiError } from './core/ApiError'; -export { CancelablePromise, CancelError } from './core/CancelablePromise'; -export { OpenAPI } from './core/OpenAPI'; -export type { OpenAPIConfig } from './core/OpenAPI'; - -export type { cursor } from './models/cursor'; -export type { Image } from './models/Image'; -export { ReleaseSeason } from './models/ReleaseSeason'; -export type { Review } from './models/Review'; -export type { Studio } from './models/Studio'; -export type { Tag } from './models/Tag'; -export type { Tags } from './models/Tags'; -export type { Title } from './models/Title'; -export { TitleStatus } from './models/TitleStatus'; -export type { User } from './models/User'; -export type { UserTitle } from './models/UserTitle'; -export { UserTitleStatus } from './models/UserTitleStatus'; - -export { DefaultService } from './services/DefaultService'; diff --git a/modules/frontend/src/api_/models/Image.ts b/modules/frontend/src/api_/models/Image.ts deleted file mode 100644 index 1317db7..0000000 --- a/modules/frontend/src/api_/models/Image.ts +++ /dev/null @@ -1,10 +0,0 @@ -/* generated using openapi-typescript-codegen -- do not edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ -export type Image = { - id?: number; - storage_type?: string; - image_path?: string; -}; - diff --git a/modules/frontend/src/api_/models/ReleaseSeason.ts b/modules/frontend/src/api_/models/ReleaseSeason.ts deleted file mode 100644 index 182b980..0000000 --- a/modules/frontend/src/api_/models/ReleaseSeason.ts +++ /dev/null @@ -1,13 +0,0 @@ -/* generated using openapi-typescript-codegen -- do not edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ -/** - * Title release season - */ -export enum ReleaseSeason { - WINTER = 'winter', - SPRING = 'spring', - SUMMER = 'summer', - FALL = 'fall', -} diff --git a/modules/frontend/src/api_/models/Review.ts b/modules/frontend/src/api_/models/Review.ts deleted file mode 100644 index 9b453b7..0000000 --- a/modules/frontend/src/api_/models/Review.ts +++ /dev/null @@ -1,5 +0,0 @@ -/* generated using openapi-typescript-codegen -- do not edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ -export type Review = Record<string, any>; diff --git a/modules/frontend/src/api_/models/Studio.ts b/modules/frontend/src/api_/models/Studio.ts deleted file mode 100644 index 062695a..0000000 --- a/modules/frontend/src/api_/models/Studio.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* generated using openapi-typescript-codegen -- do not edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ -import type { Image } from './Image'; -export type Studio = { - id: number; - name: string; - poster?: Image; - description?: string; -}; - diff --git a/modules/frontend/src/api_/models/Tag.ts b/modules/frontend/src/api_/models/Tag.ts deleted file mode 100644 index 665c724..0000000 --- a/modules/frontend/src/api_/models/Tag.ts +++ /dev/null @@ -1,8 +0,0 @@ -/* generated using openapi-typescript-codegen -- do not edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ -/** - * A localized tag: keys are language codes (ISO 639-1), values are tag names - */ -export type Tag = Record<string, string>; diff --git a/modules/frontend/src/api_/models/TitleStatus.ts b/modules/frontend/src/api_/models/TitleStatus.ts deleted file mode 100644 index 811ece8..0000000 --- a/modules/frontend/src/api_/models/TitleStatus.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* generated using openapi-typescript-codegen -- do not edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ -/** - * Title status - */ -export enum TitleStatus { - FINISHED = 'finished', - ONGOING = 'ongoing', - PLANNED = 'planned', -} diff --git a/modules/frontend/src/api_/models/User.ts b/modules/frontend/src/api_/models/User.ts deleted file mode 100644 index 541028e..0000000 --- a/modules/frontend/src/api_/models/User.ts +++ /dev/null @@ -1,35 +0,0 @@ -/* generated using openapi-typescript-codegen -- do not edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ -export type User = { - /** - * Unique user ID (primary key) - */ - id: number; - /** - * ID of the user avatar (references images table) - */ - avatar_id?: number | null; - /** - * User email - */ - mail?: string; - /** - * Username (alphanumeric + _ or -) - */ - nickname: string; - /** - * Display name - */ - disp_name?: string; - /** - * User description - */ - user_desc?: string; - /** - * Timestamp when the user was created - */ - creation_date?: string; -}; - diff --git a/modules/frontend/src/api_/models/UserTitle.ts b/modules/frontend/src/api_/models/UserTitle.ts deleted file mode 100644 index 26d5ddc..0000000 --- a/modules/frontend/src/api_/models/UserTitle.ts +++ /dev/null @@ -1,5 +0,0 @@ -/* generated using openapi-typescript-codegen -- do not edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ -export type UserTitle = Record<string, any>; diff --git a/modules/frontend/src/api_/models/UserTitleStatus.ts b/modules/frontend/src/api_/models/UserTitleStatus.ts deleted file mode 100644 index 20651fe..0000000 --- a/modules/frontend/src/api_/models/UserTitleStatus.ts +++ /dev/null @@ -1,13 +0,0 @@ -/* generated using openapi-typescript-codegen -- do not edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ -/** - * User's title status - */ -export enum UserTitleStatus { - FINISHED = 'finished', - PLANNED = 'planned', - DROPPED = 'dropped', - IN_PROGRESS = 'in-progress', -} diff --git a/modules/frontend/src/api_/services/DefaultService.ts b/modules/frontend/src/api_/services/DefaultService.ts deleted file mode 100644 index b0ae54d..0000000 --- a/modules/frontend/src/api_/services/DefaultService.ts +++ /dev/null @@ -1,148 +0,0 @@ -/* generated using openapi-typescript-codegen -- do not edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ -import type { ReleaseSeason } from '../models/ReleaseSeason'; -import type { Title } from '../models/Title'; -import type { TitleStatus } from '../models/TitleStatus'; -import type { User } from '../models/User'; -import type { UserTitle } from '../models/UserTitle'; -import type { CancelablePromise } from '../core/CancelablePromise'; -import { OpenAPI } from '../core/OpenAPI'; -import { request as __request } from '../core/request'; -export class DefaultService { - /** - * Get titles - * @param word - * @param status - * @param rating - * @param releaseYear - * @param releaseSeason - * @param limit - * @param offset - * @param fields - * @returns Title List of titles - * @throws ApiError - */ - public static getTitles( - word?: string, - status?: TitleStatus, - rating?: number, - releaseYear?: number, - releaseSeason?: ReleaseSeason, - limit: number = 10, - offset?: number, - fields: string = 'all', - ): CancelablePromise<Array<Title>> { - return __request(OpenAPI, { - method: 'GET', - url: '/titles', - query: { - 'word': word, - 'status': status, - 'rating': rating, - 'release_year': releaseYear, - 'release_season': releaseSeason, - 'limit': limit, - 'offset': offset, - 'fields': fields, - }, - errors: { - 400: `Request params are not correct`, - 500: `Unknown server error`, - }, - }); - } - /** - * Get title description - * @param titleId - * @param fields - * @returns Title Title description - * @throws ApiError - */ - public static getTitles1( - titleId: number, - fields: string = 'all', - ): CancelablePromise<Title> { - return __request(OpenAPI, { - method: 'GET', - url: '/titles/{title_id}', - path: { - 'title_id': titleId, - }, - query: { - 'fields': fields, - }, - errors: { - 400: `Request params are not correct`, - 404: `Title not found`, - 500: `Unknown server error`, - }, - }); - } - /** - * Get user info - * @param userId - * @param fields - * @returns User User info - * @throws ApiError - */ - public static getUsers( - userId: string, - fields: string = 'all', - ): CancelablePromise<User> { - return __request(OpenAPI, { - method: 'GET', - url: '/users/{user_id}', - path: { - 'user_id': userId, - }, - query: { - 'fields': fields, - }, - errors: { - 400: `Request params are not correct`, - 404: `User not found`, - 500: `Unknown server error`, - }, - }); - } - /** - * Get user titles - * @param userId - * @param cursor - * @param query - * @param limit - * @param offset - * @param fields - * @returns UserTitle List of user titles - * @throws ApiError - */ - public static getUsersTitles( - userId: string, - cursor?: string, - query?: string, - limit: number = 10, - offset?: number, - fields: string = 'all', - ): CancelablePromise<Array<UserTitle>> { - return __request(OpenAPI, { - method: 'GET', - url: '/users/{user_id}/titles', - path: { - 'user_id': userId, - }, - query: { - 'cursor': cursor, - 'query': query, - 'limit': limit, - 'offset': offset, - 'fields': fields, - }, - errors: { - 400: `Request params are not correct`, - 500: `Unknown server error`, - }, - }); - } -} diff --git a/modules/frontend/src/components/ListView/ListView.tsx b/modules/frontend/src/components/ListView/ListView.tsx index 77fea97..e0e8ab9 100644 --- a/modules/frontend/src/components/ListView/ListView.tsx +++ b/modules/frontend/src/components/ListView/ListView.tsx @@ -1,52 +1,103 @@ -import React from "react"; +import React, { useState, useEffect } from "react"; +import { Squares2X2Icon, Bars3Icon } from "@heroicons/react/24/solid"; +import type { CursorObj } from "../../api"; -interface ListViewProps<TItem> { - hook: ReturnType<typeof import("./useListView.tsx").useListView<TItem>>; - renderHorizontal: (item: TItem) => React.ReactNode; - renderSquare: (item: TItem) => React.ReactNode; -} +export type ListViewProps<T> = { + fetchItems: (cursor: string, limit: number) => Promise<{ items: T[]; cursor: CursorObj}>; + renderItem: (item: T, layout: "square" | "horizontal") => React.ReactNode; + pageSize?: number; + searchPlaceholder?: string; + setSearch: any; +}; -export function ListView<TItem>({ - hook, - renderHorizontal, - renderSquare -}: ListViewProps<TItem>) { - const { items, search, setSearch, viewMode, setViewMode, loadMore, hasMore } = hook; +export function ListView<T>({ + fetchItems, + renderItem, + pageSize = 20, + searchPlaceholder = "Search...", +}: ListViewProps<T>) { + const [items, setItems] = useState<T[]>([]); + const [cursorObj, setCursorObj] = useState<CursorObj | undefined>(undefined); + const [loading, setLoading] = useState(true); + const [loadingMore, setLoadingMore] = useState(false); + const [search, setSearch] = useState(""); + const [layout, setLayout] = useState<"square" | "horizontal">("horizontal"); + const [error, setError] = useState<string | null>(null); + + const loadItems = async (reset: boolean = false) => { + try { + if (reset) { + setLoading(true); + setCursorObj(undefined); + } else { + setLoadingMore(true); + } + + const cursorStr = cursorObj ? btoa(JSON.stringify(cursorObj)) : "" + console.log("encoded cursor: " + cursorStr) + + const result = await fetchItems(cursorStr, pageSize); + + if (reset) setItems(result.items); + else setItems(prev => [...prev, ...result.items]); + + setCursorObj(result.cursor); + setError(null); + } catch (err: any) { + console.error(err); + setError("Failed to fetch items."); + } finally { + setLoading(false); + setLoadingMore(false); + } + }; + + useEffect(() => { + loadItems(true); + }, [search]); return ( - <div> - {/* Search + Layout Switcher */} - <div style={{ display: "flex", gap: 8, marginBottom: 16 }}> + <div className="w-full min-h-screen bg-gray-50 p-6 text-black flex flex-col items-center"> + <div className="w-full sm:w-4/5 flex gap-4 mb-8"> <input - placeholder="Search..." - value={search} + type="text" + placeholder={searchPlaceholder} + // value={search} onChange={e => setSearch(e.target.value)} + className="flex-1 px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 text-black" /> - - <button onClick={() => setViewMode("horizontal")}>Horizontal</button> - <button onClick={() => setViewMode("square")}>Square</button> - </div> - - {/* Items */} - <div - style={{ - display: "grid", - gridTemplateColumns: viewMode === "square" ? "repeat(auto-fill, 160px)" : "1fr", - gap: 12 - }} - > - {items.map(item => - viewMode === "horizontal" - ? renderHorizontal(item) - : renderSquare(item) - )} - </div> - - {hasMore && ( - <button onClick={loadMore} style={{ marginTop: 16 }}> - Load More + <button + className="p-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700 transition" + onClick={() => + setLayout(prev => (prev === "square" ? "horizontal" : "square")) + }> + {layout === "square" ? <Squares2X2Icon className="w-6 h-6" /> : <Bars3Icon className="w-6 h-6" />} </button> + </div> + + {error && <div className="text-red-600 mb-6 font-medium">{error}</div>} + + <div + className={`w-full sm:w-4/5 grid gap-6 ${ + layout === "square" ? "grid-cols-1 sm:grid-cols-2 lg:grid-cols-4" : "grid-cols-1" + }`} + > + {items.map(item => renderItem(item, layout))} + </div> + + {cursorObj && ( + <div className="mt-8 flex justify-center w-full sm:w-4/5"> + <button + className="px-6 py-3 bg-blue-600 text-white font-semibold rounded-lg hover:bg-blue-700 transition disabled:opacity-50 disabled:cursor-not-allowed" + onClick={() => loadItems(false)} + disabled={loadingMore} + > + {loadingMore ? "Loading..." : "Load More"} + </button> + </div> )} + + {loading && <div className="mt-20 font-medium">Loading...</div>} </div> ); -} \ No newline at end of file +} diff --git a/modules/frontend/src/components/ListView/useListView.tsx b/modules/frontend/src/components/ListView/useListView.tsx deleted file mode 100644 index 20c3597..0000000 --- a/modules/frontend/src/components/ListView/useListView.tsx +++ /dev/null @@ -1,37 +0,0 @@ -import { useState, useEffect } from "react"; -import type { FetchFunction } from "../../types/list"; - -export function useListView<TItem>(fetchFn: FetchFunction<TItem>) { - const [items, setItems] = useState<TItem[]>([]); - const [cursor, setCursor] = useState<string | undefined>(); - const [search, setSearch] = useState(""); - const [viewMode, setViewMode] = useState<"horizontal" | "square">("horizontal"); - const [isLoading, setIsLoading] = useState(false); - - useEffect(() => { - loadItems(true); - }, [search]); - - const loadItems = async (reset = false) => { - setIsLoading(true); - const result = await fetchFn({ - search, - cursor: reset ? undefined : cursor, - }); - - setItems(prev => reset ? result.items : [...prev, ...result.items]); - setCursor(result.nextCursor); - setIsLoading(false); - }; - - return { - items, - search, - setSearch, - viewMode, - setViewMode, - loadMore: () => loadItems(), - hasMore: Boolean(cursor), - isLoading, - }; -} \ No newline at end of file diff --git a/modules/frontend/src/components/cards/TitleCardHorizontal.tsx b/modules/frontend/src/components/cards/TitleCardHorizontal.tsx index c3a8159..cde6037 100644 --- a/modules/frontend/src/components/cards/TitleCardHorizontal.tsx +++ b/modules/frontend/src/components/cards/TitleCardHorizontal.tsx @@ -9,13 +9,13 @@ export function TitleCardHorizontal({ title }: { title: Title }) { border: "1px solid #ddd", borderRadius: 8 }}> - {title.posterUrl && ( - <img src={title.posterUrl} width={80} /> + {title.poster?.image_path && ( + <img src={title.poster.image_path} width={80} /> )} <div> - <h3>{title.name}</h3> - <p>{title.year} · {title.season} · Rating: {title.rating}</p> - <p>Status: {title.status}</p> + <h3>{title.title_names["en"]}</h3> + <p>{title.release_year} · {title.release_season} · Rating: {title.rating}</p> + <p>Status: {title.title_status}</p> </div> </div> ); diff --git a/modules/frontend/src/components/cards/TitleCardSquare.tsx b/modules/frontend/src/components/cards/TitleCardSquare.tsx index 0fc0339..e21c258 100644 --- a/modules/frontend/src/components/cards/TitleCardSquare.tsx +++ b/modules/frontend/src/components/cards/TitleCardSquare.tsx @@ -10,12 +10,12 @@ export function TitleCardSquare({ title }: { title: Title }) { borderRadius: 8, textAlign: "center" }}> - {title.posterUrl && ( - <img src={title.posterUrl} width={140} /> + {title.poster?.image_path && ( + <img src={title.poster.image_path} width={140} /> )} <div> - <h4>{title.name}</h4> - <small>{title.year} • {title.rating}</small> + <h4>{title.title_names["en"]}</h4> + <small>{title.release_year} • {title.rating}</small> </div> </div> ); diff --git a/modules/frontend/src/index.css b/modules/frontend/src/index.css index 08a3ac9..e20de02 100644 --- a/modules/frontend/src/index.css +++ b/modules/frontend/src/index.css @@ -1,68 +1,8 @@ -:root { - font-family: system-ui, Avenir, Helvetica, Arial, sans-serif; - line-height: 1.5; - font-weight: 400; +@import "tailwindcss"; - color-scheme: light dark; - color: rgba(255, 255, 255, 0.87); - background-color: #242424; - - font-synthesis: none; - text-rendering: optimizeLegibility; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -a { - font-weight: 500; - color: #646cff; - text-decoration: inherit; -} -a:hover { - color: #535bf2; -} - -body { +html, body, #root { margin: 0; - display: flex; - place-items: center; - min-width: 320px; - min-height: 100vh; -} - -h1 { - font-size: 3.2em; - line-height: 1.1; -} - -button { - border-radius: 8px; - border: 1px solid transparent; - padding: 0.6em 1.2em; - font-size: 1em; - font-weight: 500; - font-family: inherit; - background-color: #1a1a1a; - cursor: pointer; - transition: border-color 0.25s; -} -button:hover { - border-color: #646cff; -} -button:focus, -button:focus-visible { - outline: 4px auto -webkit-focus-ring-color; -} - -@media (prefers-color-scheme: light) { - :root { - color: #213547; - background-color: #ffffff; - } - a:hover { - color: #747bff; - } - button { - background-color: #f9f9f9; - } -} + padding: 0; + width: 100%; + height: 100%; +} \ No newline at end of file diff --git a/modules/frontend/src/pages/TitlesPage/TitlesPage.module.css b/modules/frontend/src/pages/TitlesPage/TitlesPage.module.css index 9cc728b..f1d8c73 100644 --- a/modules/frontend/src/pages/TitlesPage/TitlesPage.module.css +++ b/modules/frontend/src/pages/TitlesPage/TitlesPage.module.css @@ -1,59 +1 @@ -.container { - padding: 24px; -} - -.header { - display: flex; - justify-content: space-between; - margin-bottom: 16px; -} - -.searchInput { - padding: 8px; - width: 240px; -} - -.list { - display: grid; - gap: 12px; -} - -.card { - display: flex; - padding: 10px; - border: 1px solid #ddd; - border-radius: 8px; - gap: 12px; -} - -.poster { - width: 80px; - height: 120px; - object-fit: cover; - border-radius: 4px; -} - -.posterPlaceholder { - width: 80px; - height: 120px; - background: #eee; - display: flex; - align-items: center; - justify-content: center; -} - -.cardInfo { - display: flex; - flex-direction: column; -} - -.loadMore { - margin-top: 16px; - padding: 8px 16px; -} - -.loader, -.error { - padding: 20px; - text-align: center; -} +@import "tailwindcss"; diff --git a/modules/frontend/src/pages/TitlesPage/TitlesPage.tsx b/modules/frontend/src/pages/TitlesPage/TitlesPage.tsx index 438d828..b59f737 100644 --- a/modules/frontend/src/pages/TitlesPage/TitlesPage.tsx +++ b/modules/frontend/src/pages/TitlesPage/TitlesPage.tsx @@ -1,114 +1,52 @@ -import React, { useEffect, useState } from "react"; +import { ListView } from "../../components/ListView/ListView"; import { DefaultService } from "../../api/services/DefaultService"; -import type { Title } from "../../api/models/Title"; -import styles from "./TitlesPage.module.css"; +import { TitleCardSquare } from "../../components/cards/TitleCardSquare"; +import { TitleCardHorizontal } from "../../components/cards/TitleCardHorizontal"; +import type { Title } from "../../api"; +import { useState, useEffect } from "react"; -const LIMIT = 20; - -const TitlesPage: React.FC = () => { - const [titles, setTitles] = useState<Title[]>([]); +const PAGE_SIZE = 20; +export default function TitlesPage() { const [search, setSearch] = useState(""); - const [offset, setOffset] = useState(0); - const [loading, setLoading] = useState(true); - const [loadingMore, setLoadingMore] = useState(false); - const [error, setError] = useState<string | null>(null); + const loadTitles = async (cursor: string, limit: number) => { + const result = await DefaultService.getTitles( + cursor, + undefined, + true, + search, + undefined, + undefined, + undefined, + undefined, + limit, + undefined, + 'all' + ); - const fetchTitles = async (reset: boolean) => { - try { - if (reset) { - setLoading(true); - setOffset(0); - } else { - setLoadingMore(true); - } - - const result = await DefaultService.getTitles( - search || undefined, - undefined, // status - undefined, // rating - undefined, // release_year - undefined, // release_season - LIMIT, - reset ? 0 : offset, - "all" - ); - - if (reset) { - setTitles(result); - } else { - setTitles(prev => [...prev, ...result]); - } - - if (result.length > 0) { - setOffset(prev => prev + LIMIT); - } - - } catch (err) { - console.error(err); - setError("Failed to fetch titles."); - } finally { - setLoading(false); - setLoadingMore(false); - } + return { + items: result.data ?? [], + cursor: result.cursor ?? null, + }; }; - useEffect(() => { - fetchTitles(true); - }, [search]); - - if (loading) return <div className={styles.loader}>Loading...</div>; - if (error) return <div className={styles.error}>{error}</div>; - return ( - <div className={styles.container}> - <div className={styles.header}> - <h1>Titles</h1> + <div className="w-full min-h-screen bg-gray-50 p-6 text-black flex flex-col items-center"> + + <h1 className="text-4xl font-bold mb-6 text-center">Titles</h1> - <input - className={styles.searchInput} - placeholder="Search titles..." - value={search} - onChange={e => setSearch(e.target.value)} - /> - </div> - - <div className={styles.list}> - {titles.map((t) => ( - <div key={t.id} className={styles.card}> - {t.poster_id ? ( - <img - src={`/images/${t.poster_id}.png`} - alt="Poster" - className={styles.poster} - /> - ) : ( - <div className={styles.posterPlaceholder}>No Image</div> - )} - - <div className={styles.cardInfo}> - <h3 className={styles.titleName}>{t.name}</h3> - <p className={styles.meta}> - {t.release_year} • {t.release_season} - </p> - <p className={styles.rating}>Rating: {t.rating}</p> - <p className={styles.status}>{t.status}</p> - </div> - </div> - ))} - </div> - - {titles.length > 0 && ( - <button - className={styles.loadMore} - onClick={() => fetchTitles(false)} - disabled={loadingMore} - > - {loadingMore ? "Loading..." : "Load More"} - </button> - )} + <ListView<Title> + pageSize={PAGE_SIZE} + fetchItems={loadTitles} + searchPlaceholder="Search titles..." + renderItem={(title, layout) => + layout === "square" + ? <TitleCardSquare title={title} /> + : <TitleCardHorizontal title={title} /> + } + setSearch={setSearch} + /> </div> ); -}; +} -export default TitlesPage; diff --git a/modules/frontend/vite.config.ts b/modules/frontend/vite.config.ts index 4cfbdd0..6c261e6 100644 --- a/modules/frontend/vite.config.ts +++ b/modules/frontend/vite.config.ts @@ -1,9 +1,13 @@ import { defineConfig } from 'vite' import react from '@vitejs/plugin-react' +import tailwindcss from '@tailwindcss/vite' // https://vite.dev/config/ export default defineConfig({ - plugins: [react()], + plugins: [ + react(), + tailwindcss() + ], server: { host: '127.0.0.1', port: 8083,