Add gRPC server implementation and database integration for marketplace and products

internal/db/sqlc.yaml

@@ -2,6 +2,6 @@ version: "1"
 packages:
   - name: "test"
     path: "../test/db/generated"
-    queries: "../test/db/queries.sql"
+    queries: "../test/db/query.sql"
     schema: "./schema.sql"
     engine: "postgresql"

internal/marketplace/adapter_grpc.go

@@ -0,0 +1,46 @@
+package marketplace
+
+import (
+	"context"
+	"github.com/jackc/pgx/v5"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+	pb "sipro-mps/api/generated/v1/marketplace"
+)
+
+// AdapterGRPC implements the gRPC server for the Marketplace service.
+type AdapterGRPC struct {
+	pb.UnimplementedMarketplaceServiceServer
+	repo Repository
+}
+
+func NewAdapterGRPC(repo Repository) *AdapterGRPC {
+	return &AdapterGRPC{
+		repo: repo,
+	}
+}
+func RegisterAdapterGRPC(server *grpc.Server) (*Repository, error) {
+	conn, err := pgx.Connect(context.Background(), "postgresql://postgres:GjitkeYf%5Beq@/sipro?host=/run/postgresql")
+	if err != nil {
+		return nil, err
+	}
+	repo := NewDBRepository(conn)
+	adapter := NewAdapterGRPC(repo)
+	pb.RegisterMarketplaceServiceServer(server, adapter)
+	return &repo, nil
+}
+
+func (g *AdapterGRPC) GetMarketplaceById(ctx context.Context, r *pb.GetMarketplaceByIdRequest) (*pb.Marketplace, error) {
+	mp, err := g.repo.GetMarketplaceByID(ctx, int(r.MarketplaceId))
+	if err != nil {
+		return nil, status.Errorf(codes.Internal, "failed to get marketplace by ID: %v", err)
+	}
+
+	return &pb.Marketplace{
+		Id:              uint64(uint32(mp.ID)),
+		BaseMarketplace: uint32(int32(mp.BaseMarketplace)),
+		AuthData:        mp.AuthData,
+		WarehouseId:     mp.WarehouseID,
+	}, nil
+}

internal/marketplace/db/db.go

@@ -0,0 +1,32 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.28.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,
+	}
+}

internal/marketplace/db/models.go

@@ -0,0 +1,17 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.28.0
+
+package db
+
+import (
+	"github.com/jackc/pgx/v5/pgtype"
+)
+
+type Marketplace struct {
+	ID              int32
+	BaseMarketplace int32
+	Name            string
+	AuthData        pgtype.Text
+	WarehouseID     pgtype.Text
+}

internal/marketplace/db/query.sql

@@ -0,0 +1,3 @@
+-- name: GetMarketplaceByID :one
+SELECT * FROM marketplaces
+WHERE id = $1 LIMIT 1;

internal/marketplace/db/query.sql.go

@@ -0,0 +1,28 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.28.0
+// source: query.sql
+
+package db
+
+import (
+	"context"
+)
+
+const getMarketplaceByID = `-- name: GetMarketplaceByID :one
+SELECT id, base_marketplace, name, auth_data, warehouse_id FROM marketplaces
+WHERE id = $1 LIMIT 1
+`
+
+func (q *Queries) GetMarketplaceByID(ctx context.Context, id int32) (Marketplace, error) {
+	row := q.db.QueryRow(ctx, getMarketplaceByID, id)
+	var i Marketplace
+	err := row.Scan(
+		&i.ID,
+		&i.BaseMarketplace,
+		&i.Name,
+		&i.AuthData,
+		&i.WarehouseID,
+	)
+	return i, err
+}

internal/marketplace/db/schema.sql

@@ -0,0 +1,9 @@
+create table marketplaces
+(
+    id                           serial
+        primary key,
+    base_marketplace             integer                                        not null,
+    name                         varchar                                        not null,
+    auth_data                    varchar,
+    warehouse_id                 varchar
+);

