feat: transfer issue mapping to env file

Author: ardiien

.env

@@ -1,3 +1,4 @@
-BRCHA_HOST=
-BRCHA_EMAIL=
-BRCHA_TOKEN=
+BRCHA_HOST=""
+BRCHA_EMAIL=""
+BRCHA_TOKEN=""
+BRCHA_MAPPING="build:0;chore:0;ci:0;docs:0;feat:0;fix:0;pref:0;refactor:0;revert:0;style:0;test:0"

branch/branch.go

@@ -16,7 +16,7 @@ const (
 func BuildName(bt Type, jiraIssue network.JiraIssue) string {
     log.Info().Println("preparing branch")
     branchType := bt.ToString()
-    log.Debug().Printf("build name: issue %s[%s] with branch type of %s", jiraIssue.Key, jiraIssue.Id, branchType)
+    log.Debug().Printf("build name: issue %s[%s] with branch type of '%s'", jiraIssue.Key, jiraIssue.Fields.Type.Id, branchType)
 
     var buffer strings.Builder
 

command/command.go

@@ -34,14 +34,14 @@ func HasBranch(branchName string) bool {
     err := exec.Command("git", "branch", "--contains", branchName).Run()
 
     doesExist := err == nil
-    log.Info().Printf("%s exists locally - %t", branchName, doesExist)
+    log.Info().Printf("%s exists locally = %t", branchName, doesExist)
 
     return doesExist
 }
 
 func Checkout(branchName string, hasBranch bool) (string, error) {
     args := []string{"checkout", branchName}
-    log.Info().Println("executing checkout")
+    log.Info().Println("executing 'checkout'")
     log.Debug().Printf("checkout: args: %s", args)
 
     if !hasBranch {

common/convert.go

@@ -6,43 +6,9 @@ import (
     "brcha/log"
     "brcha/network"
     "fmt"
-    "strings"
 )
 
-func ConvertIssueToBranchType(issueType network.IssueType) (branch.Type, error) {
-    switch issueType.Id {
-    case issue.Build:
-        return branch.BUILD, nil
-    case issue.Chore:
-        return branch.CHORE, nil
-    case issue.Ci:
-        return branch.CI, nil
-    case issue.Docs:
-        return branch.DOCS, nil
-    case issue.Feat:
-        return branch.FEAT, nil
-    case issue.Fix:
-        return branch.FIX, nil
-    case issue.Perf:
-        return branch.PERF, nil
-    case issue.Refactor:
-        return branch.REFACTOR, nil
-    case issue.Revert:
-        return branch.REVERT, nil
-    case issue.Style:
-        return branch.STYLE, nil
-    case issue.Test:
-        return branch.TEST, nil
-    default:
-        return branch.NULL, fmt.Errorf("convert: unsupported issue type %s(%s)", issueType.Name, issueType.Id)
-    }
-}
-
 func ConvertUserInputToBranchType(input string) (branch.Type, error) {
-    if len(input) == 0 {
-        return branch.NULL, nil
-    }
-
     switch input {
     case "build", "b":
         return branch.BUILD, nil
@@ -71,34 +37,25 @@ func ConvertUserInputToBranchType(input string) (branch.Type, error) {
     }
 }
 
-func ConvertIssueTypesToMap(issueTypes []network.IssueType) (map[string]branch.Type, error) {
+func ConvertIssueTypesToMap(localTypes string, issueTypes []network.IssueType) (map[string]branch.Type, error) {
+    local := issue.ParseIssueMapping(localTypes)
     issueMap := make(map[string]branch.Type)
 
-    var buffer strings.Builder
-    for idx, i := range issueTypes {
-        _, hasIgnored := issue.Ignored[i.Id]
-        if hasIgnored {
-            buffer.WriteString("- ")
-            buffer.WriteString(i.Name)
-            buffer.WriteString("[")
-            buffer.WriteString(i.Id)
-            buffer.WriteString("]")
-            if idx != len(issueTypes)-1 {
-                buffer.WriteString("\n")
-            }
+    for _, i := range issueTypes {
+        id, ok := local[i.Id]
+        if !ok {
+            log.Warn().Println(fmt.Errorf("convert: unsupported issue type %s[%s]", i.Name, i.Id))
             continue
         }
 
-        name, err := ConvertIssueToBranchType(i)
+        name, err := ConvertUserInputToBranchType(id)
         if err != nil {
-            log.Warn().Printf("convert: map network to local: %v", err)
+            log.Warn().Println(err)
             continue
         }
 
         issueMap[i.Id] = name
     }
 
-    log.Warn().Printf("ignored issue types:\n%s", buffer.String())
-
     return issueMap, nil
 }

issue/issue.go

@@ -1,34 +1,29 @@
 package issue
 
-type Type struct {
-    Id   string
-    Name string
-}
-
-// TODO: replace with your <issue-types>
-const (
-    Build    = "1000"
-    Chore    = "2000"
-    Ci       = "3000"
-    Docs     = "4000"
-    Feat     = "5000"
-    Fix      = "6000"
-    Perf     = "7000"
-    Refactor = "8000"
-    Revert   = "9000"
-    Style    = "1010"
-    Test     = "1100"
+import (
+    "brcha/log"
+    "strings"
 )
 
-// TODO: replace with your ignored <issue-types>
-var Ignored = buildMap()
+func ParseIssueMapping(raw string) map[string]string {
+    result := make(map[string]string)
+
+    types := strings.Split(raw, ";")
+    for _, t := range types {
+        elements := strings.Split(t, ":")
 
-func buildMap() map[string]bool {
-    builder := make(map[string]bool)
+        commitType := elements[0]
+        values := strings.Split(elements[1], ",")
 
-    builder["4444"] = true // Subtask
-    // builder["3333"] = true // Bug
-    // etc.
+        for _, v := range values {
+            if v == "0" {
+                continue
+            }
+            
+            result[v] = commitType
+        }
+    }
 
-    return builder
+    log.Debug().Printf("issue: parsed: %v", result)
+    return result
 }

main.go

@@ -4,8 +4,8 @@ import (
     "brcha/branch"
     "brcha/command"
     "brcha/common"
-    "brcha/network"
     "brcha/log"
+    "brcha/network"
     "flag"
     "fmt"
     "net/http"
@@ -125,8 +125,9 @@ func parseBranchType(input *common.Input) (branch.Type, error) {
     return branch.NULL, nil
 }
 
-func convertIssueTypeToBranchType(jiraIssueType network.IssueType, types []network.IssueType) (branch.Type, error) {
-    mappedIssueTypes, err := common.ConvertIssueTypesToMap(types)
+func convertIssueTypeToBranchType(jiraIssueType network.IssueType, networkTypes []network.IssueType) (branch.Type, error) {
+    localTypes := os.Getenv("BRCHA_MAPPING")
+    mappedIssueTypes, err := common.ConvertIssueTypesToMap(localTypes, networkTypes)
     if err != nil {
         return branch.NULL, fmt.Errorf("get issue type: %w", err)
     }