Merge pull request #148 from duck8823/rearchitecture

RE: ARCHITECTURE

.gitignore

@@ -13,6 +13,6 @@ vendor
 # app
 /config.yml
 release-notes.txt
-duci
+/duci
 duci.exe
 dist

application/config.go

@@ -31,6 +31,11 @@ func (s maskString) MarshalJSON() ([]byte, error) {
 	return []byte(`"***"`), nil
 }
 
+// ToString returns unmasked string.
+func (s maskString) String() string {
+	return string(s)
+}
+
 // Configuration of application.
 type Configuration struct {
 	Server *Server `yaml:"server" json:"server"`

application/config_test.go

@@ -56,7 +56,7 @@ func TestConfiguration_Set(t *testing.T) {
 		expected := "hello world"
 
 		// and
-		os.Setenv("TEST_CONF_ENV", expected)
+		_ = os.Setenv("TEST_CONF_ENV", expected)
 
 		//
 		err := application.Config.Set("testdata/config_with_env.yml")
@@ -131,3 +131,19 @@ func TestMaskString_MarshalJSON(t *testing.T) {
 		t.Errorf("wont masked string, but got '%s'", actual)
 	}
 }
+
+func TestMaskString_String(t *testing.T) {
+	// given
+	want := "hoge"
+
+	// and
+	sut := application.MaskString(want)
+
+	// when
+	got := sut.String()
+
+	// then
+	if !cmp.Equal(got, want) {
+		t.Errorf("must be equal, but %+v", cmp.Diff(got, want))
+	}
+}

application/context.go

@@ -0,0 +1,37 @@
+package application
+
+import (
+	"context"
+	"fmt"
+	"github.com/duck8823/duci/domain/model/job"
+	"github.com/duck8823/duci/domain/model/job/target/github"
+	"net/url"
+)
+
+var ctxKey = "duci_job"
+
+// BuildJob represents once of job
+type BuildJob struct {
+	ID           job.ID
+	TargetSource *github.TargetSource
+	TaskName     string
+	TargetURL    *url.URL
+}
+
+// ContextWithJob set parent context BuildJob and returns it.
+func ContextWithJob(parent context.Context, job *BuildJob) context.Context {
+	return context.WithValue(parent, &ctxKey, job)
+}
+
+// BuildJobFromContext extract BuildJob from context
+func BuildJobFromContext(ctx context.Context) (*BuildJob, error) {
+	val := ctx.Value(&ctxKey)
+	if val == nil {
+		return nil, fmt.Errorf("context value '%s' should not be null", ctxKey)
+	}
+	buildJob, ok := val.(*BuildJob)
+	if !ok {
+		return nil, fmt.Errorf("invalid type in context '%s'", ctxKey)
+	}
+	return buildJob, nil
+}

application/context_test.go

@@ -0,0 +1,70 @@
+package application_test
+
+import (
+	"context"
+	"github.com/duck8823/duci/application"
+	"github.com/duck8823/duci/domain/model/job"
+	"github.com/google/go-cmp/cmp"
+	"github.com/google/uuid"
+	"testing"
+)
+
+func TestContextWithJob(t *testing.T) {
+	// given
+	want := &application.BuildJob{
+		ID: job.ID(uuid.New()),
+	}
+
+	// and
+	ctx := application.ContextWithJob(context.Background(), want)
+
+	// when
+	got := ctx.Value(application.GetCtxKey())
+
+	// then
+	if !cmp.Equal(got, want) {
+		t.Errorf("must be equal, but %+v", cmp.Diff(got, want))
+	}
+}
+
+func TestBuildJobFromContext(t *testing.T) {
+	t.Run("with value", func(t *testing.T) {
+		// given
+		want := &application.BuildJob{
+			ID: job.ID(uuid.New()),
+		}
+
+		sut := context.WithValue(context.Background(), application.GetCtxKey(), want)
+
+		// when
+		got, err := application.BuildJobFromContext(sut)
+
+		// then
+		if err != nil {
+			t.Errorf("error must be nil, but got %+v", err)
+		}
+
+		// and
+		if !cmp.Equal(got, want) {
+			t.Errorf("must be equal, but %+v", cmp.Diff(got, want))
+		}
+	})
+
+	t.Run("without value", func(t *testing.T) {
+		sut := context.Background()
+
+		// when
+		got, err := application.BuildJobFromContext(sut)
+
+		// then
+		if err == nil {
+			t.Error("error must not be nil")
+		}
+
+		// and
+		if got != nil {
+			t.Errorf("must be nil, but got %+v", got)
+		}
+	})
+
+}