updates

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

internal/storage/sqlite/storage.go

@@ -3,7 +3,6 @@ package sqlite
 import (
 	"context"
 	"fmt"
-	"strings"
 	"time"
 
 	"git.unistack.org/unistack-org/pkgdash/internal/models"
@@ -29,6 +28,34 @@ func NewStorage() func(*sqlx.DB) interface{} {
 	}
 }
 
+func (s *Sqlite) PackagesModulesCreate(ctx context.Context, pkg *models.Package, modules []*models.Module) error {
+	tx, err := s.db.BeginTxx(ctx, nil)
+	if err != nil {
+		return err
+	}
+
+	for _, mod := range modules {
+		err = tx.GetContext(ctx, mod, queryModulesCreate, mod.Name, mod.Version)
+		if err != nil {
+			_ = tx.Rollback()
+			return err
+		}
+		_, err = tx.ExecContext(ctx, queryPackagesModulesCreate, pkg.ID, mod.ID)
+		if err != nil {
+			_ = tx.Rollback()
+			return err
+		}
+
+	}
+
+	if err = tx.Commit(); err != nil {
+		_ = tx.Rollback()
+		return err
+	}
+
+	return nil
+}
+
 func (s *Sqlite) PackagesDelete(ctx context.Context, req *pb.PackagesDeleteReq) error {
 	return fmt.Errorf("need implement")
 }
@@ -59,6 +86,17 @@ func (s *Sqlite) PackagesList(ctx context.Context, req *pb.PackagesListReq) ([]*
 	return packages, nil
 }
 
+func (s *Sqlite) PackagesModules(ctx context.Context, req *pb.PackagesModulesReq) ([]*models.Module, error) {
+	var modules []*models.Module
+
+	err := s.db.SelectContext(ctx, &modules, queryPackagesModules, req.Package)
+	if err != nil {
+		return nil, err
+	}
+
+	return modules, nil
+}
+
 func (s *Sqlite) CommentsDelete(ctx context.Context, req *pb.CommentsDeleteReq) error {
 	return nil
 }
@@ -96,6 +134,36 @@ func (s *Sqlite) PackagesProcess(ctx context.Context, td time.Duration) ([]*mode
 	return packages, nil
 }
 
+func (s *Sqlite) PackagesUpdateLastCheck(ctx context.Context, packages []*models.Package) error {
+	tx, err := s.db.BeginTxx(ctx, nil)
+	if err != nil {
+		return err
+	}
+	for _, pkg := range packages {
+		if _, err = tx.ExecContext(ctx, queryPackagesUpdateLastCheck, pkg.ID); err != nil {
+			tx.Rollback()
+			return err
+		}
+	}
+
+	if err = tx.Commit(); err != nil {
+		tx.Rollback()
+		return err
+	}
+
+	return nil
+}
+
+func (s *Sqlite) ModulesProcess(ctx context.Context, td time.Duration) ([]*models.Module, error) {
+	var modules []*models.Module
+	err := s.db.SelectContext(ctx, &modules, queryModulesProcess, td.Seconds())
+	if err != nil {
+		return nil, err
+	}
+
+	return modules, nil
+}
+
 func (s *Sqlite) PackagesCreate(ctx context.Context, req *pb.PackagesCreateReq) (*models.Package, error) {
 	pkg := &models.Package{}
 	err := s.db.GetContext(ctx, pkg, queryPackagesCreate, req.Name, req.Url)
@@ -106,25 +174,20 @@ func (s *Sqlite) PackagesCreate(ctx context.Context, req *pb.PackagesCreateReq)
 	return pkg, nil
 }
 
-func (s *Sqlite) PackagesModulesCreate(ctx context.Context, pkg *models.Package, modules []*models.Module) error {
+func (s *Sqlite) ModulesCreate(ctx context.Context, modules []*models.Module) error {
 	tx, err := s.db.BeginTxx(ctx, nil)
 	if err != nil {
 		return err
 	}
 
 	for _, mod := range modules {
-		err = tx.GetContext(ctx, mod, queryModulesCreate, mod.Name, mod.Version, mod.LastVersion, mod.Package)
+		err = tx.GetContext(ctx, mod, queryModulesCreate, mod.Name, mod.Version)
 		if err != nil {
 			_ = tx.Rollback()
 			return err
 		}
 	}
 
-	if _, err = tx.ExecContext(ctx, queryPackagesModulesCount, pkg.ID, len(modules)); err != nil {
-		_ = tx.Rollback()
-		return err
-	}
-
 	if err = tx.Commit(); err != nil {
 		_ = tx.Rollback()
 		return err
@@ -134,41 +197,12 @@ func (s *Sqlite) PackagesModulesCreate(ctx context.Context, pkg *models.Package,
 }
 
 func (s *Sqlite) ModulesList(ctx context.Context, req *pb.ModulesListReq) ([]*models.Module, error) {
-	var err error
 	var modules []*models.Module
 
-	rows, err := s.db.QueryContext(ctx, queryModulesList)
+	err := s.db.SelectContext(ctx, &modules, queryModulesList)
 	if err != nil {
 		return nil, err
 	}
-	defer func() {
-		if err = rows.Close(); err != nil {
-			return
-		}
-		err = rows.Err()
-	}()
-
-	for ; rows.Err() == nil; rows.Next() {
-		mod := &models.Module{}
-		if err = rows.Scan(
-			&mod.ID,
-			&mod.Name,
-			&mod.Version,
-			&mod.LastVersion,
-		); err != nil {
-			return nil, err
-		}
-
-		modules = append(modules, mod)
-	}
-
-	if err = rows.Err(); err != nil {
-		return nil, err
-	}
-
-	if err = rows.Close(); err != nil {
-		return nil, err
-	}
 
 	return modules, nil
 }
@@ -183,16 +217,3 @@ func (s *Sqlite) CommentsList(ctx context.Context, req *pb.CommentsListReq) ([]*
 
 	return comments, nil
 }
-
-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())
-}