feat:希望支持分支进行上架测试 #4780 #9539
Merged
feat:希望支持分支进行上架测试 #4780 #9539
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
yjieliang
requested review from
irwinsun,
mingshewhe,
stubenhuang,
carlyin0801,
royalhuang,
randychen2046 and
tangruotian
as code owners
yjieliang
changed the title
carlyin0801
reviewed
Nov 16, 2023
|
|
||
| @ApiOperation("根据插件版本ID获取插件版本进度") | ||
| @GET | ||
| @Path("/desk/atom/release/Ids/{atomId}") |
| @@ -260,6 +261,16 @@ class AtomDao : AtomBaseDao() { | |||
| } | |||
| } | |||
|
|
|||
| fun getAtomTestVersion(dslContext: DSLContext, atomCode: String, versionPrefix: String): TAtomRecord? { | |||
There was a problem hiding this comment.
这个方法名称有问题，不要写成专门查插件测试版本
| @@ -512,14 +525,21 @@ class AtomDao : AtomBaseDao() { | |||
| delim = ".", | |||
| count = -1 | |||
| ) | |||
| val field = t.field(KEY_BRANCH_TEST_FLAG) as Field<Boolean> | |||
| @@ -713,7 +715,7 @@ abstract class AtomServiceImpl @Autowired constructor() : AtomService { | |||
| versionName = "$atomVersion ($atomStatusMsg)" | |||
| latestVersionName = "$latestVersionName ($atomStatusMsg)" | |||
| } | |||
| if (tmpVersionPrefix != versionPrefix) { | |||
| if (tmpVersionPrefix != versionPrefix && !(it[KEY_BRANCH_TEST_FLAG] as Boolean)) { | |||
There was a problem hiding this comment.
KEY_BRANCH_TEST_FLAG这个字段是非必填的，不一定有值吧
| @@ -45,5 +45,7 @@ data class StoreI18nConfig( | |||
| @ApiModelProperty("map字段在db中key的前缀") | |||
There was a problem hiding this comment.
storeI18nConfig公共的文件为什么放在插件的路径下
# Conflicts: # support-files/sql/2003_v2.x/2020_ci_process-update_v2.0_mysql.sql
JamiKX1
approved these changes
Nov 23, 2023
| @@ -544,8 +550,8 @@ class QualityIndicatorService @Autowired constructor( | |||
| fun serviceRefreshIndicator(elementType: String, metadataMap: Map<String /* dataId */, String /* id */>): Int { | |||
| logger.info("QUALITY|refreshIndicator elementType: $elementType") | |||
| val data = indicatorDao.listByElementType(dslContext, elementType, IndicatorType.MARKET) | |||
| val testData = data?.filter { isTestIndicator(it) } ?: listOf() | |||
| val prodData = data?.filter { !isTestIndicator(it) } ?: listOf() | |||
| val testData = data?.filter { isTestIndicator(IN_READY_TEST, it) } ?: listOf() | |||
There was a problem hiding this comment.
有测试同时多条分支上架测试插件的场景吗，这里把测试的指标数据刷到正式，如果有多个分支的测试插件对应多组测试的指标，过滤条件是不是还仅是IN_READY_TEST
mingshewhe
approved these changes
Nov 24, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
feat:希望支持分支进行上架测试 #4780
需对插件版本数据进行初始化处理
1、将所有T_ATOM表 LATEST_TEST_FLAG字段数据设置为false
UPDATE T_ATOM
SET LATEST_TEST_FLAG = b'0';
2、将最新构建的插件测试版本数据LATEST_TEST_FLAG字段设置为true
UPDATE T_ATOM t1
JOIN (
SELECT ATOM_CODE, MAX(UPDATE_TIME) AS max_update_time
FROM T_ATOM t2
WHERE ATOM_STATUS IN (4, 5)
GROUP BY ATOM_CODE
) t2 ON t1.ATOM_CODE = t2.ATOM_CODE AND t1.UPDATE_TIME = t2.max_update_time
SET t1.LATEST_TEST_FLAG = b'1';