wip: refresher logic

api/httpserver/handle_tickets.go

@@ -20,7 +20,7 @@ type Ticket struct {
 func (s *Server) GetTickets(c *gin.Context) {
 	ctx := c.Request.Context()
 
-	tickets, err := s.ticketService.FetchTicketsFromDB(ctx)
+	tickets, err := s.ticketService.FetchTicketsFromJira(ctx)
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, c.Error(err))
 

background/assetrefresher/refresh.go

@@ -3,6 +3,7 @@ package assetrefresher
 import (
 	"context"
 	"fossa/pkg/logging"
+	"fossa/service/asset"
 	"fossa/service/ticket"
 	"time"
 )
@@ -12,30 +13,59 @@ const updateInterval = 10 * time.Second
 type Refresher struct {
 	tkr           *time.Ticker
 	ticketService *ticket.Service
+	assetService  *asset.Service
 	logger        *logging.Logger
 }
 
-func New(ticketService *ticket.Service, logger *logging.Logger) *Refresher {
+func New(ticketService *ticket.Service, assetService *asset.Service, logger *logging.Logger) *Refresher {
 	return &Refresher{
 		tkr:           time.NewTicker(updateInterval),
 		ticketService: ticketService,
+		assetService:  assetService,
 		logger:        logger,
 	}
 }
 
 func (r *Refresher) Run(ctx context.Context) {
-	r.logger.Info("Asset refresher started")
+	r.logger.Debug("Asset refresher started")
 
 	for range r.tkr.C {
-		r.logger.Info("Asset refresher tick")
-
-		err := r.ticketService.GenerateTexts(ctx)
+		err := r.generateAssets(ctx)
 		if err != nil {
-			r.logger.Error("Error generating texts: %v", err)
+			r.logger.Error("generate texts: %v", err)
 		}
 	}
 }
 
 func (r *Refresher) Stop() {
 	r.tkr.Stop()
 }
+
+func (r *Refresher) generateAssets(ctx context.Context) error {
+	r.logger.Debug("Asset refresher triggered")
+
+	/*
+		TODO:
+		- calculate hash on json/yaml in Jira
+		- compare hash with cached value, proceed if hash changed
+	*/
+
+	tickets, err := r.ticketService.FetchTicketsFromJira(ctx)
+	if err != nil {
+		return err
+	}
+
+	for _, t := range tickets {
+		if t.TemplateVariables == nil {
+			continue
+		}
+
+		_, err := r.assetService.GenerateAssetsForTicket(ctx, t.TemplateVariables)
+		if err != nil {
+			r.logger.Error("generate assets %s: %v", t.ID, err)
+			continue
+		}
+	}
+
+	return nil
+}

go.mod

@@ -6,6 +6,7 @@ require (
 	github.com/Masterminds/squirrel v1.5.4
 	github.com/andygrunwald/go-jira v1.17.0
 	github.com/gin-gonic/gin v1.9.1
+	github.com/goccy/go-yaml v1.19.0
 	github.com/ilyakaznacheev/cleanenv v1.5.0
 	github.com/ncruces/go-sqlite3 v0.20.1
 	github.com/pkg/errors v0.9.1

go.sum

@@ -32,6 +32,8 @@ github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg
 github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
 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-yaml v1.19.0 h1:EmkZ9RIsX+Uq4DYFowegAuJo8+xdX3T/2dwNPXbxEYE=
+github.com/goccy/go-yaml v1.19.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
 github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI=
 github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=

main.go

@@ -7,6 +7,7 @@ import (
 	"fossa/pkg/jiraclient"
 	"fossa/pkg/logging"
 	"fossa/pkg/sqlite"
+	"fossa/service/asset"
 	"fossa/service/template"
 	"fossa/service/ticket"
 	"log"
@@ -50,6 +51,7 @@ func main() {
 
 	templatesService := template.NewService(templatesRepository)
 	ticketsService := ticket.NewService(ticketsRepository, templatesService, jiraClient)
+	assetService := asset.NewService(nil, templatesService)
 
 	httpServer := httpserver.New(cfg.HTTPServer, ticketsService)
 
@@ -59,6 +61,7 @@ func main() {
 
 	backgroundAssetRefresher := assetrefresher.New(
 		ticketsService,
+		assetService,
 		logger,
 	)
 

pkg/jiraclient/client.go

@@ -40,7 +40,7 @@ func New(config Config) (*Client, error) {
 	return &Client{client: client}, nil
 }
 
-func (c *Client) FetchTicketsFromJira(ctx context.Context) ([]ticket.Ticket, error) {
+func (c *Client) FetchTickets(ctx context.Context) ([]ticket.Ticket, error) {
 	fmt.Println("Fetching tickets from Jira")
 
 	options := &jira.SearchOptionsV2{
@@ -74,3 +74,21 @@ func (c *Client) FetchTicketsFromJira(ctx context.Context) ([]ticket.Ticket, err
 	return tt, nil
 
 }
+
+func (c *Client) FetchTicketDetails(ctx context.Context, ticketID string) (*ticket.Ticket, error) {
+	issue, resp, err := c.client.Issue.GetWithContext(ctx, ticketID, nil)
+	if err != nil {
+		return nil, errors.Wrap(err, "fetch issue")
+	}
+	if resp.StatusCode != 200 {
+		return nil, errors.Errorf("non-200 response: %d", resp.StatusCode)
+	}
+
+	t := &ticket.Ticket{
+		ID:          issue.Key,
+		Title:       issue.Fields.Summary,
+		Description: issue.Fields.Description,
+	}
+
+	return t, nil
+}

repository/assetrepo/sql.go

@@ -0,0 +1,66 @@
+package assetrepo
+
+import (
+	"context"
+	"database/sql"
+	"fmt"
+
+	"fossa/service/asset"
+
+	sq "github.com/Masterminds/squirrel"
+	"github.com/pkg/errors"
+)
+
+const (
+	assetsTable = "assets"
+)
+
+type SQLite struct {
+	database *sql.DB
+}
+
+func NewSQLite(database *sql.DB) *SQLite {
+	return &SQLite{
+		database: database,
+	}
+}
+
+func (s *SQLite) FetchAssetsByTicketID(ctx context.Context, ticketID string) ([]asset.Asset, error) {
+	query, values, _ := sq.
+		Select(
+			"id",
+			"job_type",
+			"step",
+			"contents",
+		).
+		From(assetsTable).
+		OrderByClause(fmt.Sprintf("%s %s", "job_type", "ASC")).
+		PlaceholderFormat(sq.Dollar).
+		ToSql()
+
+	results := []asset.Asset{}
+
+	rows, err := s.database.QueryContext(ctx, query, values...)
+	if err != nil {
+		return nil, errors.Wrap(err, "send query")
+	}
+
+	defer rows.Close()
+
+	for rows.Next() {
+		var t asset.Asset
+
+		if err := rows.Scan(
+			&t.ID,
+			&t.JobType,
+			&t.Step,
+			&t.Content,
+		); err != nil {
+			return nil, errors.Wrap(err, "iterate rows")
+		}
+
+		results = append(results, t)
+	}
+
+	return results, nil
+}

repository/templaterepo/sql.go

@@ -3,12 +3,8 @@ package templaterepo
 import (
 	"context"
 	"database/sql"
-	"fmt"
 
 	"fossa/service/template"
-
-	sq "github.com/Masterminds/squirrel"
-	"github.com/pkg/errors"
 )
 
 const (
@@ -25,42 +21,53 @@ func NewSQLite(database *sql.DB) *SQLite {
 	}
 }
 
-func (s *SQLite) FetchTemplatesByName(ctx context.Context, name string) ([]template.Template, error) {
-	query, values, _ := sq.
-		Select(
-			"id",
-			"name",
-			"step",
-			"contents",
-		).
-		From(templatesTable).
-		OrderByClause(fmt.Sprintf("%s %s", "name", "ASC")).
-		PlaceholderFormat(sq.Dollar).
-		ToSql()
+func (s *SQLite) FetchTemplatesByJobType(ctx context.Context, jobType string) ([]template.Template, error) {
+	// query, values, _ := sq.
+	// 	Select(
+	// 		"id",
+	// 		"job_type",
+	// 		"step",
+	// 		"contents",
+	// 	).
+	// 	From(templatesTable).
+	// 	OrderByClause(fmt.Sprintf("%s %s", "job_type", "ASC")).
+	// 	PlaceholderFormat(sq.Dollar).
+	// 	ToSql()
 
 	results := []template.Template{}
 
-	rows, err := s.database.QueryContext(ctx, query, values...)
-	if err != nil {
-		return nil, errors.Wrap(err, "cannot perform select query")
-	}
+	// rows, err := s.database.QueryContext(ctx, query, values...)
+	// if err != nil {
+	// 	return nil, errors.Wrap(err, "cannot perform select query")
+	// }
+
+	// defer rows.Close()
 
-	defer rows.Close()
+	// for rows.Next() {
+	// 	var t template.Template
 
-	for rows.Next() {
-		var t template.Template
+	// 	if err := rows.Scan(
+	// 		&t.ID,
+	// 		&t.JobType,
+	// 		&t.Step,
+	// 		&t.Content,
+	// 	); err != nil {
+	// 		return nil, errors.Wrap(err, "cannot perform select query")
+	// 	}
 
-		if err := rows.Scan(
-			&t.ID,
-			&t.Name,
-			&t.Step,
-			&t.Content,
-		); err != nil {
-			return nil, errors.Wrap(err, "cannot perform select query")
-		}
+	// 	results = append(results, t)
+	// }
 
-		results = append(results, t)
+	// TODO: remove mock data
+
+	t := template.Template{
+		ID:      "1",
+		JobType: "install_optics_and_connect_two_cenic_devices",
+		Step:    "installation",
+		Content: "example-content:\n A device: {{ device_a_port }}",
 	}
 
+	results = append(results, t)
+
 	return results, nil
 }

repository/ticketrepo/sql.go

@@ -62,5 +62,14 @@ func (s *SQLite) FetchTickets(ctx context.Context) ([]ticket.Ticket, error) {
 		results = append(results, t)
 	}
 
+	// TODO: remove mock data
+	t := ticket.Ticket{
+		ID:          "NET-1000",
+		Title:       "Install Optics and Connect Two CENIC Devices",
+		Description: "Please install the optics and connect the two CENIC devices as per the instructions.\n\nFor automation:\n  device_a_port: ge-1/0/1\n  device_b_port: ge-1/0/2\n  interface_speed: 10G",
+	}
+
+	results = append(results, t)
+
 	return results, nil
 }

service/asset/domain.go

@@ -0,0 +1,12 @@
+package asset
+
+import "fossa/pkg/history"
+
+// business domain entities
+type Asset struct {
+	ID      string
+	JobType string
+	Step    string
+	Content string
+	history.HistoryData
+}

service/asset/int_assetrepo.go

@@ -0,0 +1,9 @@
+package asset
+
+import (
+	"context"
+)
+
+type AssetRepository interface {
+	FetchAssetsByTicketID(ctx context.Context, ticketID string) ([]Asset, error)
+}

service/asset/service.go

@@ -0,0 +1,29 @@
+package asset
+
+import (
+	"context"
+	"fossa/service/template"
+)
+
+type ticketAssets map[string]Asset // map key: step
+
+type Service struct {
+	repository      AssetRepository
+	templateService *template.Service
+}
+
+func NewService(repository AssetRepository, templateService *template.Service) *Service {
+	return &Service{
+		repository:      repository,
+		templateService: templateService}
+}
+
+func (s *Service) GenerateAssetsForTicket(ctx context.Context, vars map[string]string) (map[string]Asset, error) {
+	res := make(map[string]Asset)
+
+	// for _, step := range vars {
+
+	// }
+
+	return res, nil
+}