use k in star & fork

po3rin · po3rin · commit c93cf8836a4f · 2019-10-12T20:55:47.000+09:00
diff --git a/go.mod b/go.mod
@@ -3,13 +3,14 @@ module github.com/po3rin/github_link_creator
 go 1.12
 
 require (
+	github.com/aws/aws-sdk-go v1.25.11
 	github.com/certifi/gocertifi v0.0.0-20190506164543-d2eda7129713 // indirect
 	github.com/evalphobia/logrus_sentry v0.8.2
 	github.com/getsentry/raven-go v0.2.0
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
 	github.com/jessevdk/go-assets v0.0.0-20160921144138-4f4301a06e15
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
-	github.com/pkg/errors v0.8.1 // indirect
+	github.com/pkg/errors v0.8.1
 	github.com/po3rin/img2circle v0.1.3
 	github.com/po3rin/txt2img v0.0.0-20190712152905-47c0a1bd247a
 	github.com/sirupsen/logrus v1.4.2
diff --git a/go.sum b/go.sum
@@ -1,5 +1,7 @@
 github.com/aws/aws-sdk-go v1.20.19 h1:RQDLGGlcffQzAceEXGdMu+uGGPGhNu+vNG3BrUZAMPI=
 github.com/aws/aws-sdk-go v1.20.19/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
+github.com/aws/aws-sdk-go v1.25.11 h1:wUivbsVOH3LpHdC3Rl5i+FLHfg4sOmYgv4bvHe7+/Pg=
+github.com/aws/aws-sdk-go v1.25.11/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/certifi/gocertifi v0.0.0-20190506164543-d2eda7129713 h1:UNOqI3EKhvbqV8f1Vm3NIwkrhq388sGCeAH2Op7w0rc=
 github.com/certifi/gocertifi v0.0.0-20190506164543-d2eda7129713/go.mod h1:GJKEexRPVJrBSOjoqN5VNOIKJ5Q3RViH6eu3puDRwx4=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
diff --git a/pipeline/export_test.go b/pipeline/export_test.go
@@ -0,0 +1,3 @@
+package pipeline
+
+var ExportNum2StringWithSINortion = num2StringWithSINortion
diff --git a/pipeline/pipeline.go b/pipeline/pipeline.go
@@ -79,16 +79,24 @@ func ProcessingImg(ctx context.Context, r Repoitory, userName string, repoName s
 			}
 		}
 	}
-	img, err = processing.DrawText(img, config.Star, strconv.Itoa(repo.Stars))
+	img, err = processing.DrawText(img, config.Star, num2StringWithSINortion(repo.Stars))
 	if err != nil {
 		l.Error(err)
 		return nil, err
 	}
-	img, err = processing.DrawText(img, config.Fork, strconv.Itoa(repo.Forks))
+	img, err = processing.DrawText(img, config.Fork, num2StringWithSINortion(repo.Forks))
 	if err != nil {
 		l.Error(err)
 		return nil, err
 	}
 
 	return img, nil
 }
+
+func num2StringWithSINortion(i int) string {
+	if i > 999 {
+		i = i / 1000
+		return strconv.Itoa(i) + "k"
+	}
+	return strconv.Itoa(i)
+}
diff --git a/pipeline/pipeline_test.go b/pipeline/pipeline_test.go
@@ -50,3 +50,38 @@ func TestProcessingImg(t *testing.T) {
 		t.Fatalf("unexpected error, %v", err.Error())
 	}
 }
+
+func TestNum2StringWithSINortion(t *testing.T) {
+	tests := []struct {
+		name string
+		num  int
+		want string
+	}{
+		{
+			name: "1000000",
+			num:  1000000,
+			want: "1000k",
+		},
+		{
+			name: "100",
+			num:  100,
+			want: "100",
+		},
+		{
+			name: "123456",
+			num:  123456,
+			want: "123k",
+		},
+	}
+
+	for _, tt := range tests {
+		tt := tt
+		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
+			got := pipeline.ExportNum2StringWithSINortion(tt.num)
+			if got != tt.want {
+				t.Errorf("unexpected value. want: %v, got: %v\n", tt.want, got)
+			}
+		})
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+package pipeline`
	`2`	`+`
	`3`	`+var ExportNum2StringWithSINortion = num2StringWithSINortion`
Original file line number	Diff line number	Diff line change
`@@ -79,16 +79,24 @@ func ProcessingImg(ctx context.Context, r Repoitory, userName string, repoName s`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`	`}`
`82`		`- img, err = processing.DrawText(img, config.Star, strconv.Itoa(repo.Stars))`
	`82`	`+ img, err = processing.DrawText(img, config.Star, num2StringWithSINortion(repo.Stars))`
`83`	`83`	`if err != nil {`
`84`	`84`	`l.Error(err)`
`85`	`85`	`return nil, err`
`86`	`86`	`}`
`87`		`- img, err = processing.DrawText(img, config.Fork, strconv.Itoa(repo.Forks))`
	`87`	`+ img, err = processing.DrawText(img, config.Fork, num2StringWithSINortion(repo.Forks))`
`88`	`88`	`if err != nil {`
`89`	`89`	`l.Error(err)`
`90`	`90`	`return nil, err`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`return img, nil`
`94`	`94`	`}`
	`95`	`+`
	`96`	`+func num2StringWithSINortion(i int) string {`
	`97`	`+ if i > 999 {`
	`98`	`+ i = i / 1000`
	`99`	`+ return strconv.Itoa(i) + "k"`
	`100`	`+ }`
	`101`	`+ return strconv.Itoa(i)`
	`102`	`+}`