refactor: reduce addToCommit complexity

splits out the addToCommit function
into smaller deciding functions to
avoid mulitple conditionals during
addition of has to list

Author: barelyhuman

go.mod

@@ -2,6 +2,6 @@ module github.com/barelyhuman/commitlog
 
 go 1.15
 
-require (	
+require (
 	github.com/go-git/go-git/v5 v5.2.0
 )

go.sum

@@ -12,9 +12,6 @@ github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4=
 github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E=
 github.com/go-git/go-billy/v5 v5.0.0 h1:7NQHvd9FVid8VL4qVUMm8XifBK+2xCoZ2lSk0agRrHM=
 github.com/go-git/go-billy/v5 v5.0.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0=
-github.com/go-git/go-git v1.0.0 h1:YcN9iDGDoXuIw0vHls6rINwV416HYa0EB2X+RBsyYp4=
-github.com/go-git/go-git v4.7.0+incompatible h1:+W9rgGY4DOKKdX2x6HxSR7HNeTxqiKrOvKnuittYVdA=
-github.com/go-git/go-git v4.7.0+incompatible/go.mod h1:6+421e08gnZWn30y26Vchf7efgYLe4dl5OQbBSUXShE=
 github.com/go-git/go-git-fixtures/v4 v4.0.2-0.20200613231340-f56387b50c12/go.mod h1:m+ICp2rF3jDhFgEZ/8yziagdT1C+ZpZcrJjappBCDSw=
 github.com/go-git/go-git/v5 v5.2.0 h1:YPBLG/3UK1we1ohRkncLjaXWLW+HKp5QNM/jTli2JgI=
 github.com/go-git/go-git/v5 v5.2.0/go.mod h1:kh02eMX+wdqqxgNMEyq8YgwlIOsDOa9homkUq1PoTMs=

logcategory.go

@@ -41,15 +41,15 @@ func (logs logsByCategory) Setup() {
 }
 
 // printLog - loops through the collected logs to write them to string builder
-func (logs logContainer) printLog(out *strings.Builder, title string, skipped bool) {
-	if !logs.include {
+func (container logContainer) printLog(out *strings.Builder, title string, skipped bool) {
+	if !container.include {
 		return
 	}
-	if len(logs.commits) > 0 {
+	if len(container.commits) > 0 {
 		if !skipped {
 			out.WriteString(fmt.Sprintf("\n\n## %s  \n", title))
 		}
-		for _, item := range logs.commits {
+		for _, item := range container.commits {
 			out.WriteString(item + "\n")
 		}
 	}
@@ -80,59 +80,41 @@ func (logs *logsByCategory) ToMarkdown(skipped bool) string {
 
 // AddCommit - Add a commit to the needed logContainer based on skip and include flag
 func (logs *logsByCategory) AddCommit(key, commitHash string, skip bool) {
-	var addCommitToContainer *logContainer
+	addCommitToContainer := logs.findContainerByKey(key)
+	if !addCommitToContainer.canAddToContainer(skip) {
+		addCommitToContainer = &logs.UNCLASSIFIED
+	}
+	if addCommitToContainer != nil {
+		addCommitToContainer.commits = append(addCommitToContainer.commits, commitHash)
+	}
+}
+
+func (logs *logsByCategory) findContainerByKey(key string) *logContainer {
 	switch key {
 	case "ci":
-		if logs.CI.include && !skip {
-			addCommitToContainer = &logs.CI
-		} else if skip && logs.CI.include {
-			addCommitToContainer = &logs.UNCLASSIFIED
-		}
+		return &logs.CI
 	case "fix":
-		if logs.FIX.include && !skip {
-			addCommitToContainer = &logs.FIX
-		} else if skip && logs.FIX.include {
-			addCommitToContainer = &logs.UNCLASSIFIED
-		}
+		return &logs.FIX
 	case "refactor":
-		if logs.REFACTOR.include && !skip {
-			addCommitToContainer = &logs.REFACTOR
-		} else if skip && logs.REFACTOR.include {
-			addCommitToContainer = &logs.UNCLASSIFIED
-		}
+		return &logs.REFACTOR
 	case "feat", "feature":
-		if logs.FEATURE.include && !skip {
-			addCommitToContainer = &logs.FEATURE
-		} else if skip && logs.FEATURE.include {
-			addCommitToContainer = &logs.UNCLASSIFIED
-		}
+		return &logs.FEATURE
 	case "docs":
-		if logs.DOCS.include && !skip {
-			addCommitToContainer = &logs.DOCS
-		} else if skip && logs.DOCS.include {
-			addCommitToContainer = &logs.UNCLASSIFIED
-		}
+		return &logs.DOCS
 	case "test":
-		if logs.TEST.include && !skip {
-			addCommitToContainer = &logs.TEST
-		} else if skip && logs.TEST.include {
-			addCommitToContainer = &logs.UNCLASSIFIED
-		}
+		return &logs.TEST
 	case "chore":
-		if logs.CHORE.include && !skip {
-			addCommitToContainer = &logs.CHORE
-		} else if skip && logs.CHORE.include {
-			addCommitToContainer = &logs.UNCLASSIFIED
-		}
+		return &logs.CHORE
 	default:
-		if logs.OTHER.include && !skip {
-			addCommitToContainer = &logs.OTHER
-		} else if skip && logs.OTHER.include {
-			addCommitToContainer = &logs.UNCLASSIFIED
-		}
+		return &logs.OTHER
 	}
+}
 
-	if addCommitToContainer != nil {
-		addCommitToContainer.commits = append(addCommitToContainer.commits, commitHash)
+func (container *logContainer) canAddToContainer(skip bool) bool {
+	if container.include && !skip {
+		return true
+	} else if skip && container.include {
+		return false
 	}
+	return true
 }