refactor opts (#12)

Change-Id: I524db06a724a788cbf954a6178ce3c482f98b21c
ycydsxy · May 19, 2021 · d3630c0 · d3630c0
1 parent b4d3335
commit d3630c0
Show file tree

Hide file tree

Showing 22 changed files with 627 additions and 513 deletions.
diff --git a/assembler.go b/assembler.go
@@ -13,7 +13,7 @@ type taskAssembler interface {
 }
 
 type taskAssemblerImp struct {
-	config *TaskConfig
+	*options
 }
 
 func (s *taskAssemblerImp) AssembleTask(ctxIn context.Context, taskDef *TaskDefinition, arg interface{}) (*Task, error) {
@@ -39,7 +39,7 @@ func (s *taskAssemblerImp) AssembleTask(ctxIn context.Context, taskDef *TaskDefi
 		task.Argument = argBytes
 	}
 	if ctxIn != nil {
-		ctxBytes, err := taskDef.ctxMarshaler(s.config).MarshalCtx(ctxIn)
+		ctxBytes, err := taskDef.ctxMarshaler(s.ctxMarshaler).MarshalCtx(ctxIn)
 		if err != nil {
 			return nil, fmt.Errorf("get ctxBytes failed, err: %w", err)
 		}
@@ -50,7 +50,7 @@ func (s *taskAssemblerImp) AssembleTask(ctxIn context.Context, taskDef *TaskDefi
 }
 
 func (s *taskAssemblerImp) DisassembleTask(taskDef *TaskDefinition, task *Task) (context.Context, interface{}, error) {
-	ctxIn, err := taskDef.ctxMarshaler(s.config).UnmarshalCtx(task.Context)
+	ctxIn, err := taskDef.ctxMarshaler(s.ctxMarshaler).UnmarshalCtx(task.Context)
 	if err != nil {
 		return nil, nil, fmt.Errorf("unmarshal task context error: %w", err)
 	}

diff --git a/assembler_test.go b/assembler_test.go
@@ -20,7 +20,7 @@ func (e *testErrCtxMarshaler) UnmarshalCtx(bytes []byte) (context.Context, error
 
 func Test_taskAssemblerImp_AssembleTask(t *testing.T) {
 	convey.Convey("Test_taskAssemblerImp_AssembleTask", t, func() {
-		tass := taskAssemblerImp{config: &TaskConfig{CtxMarshaler: &defaultCtxMarshaler{}}}
+		tass := taskAssemblerImp{options: &options{ctxMarshaler: &defaultCtxMarshaler{}}}
 		convey.Convey("normal", func() {
 			convey.Convey("nil arg type", func() {
 				task, err := tass.AssembleTask(context.TODO(), &TaskDefinition{}, nil)
@@ -59,7 +59,7 @@ func Test_taskAssemblerImp_AssembleTask(t *testing.T) {
 
 func Test_taskAssemblerImp_DisassembleTask(t *testing.T) {
 	convey.Convey("Test_taskAssemblerImp_DisassembleTask", t, func() {
-		tass := taskAssemblerImp{config: &TaskConfig{CtxMarshaler: &defaultCtxMarshaler{}}}
+		tass := taskAssemblerImp{options: &options{ctxMarshaler: &defaultCtxMarshaler{}}}
 		convey.Convey("normal", func() {
 			convey.Convey("nil arg type", func() {
 				taskDef := &TaskDefinition{}

diff --git a/config.go b/config.go
diff --git a/config_test.go b/config_test.go
diff --git a/dal.go b/dal.go
@@ -24,11 +24,11 @@ type taskDAL interface {
 }
 
 type taskDALImp struct {
-	config *TaskConfig
+	*options
 }
 
 func (s *taskDALImp) tabledDB(tx *gorm.DB) *gorm.DB {
-	return tx.Table(s.config.Table)
+	return tx.Table(s.table)
 }
 
 func (s *taskDALImp) Create(tx *gorm.DB, task *Task) error {

diff --git a/dal_test.go b/dal_test.go
@@ -11,7 +11,7 @@ func Test_taskDALImp_GetInitialized(t *testing.T) {
 	convey.Convey("Test_taskDALImp_GetInitialized", t, func() {
 		db := testDB("Test_taskDALImp_GetInitialized")
 		convey.Convey("normal", func() {
-			tdal := taskDALImp{config: &TaskConfig{DB: db, Table: "tasks"}}
+			tdal := taskDALImp{options: &options{db: db, table: "tasks"}}
 			convey.Convey("only has sensitive keys", func() {
 				convey.Convey("normal time", func() {
 					_ = tdal.Create(db, &Task{TaskKey: "t1", TaskStatus: TaskStatusInitialized, CreatedAt: time.Now(), UpdatedAt: time.Now()})
@@ -28,7 +28,7 @@ func Test_taskDALImp_GetInitialized(t *testing.T) {
 			})
 		})
 		convey.Convey("error", func() {
-			tdal := taskDALImp{config: &TaskConfig{DB: db, Table: "not exist"}}
+			tdal := taskDALImp{options: &options{db: db, table: "not exist"}}
 			_, err := tdal.GetInitialized(db, nil, time.Second, nil)
 			convey.So(err, convey.ShouldNotBeNil)
 		})
@@ -39,7 +39,7 @@ func Test_taskDALImp_Get(t *testing.T) {
 	convey.Convey("Test_taskDALImp_Get", t, func() {
 		convey.Convey("error", func() {
 			db := testDB("Test_taskDALImp_Get")
-			tdal := taskDALImp{config: &TaskConfig{DB: db, Table: "not exist"}}
+			tdal := taskDALImp{options: &options{db: db, table: "not exist"}}
 			_, err := tdal.Get(db, 1)
 			convey.So(err, convey.ShouldNotBeNil)
 		})
@@ -50,7 +50,7 @@ func Test_taskDALImp_GetForUpdate(t *testing.T) {
 	convey.Convey("Test_taskDALImp_GetForUpdate", t, func() {
 		convey.Convey("error", func() {
 			db := testDB("Test_taskDALImp_GetForUpdate")
-			tdal := taskDALImp{config: &TaskConfig{DB: db, Table: "not exist"}}
+			tdal := taskDALImp{options: &options{db: db, table: "not exist"}}
 			_, err := tdal.GetForUpdate(db, 1)
 			convey.So(err, convey.ShouldNotBeNil)
 		})