internal/marketplace/db/sqlc.yaml

@@ -0,0 +1,10 @@
+version: 2
+sql:
+  - engine: "postgresql"
+    queries: "query.sql"
+    schema: "schema.sql"
+    gen:
+      go:
+        package: "db"
+        out: "."
+        sql_package: "pgx/v5"

internal/marketplace/entities.go

@@ -0,0 +1,8 @@
+package marketplace
+
+type Marketplace struct {
+	ID              int    `json:"id"`
+	BaseMarketplace int    `json:"base_marketplace"`
+	AuthData        string `json:"auth_data"`
+	WarehouseID     string `json:"warehouse_id"`
+}

internal/marketplace/repository.go

@@ -0,0 +1,8 @@
+package marketplace
+
+import "context"
+
+type Repository interface {
+	// GetMarketplaceByID retrieves a marketplace by its ID.
+	GetMarketplaceByID(ctx context.Context, id int) (*Marketplace, error)
+}

internal/marketplace/repository_db.go

@@ -0,0 +1,29 @@
+package marketplace
+
+import (
+	"context"
+	"github.com/jackc/pgx/v5"
+	"sipro-mps/internal/marketplace/db"
+)
+
+type dbRepository struct {
+	conn *pgx.Conn
+}
+
+func NewDBRepository(conn *pgx.Conn) Repository {
+	return &dbRepository{conn: conn}
+}
+
+func (r *dbRepository) GetMarketplaceByID(ctx context.Context, id int) (*Marketplace, error) {
+	queries := db.New(r.conn)
+	marketplace, err := queries.GetMarketplaceByID(ctx, int32(id))
+	if err != nil {
+		return nil, err
+	}
+	return &Marketplace{
+		ID:              int(marketplace.ID),
+		BaseMarketplace: int(marketplace.BaseMarketplace),
+		AuthData:        marketplace.AuthData.String,
+		WarehouseID:     marketplace.WarehouseID.String,
+	}, nil
+}

internal/ozon/common.go

@@ -0,0 +1,35 @@
+package ozon
+
+import (
+	"errors"
+	"git.denco.store/fakz9/ozon-api-client/ozon"
+	"github.com/tidwall/gjson"
+	"net/http"
+	"sipro-mps/internal/marketplace"
+)
+
+func GetClientFromMarketplace(mp *marketplace.Marketplace) (*ozon.Client, error) {
+
+	authDataParsed := gjson.Parse(mp.AuthData)
+	clientIdResult := authDataParsed.Get("clientId")
+	apiKeyResult := authDataParsed.Get("clientToken")
+	if !clientIdResult.Exists() || !apiKeyResult.Exists() {
+		return nil, errors.New("auth data is not valid")
+	}
+	apiKey := apiKeyResult.String()
+	clientId := clientIdResult.String()
+	httpClient := &http.Client{
+		Transport: NewRateLimitTransport(),
+	}
+	opts := []ozon.ClientOption{
+		ozon.WithAPIKey(apiKey),
+		ozon.WithClientId(clientId),
+		ozon.WithHttpClient(httpClient),
+	}
+	client := ozon.NewClient(opts...)
+	if client == nil {
+		return nil, errors.New("failed to create ozon client")
+	}
+
+	return client, nil
+}

internal/ozon/products/adapter_grpc.go

