intermediate merge

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

storage/postgres/queries.go

@@ -2,6 +2,27 @@ package postgres
 
 const (
 	queryListPackage = `
-select * from package;
+select 
+    id,
+    name,
+    url,
+	comments
+	--modules,
+	--issues,
+    from package;
+`
+	queryAddComment = `
+with insert_comm as (
+    insert into comment(text) values ($1) returning id
+)
+update package set comments = array_append(comments, (select * from insert_comm)) where id=$2;
+`
+	queryAddPackage = `
+insert into package(name, url, modules) values ($1, $2, $3);
+`
+	queryInsMsgGetIDs = `
+insert into module(name, version, last_version)  values
+%s
+returning id;
 `
 )

storage/postgres/storage.go

@@ -1,14 +1,21 @@
 package postgres
 
 import (
+	"context"
 	"database/sql"
 	"embed"
 	"errors"
-	"go.unistack.org/unistack-org/pkgdash/config"
+	"fmt"
+	pb "go.unistack.org/unistack-org/pkgdash/proto"
+	"strings"
 
 	"github.com/golang-migrate/migrate/v4"
-	"github.com/golang-migrate/migrate/v4/database/pgx"
+	mpgx "github.com/golang-migrate/migrate/v4/database/pgx"
 	"github.com/golang-migrate/migrate/v4/source/iofs"
+	"github.com/lib/pq"
+	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/unistack-org/pkgdash/config"
+	"go.unistack.org/unistack-org/pkgdash/models"
 )
 
 const (
@@ -31,8 +38,8 @@ func NewStorageFS(fs embed.FS) func(*sql.DB) (interface{}, error) {
 }
 
 func (s *Postgres) MigrateUp() error {
-	driver, err := pgx.WithInstance(s.db, &pgx.Config{
-		MigrationsTable: pgx.DefaultMigrationsTable,
+	driver, err := mpgx.WithInstance(s.db, &mpgx.Config{
+		MigrationsTable: mpgx.DefaultMigrationsTable,
 		DatabaseName:    config.ServiceName,
 	})
 	if err != nil {
@@ -57,8 +64,8 @@ func (s *Postgres) MigrateUp() error {
 }
 
 func (s *Postgres) MigrateDown() error {
-	driver, err := pgx.WithInstance(s.db, &pgx.Config{
-		MigrationsTable: pgx.DefaultMigrationsTable,
+	driver, err := mpgx.WithInstance(s.db, &mpgx.Config{
+		MigrationsTable: mpgx.DefaultMigrationsTable,
 		DatabaseName:    config.ServiceName,
 	})
 	if err != nil {
@@ -81,3 +88,150 @@ func (s *Postgres) MigrateDown() error {
 
 	return nil
 }
+
+func (s *Postgres) UpdatePackage(ctx context.Context, req *pb.UpdatePackageReq) error {
+	panic("need implement")
+}
+
+func (s *Postgres) ListPackage(ctx context.Context) (models.ListPackage, error) {
+	rows, err := s.db.QueryContext(ctx, queryListPackage)
+	if err != nil {
+		return nil, err
+	}
+
+	defer func() {
+		if err = rows.Close(); err != nil {
+			return
+		}
+		err = rows.Err()
+	}()
+
+	result := make([]*models.Package, 0)
+	for rows.Next() {
+		tmp := &models.Package{}
+		if err = rows.Scan(
+			&tmp.ID,
+			&tmp.Name,
+			&tmp.URL,
+			pq.Array(&tmp.Comments),
+		); err != nil {
+			return nil, err
+		}
+	}
+
+	return result, err
+}
+
+func (s *Postgres) AddComment(ctx context.Context, req *pb.AddCommentReq) error {
+	tx, err := s.db.BeginTx(ctx, nil)
+	if err != nil {
+		return err
+	}
+
+	defer func() {
+		if err != nil {
+			if rollbackErr := tx.Rollback(); rollbackErr != nil {
+				logger.Errorf(ctx, "AddComment: unable to rollback: %v", rollbackErr)
+			}
+		} else {
+			err = tx.Commit()
+		}
+	}()
+
+	res, err := tx.ExecContext(ctx, queryAddComment, req.Text, req.IdPackage.Value)
+	if err != nil {
+		return err
+	}
+
+	if aff, affErr := res.RowsAffected(); err != nil {
+		err = affErr
+	} else if aff == 0 {
+		err = errors.New("rows affected is 0")
+	}
+
+	return err
+}
+
+func (s *Postgres) AddPackage(ctx context.Context, req *pb.AddPackageReq) error {
+	tx, err := s.db.BeginTx(ctx, nil)
+	if err != nil {
+		return err
+	}
+
+	defer func() {
+		if err != nil {
+			if rollbackErr := tx.Rollback(); rollbackErr != nil {
+				logger.Errorf(ctx, "AddPackage: unable to rollback: %v", rollbackErr)
+			}
+		} else {
+			err = tx.Commit()
+		}
+	}()
+
+	res, err := tx.ExecContext(ctx, queryAddPackage, req.Name.Value, req.Url.Value, pq.Array(req.Modules))
+	if err != nil {
+		return err
+	}
+
+	if aff, affErr := res.RowsAffected(); err != nil {
+		err = affErr
+	} else if aff == 0 {
+		err = errors.New("rows affected is 0")
+	}
+
+	return err
+}
+
+func (s *Postgres) InsertButchModules(ctx context.Context, req []models.Module) ([]uint64, error) {
+	tx, err := s.db.BeginTx(ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		if err != nil {
+			if rollbackErr := tx.Rollback(); rollbackErr != nil {
+				logger.Errorf(ctx, "AddPackage: unable to rollback: %v", rollbackErr)
+			}
+		} else {
+			err = tx.Commit()
+		}
+	}()
+
+	query := generateQuery(req)
+
+	rows, err := tx.QueryContext(ctx, query)
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		if err = rows.Close(); err != nil {
+			return
+		}
+		err = rows.Err()
+	}()
+
+	result := make([]uint64, 0)
+	for rows.Next() {
+		tmp := uint64(0)
+		if err = rows.Scan(&tmp); err != nil {
+			return nil, err
+		}
+
+		result = append(result, tmp)
+	}
+
+	return result, err
+}
+
+func generateQuery(rsp []models.Module) string {
+	const pattern = `%c('%s', '%s', '%s')`
+	build := strings.Builder{}
+	comma := ' '
+	for i := range rsp {
+		str := fmt.Sprintf(pattern, comma, rsp[i].Name, rsp[i].Version, rsp[i].LastVersion)
+		build.WriteString(str)
+		comma = ','
+	}
+
+	return fmt.Sprintf(queryInsMsgGetIDs, build.String())
+}

storage/postgres/storage_test.go

@@ -0,0 +1,37 @@
+package postgres
+
+import (
+	"fmt"
+	"go.unistack.org/unistack-org/pkgdash/models"
+	"testing"
+)
+
+func TestGenerate(t *testing.T) {
+	m := []models.Module{
+		{
+			ID:          1,
+			Name:        "test",
+			Version:     "1.2.3",
+			Package:     2,
+			LastVersion: "23.31",
+		},
+		{
+			ID:          1,
+			Name:        "321test",
+			Version:     "1.3",
+			Package:     4,
+			LastVersion: "2111.31",
+		},
+		{
+			ID:          1,
+			Name:        "testabcd",
+			Version:     "1.2.3",
+			Package:     2,
+			LastVersion: "153453.31",
+		},
+	}
+
+	str := generateQuery(m)
+
+	fmt.Println(str)
+}