First attempt at reducing cyclomatic complexity of the codebase

Makefile

@@ -41,6 +41,11 @@ tools:
 	$(GO) install golang.org/x/vuln/cmd/govulncheck@latest
 	@echo "Tools installed to \"$$(go env GOPATH)/bin\". Ensure it is on your PATH."
 
+.PHONY: cyclo
+cyclo:
+	@command -v gocyclo >/dev/null 2>&1 || { echo "Installing gocyclo..."; $(GO) install github.com/fzipp/gocyclo/cmd/gocyclo@latest; }
+	gocyclo -over 15 ./...
+
 check: fmt vet lint test
 
 ci: tidy check vuln

README.md

@@ -3,9 +3,9 @@
 A powerful command-line tool that bridges the gap between local Markdown files and Jira, enabling seamless story and task management with bidirectional synchronization.
 
 [![CI](https://github.com/karolswdev/ticketr/actions/workflows/ci.yml/badge.svg)](https://github.com/karolswdev/ticketr/actions/workflows/ci.yml)
-[![Go Version](https://img.shields.io/badge/Go-1.22%2B-00ADD8?style=flat&logo=go)](https://go.dev)
+[![Go Version](https://img.shields.io/badge/Go-1.24%2B-00ADD8?style=flat&logo=go)](https://go.dev)
 [![PkgGoDev](https://pkg.go.dev/badge/github.com/karolswdev/ticketr)](https://pkg.go.dev/github.com/karolswdev/ticketr)
-[![Go Report Card](https://goreportcard.com/badge/github.com/karolswdev/ticketr)](https://goreportcard.com/report/github.com/karolswdev/ticketr)
+[![Go Report Card](https://goreportcard.com/badge/github.com/karolswdev/ticketr?refresh=1)](https://goreportcard.com/report/github.com/karolswdev/ticketr)
 [![License](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE)
 [![Docker](https://img.shields.io/badge/Docker-Ready-2496ED?style=flat&logo=docker)](Dockerfile)
 
@@ -317,11 +317,7 @@ Ticketr maintains a `.ticketr.state` file to track content hashes and support in
 ticketr pull --strategy=local-wins
 ```
 
-<<<<<<< HEAD
 Push is now state-aware by default. The CLI uses the `PushService` so unchanged tickets are skipped. In `--dry-run` mode, Ticketr shows all intended operations without writing to JIRA or the file/state.
-=======
-Note: State-aware skipping for `push` exists in the `PushService`, but the default CLI path currently uses `TicketService` (always processes all tickets). A future release will wire `push` to the state-aware flow. Until then, all tickets are processed during `push`.
->>>>>>> origin/main
 
 The `.ticketr.state` file is environment-specific and ignored by default via `.gitignore`.
 

internal/adapters/filesystem/file_repository.go

@@ -28,148 +28,88 @@ func (r *FileRepository) GetTickets(filepath string) ([]domain.Ticket, error) {
 
 // SaveTickets writes tickets to a file in the new TICKET format
 func (r *FileRepository) SaveTickets(filepath string, tickets []domain.Ticket) error {
-	file, err := os.Create(filepath)
-	if err != nil {
-		return fmt.Errorf("failed to create file: %w", err)
-	}
-	defer func() { _ = file.Close() }()
-
-	writer := bufio.NewWriter(file)
-	w := func(n int, err error) error {
-		if err != nil {
-			return err
-		}
-		return nil
-	}
-
-	for i, ticket := range tickets {
-		// Write ticket heading with Jira ID if present
-		if ticket.JiraID != "" {
-			if err := w(fmt.Fprintf(writer, "# TICKET: [%s] %s\n", ticket.JiraID, ticket.Title)); err != nil {
-				return err
-			}
-		} else {
-			if err := w(fmt.Fprintf(writer, "# TICKET: %s\n", ticket.Title)); err != nil {
-				return err
-			}
-		}
-		if err := w(fmt.Fprintln(writer)); err != nil {
-			return err
-		}
-
-		// Write description
-		if ticket.Description != "" {
-			if err := w(fmt.Fprintln(writer, "## Description")); err != nil {
-				return err
-			}
-			if err := w(fmt.Fprintln(writer, ticket.Description)); err != nil {
-				return err
-			}
-			if err := w(fmt.Fprintln(writer)); err != nil {
-				return err
-			}
-		}
-
-		// Write fields
-		if len(ticket.CustomFields) > 0 {
-			if err := w(fmt.Fprintln(writer, "## Fields")); err != nil {
-				return err
-			}
-			for key, value := range ticket.CustomFields {
-				if err := w(fmt.Fprintf(writer, "%s: %s\n", key, value)); err != nil {
-					return err
-				}
-			}
-			if err := w(fmt.Fprintln(writer)); err != nil {
-				return err
-			}
-		}
-
-		// Write acceptance criteria
-		if len(ticket.AcceptanceCriteria) > 0 {
-			if err := w(fmt.Fprintln(writer, "## Acceptance Criteria")); err != nil {
-				return err
-			}
-			for _, ac := range ticket.AcceptanceCriteria {
-				if err := w(fmt.Fprintf(writer, "- %s\n", ac)); err != nil {
-					return err
-				}
-			}
-			if err := w(fmt.Fprintln(writer)); err != nil {
-				return err
-			}
-		}
-
-		// Write tasks
-		if len(ticket.Tasks) > 0 {
-			if err := w(fmt.Fprintln(writer, "## Tasks")); err != nil {
-				return err
-			}
-			for _, task := range ticket.Tasks {
-				// Write task with Jira ID if present
-				if task.JiraID != "" {
-					if err := w(fmt.Fprintf(writer, "- [%s] %s\n", task.JiraID, task.Title)); err != nil {
-						return err
-					}
-				} else {
-					if err := w(fmt.Fprintf(writer, "- %s\n", task.Title)); err != nil {
-						return err
-					}
-				}
-
-				// Write task description (indented)
-				if task.Description != "" {
-					if err := w(fmt.Fprintln(writer, "  ## Description")); err != nil {
-						return err
-					}
-					// Indent description lines
-					if err := w(fmt.Fprintf(writer, "  %s\n", task.Description)); err != nil {
-						return err
-					}
-					if err := w(fmt.Fprintln(writer)); err != nil {
-						return err
-					}
-				}
-
-				// Write task fields (indented)
-				if len(task.CustomFields) > 0 {
-					if err := w(fmt.Fprintln(writer, "  ## Fields")); err != nil {
-						return err
-					}
-					for key, value := range task.CustomFields {
-						if err := w(fmt.Fprintf(writer, "  %s: %s\n", key, value)); err != nil {
-							return err
-						}
-					}
-					if err := w(fmt.Fprintln(writer)); err != nil {
-						return err
-					}
-				}
-
-				// Write task acceptance criteria (indented)
-				if len(task.AcceptanceCriteria) > 0 {
-					if err := w(fmt.Fprintln(writer, "  ## Acceptance Criteria")); err != nil {
-						return err
-					}
-					for _, ac := range task.AcceptanceCriteria {
-						if err := w(fmt.Fprintf(writer, "  - %s\n", ac)); err != nil {
-							return err
-						}
-					}
-					if err := w(fmt.Fprintln(writer)); err != nil {
-						return err
-					}
-				}
-			}
-		}
-
-		// Add spacing between tickets
-		if i < len(tickets)-1 {
-			if err := w(fmt.Fprintln(writer)); err != nil {
-				return err
-			}
-		}
-	}
-
-	return writer.Flush()
+    file, err := os.Create(filepath)
+    if err != nil { return fmt.Errorf("failed to create file: %w", err) }
+    defer func() { _ = file.Close() }()
+
+    writer := bufio.NewWriter(file)
+    w := func(n int, err error) error { if err != nil { return err }; return nil }
+
+    writeHeader := func(t domain.Ticket) error {
+        if t.JiraID != "" {
+            return w(fmt.Fprintf(writer, "# TICKET: [%s] %s\n", t.JiraID, t.Title))
+        }
+        return w(fmt.Fprintf(writer, "# TICKET: %s\n", t.Title))
+    }
+    writeDescription := func(desc string) error {
+        if desc == "" { return nil }
+        if err := w(fmt.Fprintln(writer, "## Description")); err != nil { return err }
+        if err := w(fmt.Fprintln(writer, desc)); err != nil { return err }
+        return w(fmt.Fprintln(writer))
+    }
+    writeFields := func(fields map[string]string) error {
+        if len(fields) == 0 { return nil }
+        if err := w(fmt.Fprintln(writer, "## Fields")); err != nil { return err }
+        for k, v := range fields {
+            if err := w(fmt.Fprintf(writer, "%s: %s\n", k, v)); err != nil { return err }
+        }
+        return w(fmt.Fprintln(writer))
+    }
+    writeAcceptance := func(criteria []string) error {
+        if len(criteria) == 0 { return nil }
+        if err := w(fmt.Fprintln(writer, "## Acceptance Criteria")); err != nil { return err }
+        for _, ac := range criteria {
+            if err := w(fmt.Fprintf(writer, "- %s\n", ac)); err != nil { return err }
+        }
+        return w(fmt.Fprintln(writer))
+    }
+    writeTask := func(t domain.Task) error {
+        if t.JiraID != "" {
+            if err := w(fmt.Fprintf(writer, "- [%s] %s\n", t.JiraID, t.Title)); err != nil { return err }
+        } else {
+            if err := w(fmt.Fprintf(writer, "- %s\n", t.Title)); err != nil { return err }
+        }
+        if t.Description != "" {
+            if err := w(fmt.Fprintln(writer, "  ## Description")); err != nil { return err }
+            if err := w(fmt.Fprintf(writer, "  %s\n", t.Description)); err != nil { return err }
+            if err := w(fmt.Fprintln(writer)); err != nil { return err }
+        }
+        if len(t.CustomFields) > 0 {
+            if err := w(fmt.Fprintln(writer, "  ## Fields")); err != nil { return err }
+            for k, v := range t.CustomFields {
+                if err := w(fmt.Fprintf(writer, "  %s: %s\n", k, v)); err != nil { return err }
+            }
+            if err := w(fmt.Fprintln(writer)); err != nil { return err }
+        }
+        if len(t.AcceptanceCriteria) > 0 {
+            if err := w(fmt.Fprintln(writer, "  ## Acceptance Criteria")); err != nil { return err }
+            for _, ac := range t.AcceptanceCriteria {
+                if err := w(fmt.Fprintf(writer, "  - %s\n", ac)); err != nil { return err }
+            }
+            if err := w(fmt.Fprintln(writer)); err != nil { return err }
+        }
+        return nil
+    }
+    writeTasks := func(tasks []domain.Task) error {
+        if len(tasks) == 0 { return nil }
+        if err := w(fmt.Fprintln(writer, "## Tasks")); err != nil { return err }
+        for _, t := range tasks {
+            if err := writeTask(t); err != nil { return err }
+        }
+        return nil
+    }
+
+    for i, ticket := range tickets {
+        if err := writeHeader(ticket); err != nil { return err }
+        if err := w(fmt.Fprintln(writer)); err != nil { return err }
+        if err := writeDescription(ticket.Description); err != nil { return err }
+        if err := writeFields(ticket.CustomFields); err != nil { return err }
+        if err := writeAcceptance(ticket.AcceptanceCriteria); err != nil { return err }
+        if err := writeTasks(ticket.Tasks); err != nil { return err }
+
+        if i < len(tickets)-1 {
+            if err := w(fmt.Fprintln(writer)); err != nil { return err }
+        }
+    }
+    return writer.Flush()
 }