@@ -0,0 +1,62 @@
+package products
+
+import (
+	"github.com/samber/lo"
+	"google.golang.org/grpc"
+	pb "sipro-mps/api/generated/v1/ozon/products"
+	"sipro-mps/internal/marketplace"
+	"sipro-mps/internal/ozon/products/mapping/generated"
+)
+
+type AdapterGRPC struct {
+	pb.UnimplementedProductsServiceServer
+	repo Repository
+}
+
+func NewAdapterGRPC(repo Repository) *AdapterGRPC {
+	return &AdapterGRPC{
+		repo: repo,
+	}
+}
+
+// RegisterAdapterGRPC registers the gRPC server for the Products service.
+func RegisterAdapterGRPC(server *grpc.Server, marketplaceRepo marketplace.Repository) (repo *Repository, err error) {
+	apiRepo := NewAPIRepository(marketplaceRepo)
+	adapter := NewAdapterGRPC(apiRepo)
+	pb.RegisterProductsServiceServer(server, adapter)
+	return &apiRepo, nil
+}
+
+func (g *AdapterGRPC) GetListOfProducts(req *pb.GetListOfProductsRequest, stream pb.ProductsService_GetListOfProductsServer) error {
+	ctx := stream.Context()
+	converter := generated.ConverterImpl{}
+	resultChan := make(chan []OzonProduct)
+	errChan := make(chan error)
+	g.repo.StreamAllProducts(ctx, 262, resultChan, errChan)
+	for {
+		select {
+		case <-ctx.Done():
+			return ctx.Err() // Handle context cancellation
+		case products, ok := <-resultChan:
+			if !ok {
+				return nil
+			}
+			protoProducts := lo.Map(products, func(product OzonProduct, _ int) *pb.Product {
+				return converter.ToProto(&product)
+			})
+			resp := &pb.GetListOfProductsResponse{
+				Products: protoProducts,
+			}
+			if err := stream.Send(resp); err != nil {
+				return err // Error sending response
+			}
+		case err, ok := <-errChan:
+			if !ok {
+				return nil // Exit loop when errChan is closed
+			}
+			if err != nil {
+				return err
+			}
+		}
+	}
+}

internal/ozon/products/entities.go

@@ -0,0 +1,5 @@
+package products
+
+import "git.denco.store/fakz9/ozon-api-client/ozon"
+
+type OzonProduct = ozon.ProductDetails

internal/ozon/products/mapping/converter.go

@@ -0,0 +1,20 @@
+package mapping
+
+import (
+	internal "git.denco.store/fakz9/ozon-api-client/ozon"
+	proto "sipro-mps/api/generated/v1/ozon/products"
+)
+
+//go:generate go run github.com/jmattheis/goverter/cmd/goverter gen  -g 'ignoreUnexported yes' .
+
+// goverter:converter
+// goverter:extend Int632ToInt64
+type Converter interface {
+	// goverter:ignore state sizeCache unknownFields
+
+	ToProto(details *internal.ProductDetails) *proto.Product
+}
+
+func Int632ToInt64(i int32) int64 {
+	return int64(i)
+}

internal/ozon/products/mapping/generated/generated.go

