1/4 endpoint

Author: bobturanov

api/ozonmp/srv_verification_api/v1/srv_verification_api.proto

@@ -4,6 +4,8 @@ package ozonmp.srv_verification_api.v1;
 
 import "validate/validate.proto";
 import "google/api/annotations.proto";
+import "google/protobuf/timestamp.proto";
+
 
 option go_package = "github.com/ozonmp/srv-verification-api/pkg/srv-verification-api;srv_verification_api";
 
@@ -36,6 +38,8 @@ service SrvVerificationApiService {
 message Verification {
   uint64 id  = 1;
   string name = 2;
+  google.protobuf.Timestamp created_at = 3;
+  google.protobuf.Timestamp updated_at = 4;
 }
 
 message DescribeVerificationV1Request {

cmd/grpc-server/main.go

@@ -58,7 +58,6 @@ func main() {
 	}
 	defer db.Close()
 
-	*migration = false // todo: need to delete this line for homework-4
 	if *migration {
 		if err = goose.Up(db.DB, cfg.Database.Migrations); err != nil {
 			log.Error().Err(err).Msg("Migration failed")

config.yml

@@ -32,10 +32,10 @@ status:
   versionPath: /version
 
 database:
-  host: postgres
+  host: localhost
   port: 5432
-  user: docker
-  password: docker
+  user: postgres
+  password: postgres
   name: srv_verification_api
   sslmode: disable
   migrations: migrations

go.mod

@@ -4,24 +4,28 @@ go 1.16
 
 require (
 	github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
+	github.com/Masterminds/squirrel v1.5.1
 	github.com/gammazero/workerpool v1.1.2
 	github.com/golang/mock v1.4.4
 	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.6.0
 	github.com/jackc/pgx/v4 v4.13.0
 	github.com/jmoiron/sqlx v1.3.4
-	github.com/lib/pq v1.10.3
+	github.com/lib/pq v1.10.4
+	github.com/mattn/go-sqlite3 v1.14.9 // indirect
 	github.com/opentracing/opentracing-go v1.2.0
 	github.com/ozonmp/srv-verification-api/pkg/srv-verification-api v0.0.0-00010101000000-000000000000
-	github.com/pressly/goose/v3 v3.1.0
+	github.com/pressly/goose/v3 v3.3.1
 	github.com/prometheus/client_golang v1.11.0
 	github.com/rs/zerolog v1.24.0
 	github.com/stretchr/testify v1.7.0
 	github.com/uber/jaeger-client-go v2.29.1+incompatible
 	github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
+	golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa // indirect
 	golang.org/x/tools v0.1.7 // indirect
 	google.golang.org/grpc v1.41.0
+	google.golang.org/protobuf v1.27.1
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 )
 

go.sum

@@ -2,6 +2,7 @@ package api
 
 import (
 	"context"
+	"time"
 
 	"github.com/ozonmp/srv-verification-api/internal/model"
 	pb "github.com/ozonmp/srv-verification-api/pkg/srv-verification-api"
@@ -21,7 +22,7 @@ func (o *verificationAPI) CreateVerificationV1(
 		return nil, status.Error(codes.InvalidArgument, err.Error())
 	}
 
-	verification := model.Verification{Name: req.VerificationName}
+	verification := model.Verification{Name: req.VerificationName, CreatedAt: time.Now(), UpdatedAt: time.Now()}
 	if err := o.repo.AddVerification(ctx, &verification); err != nil {
 		log.Error().Err(err).Msg("DescribeVerificationV1 -- failed")
 

internal/api/api_create_verification.go

@@ -2,12 +2,12 @@ package api
 
 import (
 	"context"
-
 	"github.com/ozonmp/srv-verification-api/internal/model"
 	pb "github.com/ozonmp/srv-verification-api/pkg/srv-verification-api"
 	"github.com/rs/zerolog/log"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
 func (o *verificationAPI) ListVerificationV1(
@@ -45,5 +45,7 @@ func convertVerificationToPb(verification *model.Verification) *pb.Verification
 	return &pb.Verification{
 		Id:   verification.ID,
 		Name: verification.Name,
+		CreatedAt: timestamppb.New(verification.CreatedAt),
+		UpdatedAt: timestamppb.New(verification.UpdatedAt),
 	}
 }

internal/api/api_list_verification.go

@@ -1,8 +1,12 @@
 package model
 
+import "time"
+
 type Verification struct {
 	ID   uint64 `db:"id"`
 	Name string `db:"name"`
+	CreatedAt time.Time `db:"created_at"`
+	UpdatedAt time.Time `db:"updated_at"`
 }
 
 type EventType uint8

internal/model/verification.go

@@ -2,14 +2,17 @@ package repo
 
 import (
 	"context"
+	"database/sql"
 	"errors"
 
+	sq "github.com/Masterminds/squirrel"
 	"github.com/jmoiron/sqlx"
 
 	"github.com/ozonmp/srv-verification-api/internal/model"
 )
 
-var errNotImplementedMethod = errors.New("method is not implemented")
+var ErrNotFound = errors.New("no rows in database for the given query")
+var errInternalMethod = errors.New("internal error")
 
 // Repo is DAO for Verification
 type Repo interface {
@@ -30,17 +33,33 @@ func NewRepo(db *sqlx.DB, batchSize uint) Repo {
 }
 
 func (r *repo) DescribeVerification(ctx context.Context, verificationID uint64) (*model.Verification, error) {
-	return nil, errNotImplementedMethod
+	query, args, err := sq.Select("*").PlaceholderFormat(sq.Dollar).From("verification").Where(sq.Eq{"id": verificationID}).ToSql()
+
+	if err != nil{
+		return nil, err
+	}
+	verification := model.Verification{}
+	err = r.db.GetContext(ctx, &verification, query, args...)
+
+	switch err {
+	case nil:
+		return &verification, nil
+	case sql.ErrNoRows:
+		return nil, ErrNotFound
+	default:
+		return nil, errInternalMethod
+	}
+
 }
 
 func (r *repo) AddVerification(ctx context.Context, verification *model.Verification) error {
-	return errNotImplementedMethod
+	return errInternalMethod
 }
 
 func (r *repo) ListVerification(ctx context.Context) ([]*model.Verification, error) {
-	return nil, errNotImplementedMethod
+	return nil, errInternalMethod
 }
 
 func (r *repo) RemoveVerification(ctx context.Context, verificationID uint64) (status bool, err error) {
-	return false, errNotImplementedMethod
+	return false, errInternalMethod
 }

internal/repo/repo.go

@@ -0,0 +1,11 @@
+-- +goose Up
+CREATE TABLE verification (
+  id BIGSERIAL PRIMARY KEY,
+  name VARCHAR NOT NULL,
+  created_at TIMESTAMP NOT NULL,
+  updated_at TIMESTAMP NOT NULL,
+  is_removed BOOLEAN NOT NULL DEFAULT FALSE
+);
+
+-- +goose Down
+DROP TABLE verification;