feat(tapd): add more log when converting unicode (#8164) (#8166)

github-actions[bot] · d4x1 · web-flow · commit dc6698d607c1 · 2024-10-30T17:09:48.000+08:00
* feat(tapd): add more log when converting unicode

* feat(tapd): ignore errors when converting unicode fails

Co-authored-by: Lynwee &lt;1507509064@qq.com&gt;
diff --git a/backend/plugins/tapd/tasks/bug_changelog_extractor.go b/backend/plugins/tapd/tasks/bug_changelog_extractor.go
@@ -38,6 +38,7 @@ var ExtractBugChangelogMeta = plugin.SubTaskMeta{
 
 func ExtractBugChangelog(taskCtx plugin.SubTaskContext) errors.Error {
 	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_BUG_CHANGELOG_TABLE)
+	logger := taskCtx.GetLogger()
 	extractor, err := api.NewApiExtractor(api.ApiExtractorArgs{
 		RawDataSubTaskArgs: *rawDataSubTaskArgs,
 		Extract: func(row *api.RawData) ([]interface{}, errors.Error) {
@@ -47,6 +48,7 @@ func ExtractBugChangelog(taskCtx plugin.SubTaskContext) errors.Error {
 			}
 			err := errors.Convert(json.Unmarshal(row.Data, &bugChangelogBody))
 			if err != nil {
+				logger.Error(err, "unmarshal: %s, err: %s", row.Data, err)
 				return nil, err
 			}
 			bugChangelog := bugChangelogBody.BugChange
@@ -62,11 +64,12 @@ func ExtractBugChangelog(taskCtx plugin.SubTaskContext) errors.Error {
 			}
 			err = convertUnicode(item)
 			if err != nil {
-				return nil, err
+				logger.Error(err, "convert unicode: %s, err: %s", item, err)
 			}
 			if item.Field == "iteration_id" {
 				iterationFrom, iterationTo, err := parseIterationChangelog(taskCtx, item.ValueBeforeParsed, item.ValueAfterParsed)
 				if err != nil {
+					logger.Error(err, "parseIterationChangelog: %s, err: %s", item, err)
 					return nil, err
 				}
 				item.IterationIdFrom = iterationFrom
diff --git a/backend/plugins/tapd/tasks/story_changelog_extractor.go b/backend/plugins/tapd/tasks/story_changelog_extractor.go
@@ -36,6 +36,7 @@ var ExtractStoryChangelogMeta = plugin.SubTaskMeta{
 }
 
 func ExtractStoryChangelog(taskCtx plugin.SubTaskContext) errors.Error {
+	logger := taskCtx.GetLogger()
 	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_CHANGELOG_TABLE)
 	extractor, err := api.NewApiExtractor(api.ApiExtractorArgs{
 		RawDataSubTaskArgs: *rawDataSubTaskArgs,
@@ -89,7 +90,7 @@ func ExtractStoryChangelog(taskCtx plugin.SubTaskContext) errors.Error {
 						}
 						err = convertUnicode(&item)
 						if err != nil {
-							return nil, err
+							logger.Error(err, "convert unicode: %s, err: %s", item, err)
 						}
 						results = append(results, &item)
 					}
@@ -103,7 +104,7 @@ func ExtractStoryChangelog(taskCtx plugin.SubTaskContext) errors.Error {
 				}
 				err = convertUnicode(&item)
 				if err != nil {
-					return nil, err
+					logger.Error(err, "convert unicode: %s, err: %s", item, err)
 				}
 				if item.Field == "iteration_id" {
 					// some users' tapd will not return iteration_id_from/iteration_id_to
diff --git a/backend/plugins/tapd/tasks/task_changelog_extractor.go b/backend/plugins/tapd/tasks/task_changelog_extractor.go
@@ -38,6 +38,7 @@ var ExtractTaskChangelogMeta = plugin.SubTaskMeta{
 
 func ExtractTaskChangelog(taskCtx plugin.SubTaskContext) errors.Error {
 	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_TASK_CHANGELOG_TABLE)
+	logger := taskCtx.GetLogger()
 	extractor, err := api.NewApiExtractor(api.ApiExtractorArgs{
 		RawDataSubTaskArgs: *rawDataSubTaskArgs,
 		Extract: func(row *api.RawData) ([]interface{}, errors.Error) {
@@ -92,7 +93,7 @@ func ExtractTaskChangelog(taskCtx plugin.SubTaskContext) errors.Error {
 					}
 					err = convertUnicode(&item)
 					if err != nil {
-						return nil, err
+						logger.Error(err, "convert unicode: %s, err: %s", item, err)
 					}
 				default:
 					item.ConnectionId = data.Options.ConnectionId
@@ -103,7 +104,7 @@ func ExtractTaskChangelog(taskCtx plugin.SubTaskContext) errors.Error {
 				}
 				err = convertUnicode(&item)
 				if err != nil {
-					return nil, err
+					logger.Error(err, "convert unicode: %s, err: %s", item, err)
 				}
 				if item.Field == "iteration_id" {
 					iterationFrom, iterationTo, err := parseIterationChangelog(taskCtx, item.ValueBeforeParsed, item.ValueAfterParsed)

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ var ExtractBugChangelogMeta = plugin.SubTaskMeta{`
`38`	`38`
`39`	`39`	`func ExtractBugChangelog(taskCtx plugin.SubTaskContext) errors.Error {`
`40`	`40`	`rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_BUG_CHANGELOG_TABLE)`
	`41`	`+ logger := taskCtx.GetLogger()`
`41`	`42`	`extractor, err := api.NewApiExtractor(api.ApiExtractorArgs{`
`42`	`43`	`RawDataSubTaskArgs: *rawDataSubTaskArgs,`
`43`	`44`	`Extract: func(row *api.RawData) ([]interface{}, errors.Error) {`
`@@ -47,6 +48,7 @@ func ExtractBugChangelog(taskCtx plugin.SubTaskContext) errors.Error {`
`47`	`48`	`}`
`48`	`49`	`err := errors.Convert(json.Unmarshal(row.Data, &bugChangelogBody))`
`49`	`50`	`if err != nil {`
	`51`	`+ logger.Error(err, "unmarshal: %s, err: %s", row.Data, err)`
`50`	`52`	`return nil, err`
`51`	`53`	`}`
`52`	`54`	`bugChangelog := bugChangelogBody.BugChange`
`@@ -62,11 +64,12 @@ func ExtractBugChangelog(taskCtx plugin.SubTaskContext) errors.Error {`
`62`	`64`	`}`
`63`	`65`	`err = convertUnicode(item)`
`64`	`66`	`if err != nil {`
`65`		`- return nil, err`
	`67`	`+ logger.Error(err, "convert unicode: %s, err: %s", item, err)`
`66`	`68`	`}`
`67`	`69`	`if item.Field == "iteration_id" {`
`68`	`70`	`iterationFrom, iterationTo, err := parseIterationChangelog(taskCtx, item.ValueBeforeParsed, item.ValueAfterParsed)`
`69`	`71`	`if err != nil {`
	`72`	`+ logger.Error(err, "parseIterationChangelog: %s, err: %s", item, err)`
`70`	`73`	`return nil, err`
`71`	`74`	`}`
`72`	`75`	`item.IterationIdFrom = iterationFrom`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ var ExtractStoryChangelogMeta = plugin.SubTaskMeta{`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`func ExtractStoryChangelog(taskCtx plugin.SubTaskContext) errors.Error {`
	`39`	`+ logger := taskCtx.GetLogger()`
`39`	`40`	`rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_CHANGELOG_TABLE)`
`40`	`41`	`extractor, err := api.NewApiExtractor(api.ApiExtractorArgs{`
`41`	`42`	`RawDataSubTaskArgs: *rawDataSubTaskArgs,`
`@@ -89,7 +90,7 @@ func ExtractStoryChangelog(taskCtx plugin.SubTaskContext) errors.Error {`
`89`	`90`	`}`
`90`	`91`	`err = convertUnicode(&item)`
`91`	`92`	`if err != nil {`
`92`		`- return nil, err`
	`93`	`+ logger.Error(err, "convert unicode: %s, err: %s", item, err)`
`93`	`94`	`}`
`94`	`95`	`results = append(results, &item)`
`95`	`96`	`}`
`@@ -103,7 +104,7 @@ func ExtractStoryChangelog(taskCtx plugin.SubTaskContext) errors.Error {`
`103`	`104`	`}`
`104`	`105`	`err = convertUnicode(&item)`
`105`	`106`	`if err != nil {`
`106`		`- return nil, err`
	`107`	`+ logger.Error(err, "convert unicode: %s, err: %s", item, err)`
`107`	`108`	`}`
`108`	`109`	`if item.Field == "iteration_id" {`
`109`	`110`	`// some users' tapd will not return iteration_id_from/iteration_id_to`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ var ExtractTaskChangelogMeta = plugin.SubTaskMeta{`
`38`	`38`
`39`	`39`	`func ExtractTaskChangelog(taskCtx plugin.SubTaskContext) errors.Error {`
`40`	`40`	`rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_TASK_CHANGELOG_TABLE)`
	`41`	`+ logger := taskCtx.GetLogger()`
`41`	`42`	`extractor, err := api.NewApiExtractor(api.ApiExtractorArgs{`
`42`	`43`	`RawDataSubTaskArgs: *rawDataSubTaskArgs,`
`43`	`44`	`Extract: func(row *api.RawData) ([]interface{}, errors.Error) {`
`@@ -92,7 +93,7 @@ func ExtractTaskChangelog(taskCtx plugin.SubTaskContext) errors.Error {`
`92`	`93`	`}`
`93`	`94`	`err = convertUnicode(&item)`
`94`	`95`	`if err != nil {`
`95`		`- return nil, err`
	`96`	`+ logger.Error(err, "convert unicode: %s, err: %s", item, err)`
`96`	`97`	`}`
`97`	`98`	`default:`
`98`	`99`	`item.ConnectionId = data.Options.ConnectionId`
`@@ -103,7 +104,7 @@ func ExtractTaskChangelog(taskCtx plugin.SubTaskContext) errors.Error {`
`103`	`104`	`}`
`104`	`105`	`err = convertUnicode(&item)`
`105`	`106`	`if err != nil {`
`106`		`- return nil, err`
	`107`	`+ logger.Error(err, "convert unicode: %s, err: %s", item, err)`
`107`	`108`	`}`
`108`	`109`	`if item.Field == "iteration_id" {`
`109`	`110`	`iterationFrom, iterationTo, err := parseIterationChangelog(taskCtx, item.ValueBeforeParsed, item.ValueAfterParsed)`