@@ -0,0 +1,56 @@
+// Code generated by github.com/jmattheis/goverter, DO NOT EDIT.
+//go:build !goverter
+
+package generated
+
+import (
+	ozon "git.denco.store/fakz9/ozon-api-client/ozon"
+	
+	products "sipro-mps/api/generated/v1/ozon/products"
+	ozon "git.denco.store/fakz9/ozon-api-client/ozon"
+)
+
+type ConverterImpl struct{}
+
+func (c *ConverterImpl) ToProto(source *ozon.ProductDetails) *products.Product {
+	var pProductsProduct *products.Product
+	if source != nil {
+		var productsProduct products.Product
+		productsProduct.Id = (*source).Id
+		productsProduct.OfferId = (*source).OfferId
+		productsProduct.Stocks = c.ozonProductDetailStockToPProductsProduct_Stocks((*source).Stocks)
+		if (*source).Barcodes != nil {
+			productsProduct.Barcodes = make([]string, len((*source).Barcodes))
+			for i := 0; i < len((*source).Barcodes); i++ {
+				productsProduct.Barcodes[i] = (*source).Barcodes[i]
+			}
+		}
+		productsProduct.Statuses = c.ozonProductDetailsStatusToPProductsProduct_Status((*source).Statuses)
+		pProductsProduct = &productsProduct
+	}
+	return pProductsProduct
+}
+func (c *ConverterImpl) ozonProductDetailStockStockToPProductsProduct_Stock(source ozon.ProductDetailStockStock) *products.Product_Stock {
+	var productsProduct_Stock products.Product_Stock
+	productsProduct_Stock.Present = mapping.Int632ToInt64(source.Present)
+	productsProduct_Stock.Reserved = mapping.Int632ToInt64(source.Reserved)
+	productsProduct_Stock.SKU = source.SKU
+	productsProduct_Stock.Source = source.Source
+	return &productsProduct_Stock
+}
+func (c *ConverterImpl) ozonProductDetailStockToPProductsProduct_Stocks(source ozon.ProductDetailStock) *products.Product_Stocks {
+	var productsProduct_Stocks products.Product_Stocks
+	if source.Stocks != nil {
+		productsProduct_Stocks.Stocks = make([]*products.Product_Stock, len(source.Stocks))
+		for i := 0; i < len(source.Stocks); i++ {
+			productsProduct_Stocks.Stocks[i] = c.ozonProductDetailStockStockToPProductsProduct_Stock(source.Stocks[i])
+		}
+	}
+	productsProduct_Stocks.HasStock = source.HasStock
+	return &productsProduct_Stocks
+}
+func (c *ConverterImpl) ozonProductDetailsStatusToPProductsProduct_Status(source ozon.ProductDetailsStatus) *products.Product_Status {
+	var productsProduct_Status products.Product_Status
+	productsProduct_Status.StatusName = source.StatusName
+	return &productsProduct_Status
+}

internal/ozon/products/repository.go

@@ -0,0 +1,8 @@
+package products
+
+import "context"
+
+type Repository interface {
+	GetAllProducts(ctx context.Context, marketplaceId int) ([]OzonProduct, error)
+	StreamAllProducts(ctx context.Context, marketplaceId int, resultChan chan<- []OzonProduct, errChan chan<- error)
+}

internal/ozon/products/repository_api.go

@@ -0,0 +1,118 @@
+package products
+
+import (
+	"context"
+	"fmt"
+	api "git.denco.store/fakz9/ozon-api-client/ozon"
+	"github.com/samber/lo"
+	"sipro-mps/internal/marketplace"
+	"sipro-mps/internal/ozon"
+	"sync"
+)
+
+type apiRepository struct {
+	marketplaceRepository marketplace.Repository
+}
+
+func NewAPIRepository(marketplaceRepository marketplace.Repository) Repository {
+	return &apiRepository{
+		marketplaceRepository: marketplaceRepository,
+	}
+}
+
+func fetchProductIds(ctx context.Context, client *api.Client, resultChan chan<- []int64, errChan chan<- error) {
+	defer close(resultChan)
+	lastId := ""
+	for {
+		resp, err := client.Products().GetListOfProducts(ctx, &api.GetListOfProductsParams{
+			Filter: api.GetListOfProductsFilter{Visibility: "ALL"},
+			LastId: lastId,
+			Limit:  1000,
+		})
+		if err != nil {
+			// dev
+			panic(err)
+			//errChan <- fmt.Errorf("fetching product IDs: %w", err)
+			return
+		}
+
+		items := resp.Result.Items
+		if len(items) == 0 {
+			break
+		}
+		productIds := lo.Map(items, func(item api.GetListOfProductsResultItem, _ int) int64 { return item.ProductId })
+
+		resultChan <- productIds
+
+		lastId = resp.Result.LastId
+		if lastId == "" {
+			break
+		}
+	}
+}
+
+func fetchProducts(ctx context.Context, client *api.Client, productIdsChan <-chan []int64, resultChan chan<- []OzonProduct, errChan chan<- error) {
+	defer close(resultChan)
+	defer close(errChan)
+	wg := sync.WaitGroup{}
+
+	for productIds := range productIdsChan {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			resp, err := client.Products().ListProductsByIDs(ctx, &api.ListProductsByIDsParams{
+				ProductId: productIds,
+			})
+			if err != nil {
+				// dev
+				panic(err)
+				//errChan <- fmt.Errorf("fetching products: %w", err)
+				return
+			}
+			items := resp.Items
+			resultChan <- items
+		}()
+	}
+	wg.Wait()
+}
+
+func (a *apiRepository) GetAllProducts(ctx context.Context, marketplaceId int) ([]OzonProduct, error) {
+	mp, err := a.marketplaceRepository.GetMarketplaceByID(ctx, marketplaceId)
+	if err != nil {
+		return nil, err
+	}
+	client, err := ozon.GetClientFromMarketplace(mp)
+	if err != nil {
+		return nil, err
+	}
+	items := []OzonProduct{}
+	productIdsChan := make(chan []int64)
+	producsChan := make(chan []OzonProduct)
+	errChan := make(chan error)
+	go fetchProductIds(ctx, client, productIdsChan, errChan)
+	go fetchProducts(ctx, client, productIdsChan, producsChan, errChan)
+	for products := range producsChan {
+		for _, product := range products {
+			fmt.Println(product.Name)
+			items = append(items, product)
+		}
+	}
+	fmt.Println(len(items))
+	return items, nil
+}
+
+func (a *apiRepository) StreamAllProducts(ctx context.Context, marketplaceId int, resultChan chan<- []OzonProduct, errChan chan<- error) {
+	mp, err := a.marketplaceRepository.GetMarketplaceByID(ctx, marketplaceId)
+	if err != nil {
+		errChan <- err
+		return
+	}
+	client, err := ozon.GetClientFromMarketplace(mp)
+	if err != nil {
+		errChan <- err
+		return
+	}
+	productIdsChan := make(chan []int64)
+	go fetchProductIds(ctx, client, productIdsChan, errChan)
+	go fetchProducts(ctx, client, productIdsChan, resultChan, errChan)
+}

internal/ozon/rate_limiter.go

@@ -0,0 +1,67 @@
+package ozon
+
+import (
+	"fmt"
+	"github.com/redis/rueidis"
+	"net/http"
+	"sipro-mps/internal/redis"
+	"time"
+)
+
+const (
+	windowSize = time.Second
+	rps        = 50 // requests per second
+)
+
+var (
+	rateLimiterScript = rueidis.NewLuaScript(`
+			local key = KEYS[1]
+			local now = tonumber(ARGV[1])
+			local window = tonumber(ARGV[2])
+			local limit = tonumber(ARGV[3])
+			
+			-- Удаляем старые записи вне окна времени
+			redis.call('ZREMRANGEBYSCORE', key, '-inf', now - window)
+			local count = redis.call('ZCARD', key)
+			
+			if count < limit then
+				-- Лимит не превышен, добавляем новую метку и устанавливаем TTL
+				redis.call('ZADD', key, now, now)
+				redis.call('EXPIRE', key, math.ceil(window / 1000000000))
+				return 0 -- Можно выполнять запрос сразу
+			else
+				-- Лимит превышен, находим самую старую метку
+				local oldest = redis.call('ZRANGE', key, 0, 0, 'WITHSCORES')[2]
+				-- Возвращаем время, которое нужно подождать до освобождения слота
+				return (tonumber(oldest) + window) - now
+			end
+	`)
+)
+
+type RateLimitTransport struct {
+	http.RoundTripper
+}
+
+func (t *RateLimitTransport) RoundTrip(req *http.Request) (*http.Response, error) {
+	fmt.Println(time.Now().Format("2006-01-02 15:04:05"))
+	ctx := req.Context()
+	clientId := req.Header.Get("Client-Id")
+	now := time.Now().UnixNano()
+
+	waitTime, err := rateLimiterScript.Exec(ctx, *redis.Client, []string{clientId}, []string{
+		fmt.Sprintf("%d", now),
+		fmt.Sprintf("%d", int64(windowSize)),
+		fmt.Sprintf("%d", 50),
+	}).ToInt64()
+	if err != nil {
+		return nil, fmt.Errorf("failed to execute rate limit script: %w", err)
+	}
+	if waitTime > 0 {
+		time.Sleep(time.Duration(waitTime))
+	}
+	return t.RoundTripper.RoundTrip(req)
+}
+func NewRateLimitTransport() *RateLimitTransport {
+
+	return &RateLimitTransport{RoundTripper: http.DefaultTransport}
+}

internal/redis/client.go

@@ -0,0 +1,36 @@
+package redis
+
+import (
+	"context"
+	"github.com/redis/rueidis"
+	"os"
+)
+
+var Client *rueidis.Client
+
+func InitClient(ctx context.Context) error {
+	var err error
+	host := os.Getenv("REDIS_HOST")
+	port := os.Getenv("REDIS_PORT")
+	password := os.Getenv("REDIS_PASSWORD")
+
+	client, err := rueidis.NewClient(rueidis.ClientOption{
+		InitAddress: []string{host + ":" + port},
+		Password:    password,
+	})
+	if err != nil {
+		return err
+	}
+	err = client.Do(ctx, client.B().Ping().Build()).Error()
+	if err != nil {
+		return err
+	}
+	Client = &client
+	return nil
+}
+
+func CloseClient() {
+	if Client != nil {
+		(*Client).Close()
+	}
+}

internal/test/adapters/http.go

@@ -1,19 +0,0 @@
-package adapters
-
-import "github.com/gofiber/fiber/v2"
-
-var (
-	router *fiber.Router = nil
-)
-
-func RegisterRouter(r *fiber.Router) {
-	router = r
-	if router == nil {
-		panic("router is nil")
-	}
-	(*router).Get("/test", test)
-}
-
-func test(c *fiber.Ctx) error {
-	return c.SendString("test")
-}

internal/test/db/generated/db.go

@@ -1,31 +0,0 @@
-// Code generated by sqlc. DO NOT EDIT.
-// versions:
-//   sqlc v1.28.0
-
-package test
-
-import (
-	"context"
-	"database/sql"
-)
-
-type DBTX interface {
-	ExecContext(context.Context, string, ...interface{}) (sql.Result, error)
-	PrepareContext(context.Context, string) (*sql.Stmt, error)
-	QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error)
-	QueryRowContext(context.Context, string, ...interface{}) *sql.Row
-}
-
-func New(db DBTX) *Queries {
-	return &Queries{db: db}
-}
-
-type Queries struct {
-	db DBTX
-}
-
-func (q *Queries) WithTx(tx *sql.Tx) *Queries {
-	return &Queries{
-		db: tx,
-	}
-}

internal/test/db/generated/models.go

@@ -1,10 +0,0 @@
-// Code generated by sqlc. DO NOT EDIT.
-// versions:
-//   sqlc v1.28.0
-
-package test
-
-type Test struct {
-	ID   int32
-	Data string
-}

internal/test/db/generated/queries.sql.go

@@ -1,55 +0,0 @@
-// Code generated by sqlc. DO NOT EDIT.
-// versions:
-//   sqlc v1.28.0
-// source: queries.sql
-
-package test
-
-import (
-	"context"
-)
-
-const createTest = `-- name: CreateTest :one
-INSERT INTO test (data) VALUES ($1) RETURNING id
-`
-
-func (q *Queries) CreateTest(ctx context.Context, data string) (int32, error) {
-	row := q.db.QueryRowContext(ctx, createTest, data)
-	var id int32
-	err := row.Scan(&id)
-	return id, err
-}
-
-const deleteTest = `-- name: DeleteTest :exec
-DELETE FROM test WHERE id = $1
-`
-
-func (q *Queries) DeleteTest(ctx context.Context, id int32) error {
-	_, err := q.db.ExecContext(ctx, deleteTest, id)
-	return err
-}
-
-const getTest = `-- name: GetTest :one
-SELECT id, data FROM test WHERE id = $1
-`
-
-func (q *Queries) GetTest(ctx context.Context, id int32) (Test, error) {
-	row := q.db.QueryRowContext(ctx, getTest, id)
-	var i Test
-	err := row.Scan(&i.ID, &i.Data)
-	return i, err
-}
-
-const updateTest = `-- name: UpdateTest :exec
-UPDATE test SET data = $1 WHERE id = $2
-`
-
-type UpdateTestParams struct {
-	Data string
-	ID   int32
-}
-
-func (q *Queries) UpdateTest(ctx context.Context, arg UpdateTestParams) error {
-	_, err := q.db.ExecContext(ctx, updateTest, arg.Data, arg.ID)
-	return err
-}

internal/test/db/queries.sql

@@ -1,11 +0,0 @@
--- name: CreateTest :one
-INSERT INTO test (data) VALUES ($1) RETURNING id;
-
--- name: GetTest :one
-SELECT id, data FROM test WHERE id = $1;
-
--- name: UpdateTest :exec
-UPDATE test SET data = $1 WHERE id = $2;
-
--- name: DeleteTest :exec
-DELETE FROM test WHERE id = $1;

internal/test/repository.go

@@ -1,42 +0,0 @@
-package test
-
-import (
-	generated "Sipro-Marketplaces/internal/test/db/generated"
-	"context"
-	"database/sql"
-)
-
-type Repository interface {
-	Create(ctx context.Context, data string) (int32, error)
-	Get(ctx context.Context, id int32) (generated.Test, error)
-	Update(ctx context.Context, id int32, data string) error
-	Delete(ctx context.Context, id int32) error
-}
-
-type repository struct {
-	db      *sql.DB
-	queries *generated.Queries
-}
-
-func NewRepository(db *sql.DB) Repository {
-	return &repository{
-		db:      db,
-		queries: generated.New(db),
-	}
-}
-
-func (r *repository) Create(ctx context.Context, data string) (int32, error) {
-	return r.queries.CreateTest(ctx, data)
-}
-
-func (r *repository) Get(ctx context.Context, id int32) (generated.Test, error) {
-	return r.queries.GetTest(ctx, id)
-}
-
-func (r *repository) Update(ctx context.Context, id int32, data string) error {
-	return r.queries.UpdateTest(ctx, generated.UpdateTestParams{Data: data, ID: id})
-}
-
-func (r *repository) Delete(ctx context.Context, id int32) error {
-	return r.queries.DeleteTest(ctx, id)
-}

internal/test/service.go

@@ -1,37 +0,0 @@
-package test
-
-import (
-	generated "Sipro-Marketplaces/internal/test/db/generated"
-	"context"
-)
-
-type Service interface {
-	Create(ctx context.Context, data string) (int32, error)
-	Get(ctx context.Context, id int32) (generated.Test, error)
-	Update(ctx context.Context, id int32, data string) error
-	Delete(ctx context.Context, id int32) error
-}
-
-type service struct {
-	repo Repository
-}
-
-func NewService(repo Repository) Service {
-	return &service{repo: repo}
-}
-
-func (s *service) Create(ctx context.Context, data string) (int32, error) {
-	return s.repo.Create(ctx, data)
-}
-
-func (s *service) Get(ctx context.Context, id int32) (generated.Test, error) {
-	return s.repo.Get(ctx, id)
-}
-
-func (s *service) Update(ctx context.Context, id int32, data string) error {
-	return s.repo.Update(ctx, id, data)
-}
-
-func (s *service) Delete(ctx context.Context, id int32) error {
-	return s.repo.Delete(ctx, id)
-}