From e056e9f8744162276fadb6638eec7049cac7a416 Mon Sep 17 00:00:00 2001 From: Dmitry Sementsov Date: Tue, 20 Dec 2022 13:29:13 +0300 Subject: [PATCH 1/7] STDEV-12938. Added QueryRestBCodeQuery and ReplyRestBCodeQuery. --- .../document/rest_b_code/QueryRestBCode.kt | 14 ++ .../document/rest_b_code/ReplyRestBCode.kt | 13 ++ .../rest_b_code/QueryRestBCodeContract.kt | 31 +++++ .../rest_b_code/ReplyRestBCodeContract.kt | 27 ++++ .../query/rest_b_code/QueryRestBCodeQuery.kt | 123 ++++++++++++++++++ .../query/rest_b_code/ReplyRestBCodeQuery.kt | 102 +++++++++++++++ build.gradle | 5 +- 7 files changed, 313 insertions(+), 2 deletions(-) create mode 100644 api/src/main/java/ru/evotor/egais/api/model/document/rest_b_code/QueryRestBCode.kt create mode 100644 api/src/main/java/ru/evotor/egais/api/model/document/rest_b_code/ReplyRestBCode.kt create mode 100644 api/src/main/java/ru/evotor/egais/api/provider/rest_b_code/QueryRestBCodeContract.kt create mode 100644 api/src/main/java/ru/evotor/egais/api/provider/rest_b_code/ReplyRestBCodeContract.kt create mode 100644 api/src/main/java/ru/evotor/egais/api/query/rest_b_code/QueryRestBCodeQuery.kt create mode 100644 api/src/main/java/ru/evotor/egais/api/query/rest_b_code/ReplyRestBCodeQuery.kt diff --git a/api/src/main/java/ru/evotor/egais/api/model/document/rest_b_code/QueryRestBCode.kt b/api/src/main/java/ru/evotor/egais/api/model/document/rest_b_code/QueryRestBCode.kt new file mode 100644 index 0000000..b4d62fc --- /dev/null +++ b/api/src/main/java/ru/evotor/egais/api/model/document/rest_b_code/QueryRestBCode.kt @@ -0,0 +1,14 @@ +package ru.evotor.egais.api.model.document.rest_b_code + +import ru.evotor.egais.api.model.document.EgaisDocument +import java.util.UUID + +class QueryRestBCode( + val uuid: UUID, + val owner: String, + val informF2RegId: String, + val status: String, + val rejectComment: String?, + val utmDocumentUuid: UUID, + val requestType: String? +) : EgaisDocument() \ No newline at end of file diff --git a/api/src/main/java/ru/evotor/egais/api/model/document/rest_b_code/ReplyRestBCode.kt b/api/src/main/java/ru/evotor/egais/api/model/document/rest_b_code/ReplyRestBCode.kt new file mode 100644 index 0000000..26dd110 --- /dev/null +++ b/api/src/main/java/ru/evotor/egais/api/model/document/rest_b_code/ReplyRestBCode.kt @@ -0,0 +1,13 @@ +package ru.evotor.egais.api.model.document.rest_b_code + +import ru.evotor.egais.api.model.document.EgaisDocument +import java.util.Date +import java.util.UUID + +class ReplyRestBCode( + val uuid: UUID, + val owner: String, + val restsDate: Date?, + val informF2RegId: String, + val utmDocumentUuid: UUID +) : EgaisDocument() \ No newline at end of file diff --git a/api/src/main/java/ru/evotor/egais/api/provider/rest_b_code/QueryRestBCodeContract.kt b/api/src/main/java/ru/evotor/egais/api/provider/rest_b_code/QueryRestBCodeContract.kt new file mode 100644 index 0000000..cec5073 --- /dev/null +++ b/api/src/main/java/ru/evotor/egais/api/provider/rest_b_code/QueryRestBCodeContract.kt @@ -0,0 +1,31 @@ +package ru.evotor.egais.api.provider.rest_b_code + +import android.net.Uri +import ru.evotor.egais.api.provider.MainContract + +internal object QueryRestBCodeContract { + const val AUTHORITY = "${MainContract.AUTHORITY_PREFIX}.queryrestbcode" + + @JvmField + val BASE_URI = Uri.parse("content://$AUTHORITY") + + @JvmField + val PATH = "QueryRestBCode" + + @JvmField + val URI = Uri.withAppendedPath(BASE_URI, PATH) + + const val COLUMN_UUID = "UUID" + + const val COLUMN_OWNER = "OWNER" + + const val COLUMN_INFORM_F2_REG_ID = "INFORM_F2_REG_ID" + + const val COLUMN_STATUS = "STATUS" + + const val COLUMN_REJECT_COMMENT = "REJECT_COMMENT" + + const val COLUMN_UTM_DOCUMENT_UUID = "UTM_DOCUMENT_UUID" + + const val COLUMN_REQUEST_TYPE = "REQUEST_TYPE" +} \ No newline at end of file diff --git a/api/src/main/java/ru/evotor/egais/api/provider/rest_b_code/ReplyRestBCodeContract.kt b/api/src/main/java/ru/evotor/egais/api/provider/rest_b_code/ReplyRestBCodeContract.kt new file mode 100644 index 0000000..da52726 --- /dev/null +++ b/api/src/main/java/ru/evotor/egais/api/provider/rest_b_code/ReplyRestBCodeContract.kt @@ -0,0 +1,27 @@ +package ru.evotor.egais.api.provider.rest_b_code + +import android.net.Uri +import ru.evotor.egais.api.provider.MainContract + +internal object ReplyRestBCodeContract { + const val AUTHORITY = "${MainContract.AUTHORITY_PREFIX}.replyrestbcode" + + @JvmField + val BASE_URI = Uri.parse("content://$AUTHORITY") + + @JvmField + val PATH = "ReplyRestBCode" + + @JvmField + val URI = Uri.withAppendedPath(BASE_URI, PATH) + + const val COLUMN_UUID = "UUID" + + const val COLUMN_OWNER = "OWNER" + + const val COLUMN_RESTS_DATE = "RESTS_DATE" + + const val COLUMN_INFORM_F2_REG_ID = "INFORM_F2_REG_ID" + + const val COLUMN_UTM_DOCUMENT_UUID = "UTM_DOCUMENT_UUID" +} \ No newline at end of file diff --git a/api/src/main/java/ru/evotor/egais/api/query/rest_b_code/QueryRestBCodeQuery.kt b/api/src/main/java/ru/evotor/egais/api/query/rest_b_code/QueryRestBCodeQuery.kt new file mode 100644 index 0000000..7fe0f47 --- /dev/null +++ b/api/src/main/java/ru/evotor/egais/api/query/rest_b_code/QueryRestBCodeQuery.kt @@ -0,0 +1,123 @@ +package ru.evotor.egais.api.query.rest_b_code + +import ru.evotor.egais.api.model.document.reply.ResendDocumentStatus +import ru.evotor.egais.api.model.document.rest_b_code.QueryRestBCode +import ru.evotor.egais.api.provider.rest_b_code.QueryRestBCodeContract +import ru.evotor.query.Cursor +import ru.evotor.query.FilterBuilder +import java.util.* + +/** + * Класс для формирования запроса на получение + * запросов на получение марок по справке 2 (справка Б) + */ +class QueryRestBCodeQuery : + FilterBuilder( + QueryRestBCodeContract.URI + ) { + + /** + * UUID документа. + */ + @JvmField + val uuid = addFieldFilter(QueryRestBCodeContract.COLUMN_UUID) + + /** + * Отправитель запроса + */ + @JvmField + val owner = addFieldFilter(QueryRestBCodeContract.COLUMN_OWNER) + + /** + * uuid справки 2 для накладной. + */ + @JvmField + val informF2RegId = addFieldFilter(QueryRestBCodeContract.COLUMN_INFORM_F2_REG_ID) + + /** + * Статус запроса + */ + @JvmField + val status = addFieldFilter(QueryRestBCodeContract.COLUMN_STATUS) + + /** + * Комментарий от ЕГАИС + */ + @JvmField + val rejectComment = addFieldFilter(QueryRestBCodeContract.COLUMN_REJECT_COMMENT) + + /** + * ID утм документа для накладной + */ + @JvmField + val utmDocumentUuid = addFieldFilter(QueryRestBCodeContract.COLUMN_UTM_DOCUMENT_UUID) + + /** + * Тип запроса + */ + @JvmField + val requestType = addFieldFilter(QueryRestBCodeContract.COLUMN_REQUEST_TYPE) + + override val currentQuery: QueryRestBCodeQuery + get() = this + + /** + * Класс для сортировки полей в результе запроса + */ + class SortOrder : FilterBuilder.SortOrder() { + override val currentSortOrder: SortOrder + get() = this + + @JvmField + val uuid = addFieldSorter(QueryRestBCodeContract.COLUMN_UUID) + + @JvmField + val owner = addFieldSorter(QueryRestBCodeContract.COLUMN_OWNER) + + @JvmField + val informF2RegId = addFieldSorter(QueryRestBCodeContract.COLUMN_INFORM_F2_REG_ID) + + @JvmField + val status = addFieldSorter(QueryRestBCodeContract.COLUMN_STATUS) + + @JvmField + val rejectComment = addFieldSorter(QueryRestBCodeContract.COLUMN_REJECT_COMMENT) + + @JvmField + val utmDocumentUuid = addFieldSorter(QueryRestBCodeContract.COLUMN_UTM_DOCUMENT_UUID) + + @JvmField + val requestType = addFieldSorter(QueryRestBCodeContract.COLUMN_REQUEST_TYPE) + } + + override fun getValue(cursor: Cursor): QueryRestBCode { + return createQueryRestBCode(cursor) + } + + private fun createQueryRestBCode(cursor: Cursor): QueryRestBCode { + val columnIndexUuid = + cursor.getColumnIndexOrThrow(QueryRestBCodeContract.COLUMN_UUID) + val columnIndexOwner = + cursor.getColumnIndexOrThrow(QueryRestBCodeContract.COLUMN_OWNER) + val columnIndexInformF2RegId = + cursor.getColumnIndexOrThrow(QueryRestBCodeContract.COLUMN_INFORM_F2_REG_ID) + val columnIndexStatus = + cursor.getColumnIndexOrThrow(QueryRestBCodeContract.COLUMN_STATUS) + val columnIndexRejectComment = + cursor.getColumnIndexOrThrow(QueryRestBCodeContract.COLUMN_REJECT_COMMENT) + val columnIndexUtmDocumentUuid = + cursor.getColumnIndexOrThrow(QueryRestBCodeContract.COLUMN_UTM_DOCUMENT_UUID) + val columnRequestType = + cursor.getColumnIndexOrThrow(QueryRestBCodeContract.COLUMN_REQUEST_TYPE) + + return QueryRestBCode( + UUID.fromString(cursor.getString(columnIndexUuid)), + cursor.getString(columnIndexOwner), + cursor.getString(columnIndexInformF2RegId), + cursor.getString(columnIndexStatus), + cursor.getString(columnIndexRejectComment), + UUID.fromString(cursor.getString(columnIndexUtmDocumentUuid)), + cursor.getString(columnRequestType), + ) + } +} \ No newline at end of file diff --git a/api/src/main/java/ru/evotor/egais/api/query/rest_b_code/ReplyRestBCodeQuery.kt b/api/src/main/java/ru/evotor/egais/api/query/rest_b_code/ReplyRestBCodeQuery.kt new file mode 100644 index 0000000..9038b6e --- /dev/null +++ b/api/src/main/java/ru/evotor/egais/api/query/rest_b_code/ReplyRestBCodeQuery.kt @@ -0,0 +1,102 @@ +package ru.evotor.egais.api.query.rest_b_code + +import ru.evotor.egais.api.model.document.rest_b_code.ReplyRestBCode +import ru.evotor.egais.api.provider.rest_b_code.ReplyRestBCodeContract +import ru.evotor.query.Cursor +import ru.evotor.query.FilterBuilder +import java.text.SimpleDateFormat +import java.util.* + +/** + * Класс для формирования запроса на получение результатов отправки + * запросов на получение марок по справке 2 (справка Б) + */ +class ReplyRestBCodeQuery: FilterBuilder( + ReplyRestBCodeContract.URI +) { + + private val dateFormat by lazy(LazyThreadSafetyMode.NONE) { + SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()) + } + + /** + * UUID документа. + */ + @JvmField + val uuid = addFieldFilter(ReplyRestBCodeContract.COLUMN_UUID) + + /** + * Отправитель запроса + */ + @JvmField + val owner = addFieldFilter(ReplyRestBCodeContract.COLUMN_OWNER) + + /** + * Дата обновления марок + */ + @JvmField + val restsDate = addFieldFilter(ReplyRestBCodeContract.COLUMN_RESTS_DATE) + + /** + * uuid справки 2 для накладной. + */ + @JvmField + val informF2RegId = addFieldFilter(ReplyRestBCodeContract.COLUMN_INFORM_F2_REG_ID) + + + /** + * ID утм документа для ответа на запрос + */ + @JvmField + val utmDocumentUuid = addFieldFilter(ReplyRestBCodeContract.COLUMN_UTM_DOCUMENT_UUID) + + override val currentQuery: ReplyRestBCodeQuery + get() = this + + /** + * Класс для сортировки полей в результе запроса + */ + class SortOrder : FilterBuilder.SortOrder() { + override val currentSortOrder: SortOrder + get() = this + + @JvmField + val uuid = addFieldSorter(ReplyRestBCodeContract.COLUMN_UUID) + + @JvmField + val owner = addFieldSorter(ReplyRestBCodeContract.COLUMN_OWNER) + + @JvmField + val restsDate = addFieldSorter(ReplyRestBCodeContract.COLUMN_RESTS_DATE) + + @JvmField + val informF2RegId = addFieldSorter(ReplyRestBCodeContract.COLUMN_INFORM_F2_REG_ID) + + @JvmField + val utmDocumentUuid = addFieldSorter(ReplyRestBCodeContract.COLUMN_UTM_DOCUMENT_UUID) + } + + override fun getValue(cursor: Cursor): ReplyRestBCode { + return createReplyRestBCode(cursor) + } + + private fun createReplyRestBCode(cursor: Cursor): ReplyRestBCode { + val columnUuid = + cursor.getColumnIndexOrThrow(ReplyRestBCodeContract.COLUMN_UUID) + val columnOwner = + cursor.getColumnIndexOrThrow(ReplyRestBCodeContract.COLUMN_OWNER) + val columnRestsDate = + cursor.getColumnIndexOrThrow(ReplyRestBCodeContract.COLUMN_RESTS_DATE) + val columnInformF2RegId = cursor.getColumnIndexOrThrow(ReplyRestBCodeContract.COLUMN_INFORM_F2_REG_ID) + val columnUtmDocumentUuid = + cursor.getColumnIndexOrThrow(ReplyRestBCodeContract.COLUMN_UTM_DOCUMENT_UUID) + + return ReplyRestBCode( + UUID.fromString(cursor.getString(columnUuid)), + cursor.getString(columnOwner), + dateFormat.parse(cursor.getString(columnRestsDate)) ?: Date(), + cursor.getString(columnInformF2RegId), + UUID.fromString(cursor.getString(columnUtmDocumentUuid)) + ) + } +} \ No newline at end of file diff --git a/build.gradle b/build.gradle index d12c114..1b96411 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,9 @@ buildscript { ext.kotlin_version = '1.6.0' repositories { - jcenter() + maven { + url = uri("http://10.12.76.10:8080/content/groups/public-release") + } google() } @@ -17,7 +19,6 @@ buildscript { allprojects { repositories { google() - jcenter() maven { url 'https://jitpack.io' } } } From 2c7453c8faad54b36618877fdf34be70c2539753 Mon Sep 17 00:00:00 2001 From: Dmitry Sementsov Date: Tue, 20 Dec 2022 14:34:15 +0300 Subject: [PATCH 2/7] STDEV-12938. Fixed repositories. --- build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.gradle b/build.gradle index 1b96411..2f48857 100644 --- a/build.gradle +++ b/build.gradle @@ -6,6 +6,9 @@ buildscript { maven { url = uri("http://10.12.76.10:8080/content/groups/public-release") } + maven { + url = uri("https://plugins.gradle.org/m2/") + } google() } From 6e013b2ceefa2019d1a7ca9b7047333811b599dd Mon Sep 17 00:00:00 2001 From: Dmitry Sementsov Date: Wed, 21 Dec 2022 02:34:19 +0300 Subject: [PATCH 3/7] STDEV-12938. Updated build.gradle. --- api/build.gradle | 4 ++-- build.gradle => build.gradle.kts | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) rename build.gradle => build.gradle.kts (54%) diff --git a/api/build.gradle b/api/build.gradle index 33b3fbf..ccd138f 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -30,8 +30,8 @@ repositories { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - implementation 'org.apache.commons:commons-lang3:3.6' + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10" + implementation 'org.apache.commons:commons-lang3:3.10' implementation 'com.github.evotor:query-api:1.0.0' } diff --git a/build.gradle b/build.gradle.kts similarity index 54% rename from build.gradle rename to build.gradle.kts index 2f48857..f00a7be 100644 --- a/build.gradle +++ b/build.gradle.kts @@ -1,31 +1,31 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. - buildscript { - ext.kotlin_version = '1.6.0' repositories { maven { url = uri("http://10.12.76.10:8080/content/groups/public-release") + isAllowInsecureProtocol = true } maven { url = uri("https://plugins.gradle.org/m2/") } google() + } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.6.0" + classpath("com.android.tools.build:gradle:4.2.2") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10") + classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.6.0") } } allprojects { repositories { google() - maven { url 'https://jitpack.io' } + maven { url = uri("https://jitpack.io") } } } -task clean(type: Delete) { - delete rootProject.buildDir +tasks.register("clean",Delete::class){ + delete(rootProject.buildDir) } From 04c0ef5ea2574341f3d132b34c95d57ce75c5cc7 Mon Sep 17 00:00:00 2001 From: Dmitry Sementsov Date: Wed, 21 Dec 2022 10:35:30 +0300 Subject: [PATCH 4/7] STDEV-12938. Add public-release repository for allprojects. --- build.gradle.kts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index f00a7be..bfbbab3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,8 +21,14 @@ buildscript { allprojects { repositories { + maven { + url = uri("http://10.12.76.10:8080/content/groups/public-release") + isAllowInsecureProtocol = true + } google() - maven { url = uri("https://jitpack.io") } + maven { + url = uri("https://jitpack.io") + } } } From d57b345c585abee6fef088880b8d14450bc4ab32 Mon Sep 17 00:00:00 2001 From: Dmitry Sementsov Date: Wed, 21 Dec 2022 11:21:48 +0300 Subject: [PATCH 5/7] STDEV-12938. Added mavenCentral repository. --- build.gradle.kts | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index bfbbab3..7b9955c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,13 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { repositories { - maven { - url = uri("http://10.12.76.10:8080/content/groups/public-release") - isAllowInsecureProtocol = true - } - maven { - url = uri("https://plugins.gradle.org/m2/") - } + mavenCentral() google() } @@ -21,10 +15,7 @@ buildscript { allprojects { repositories { - maven { - url = uri("http://10.12.76.10:8080/content/groups/public-release") - isAllowInsecureProtocol = true - } + mavenCentral() google() maven { url = uri("https://jitpack.io") From 7f6c33147903b1da89db02c7ec8192d0beb67af0 Mon Sep 17 00:00:00 2001 From: Dmitry Sementsov Date: Wed, 21 Dec 2022 13:13:33 +0300 Subject: [PATCH 6/7] STDEV-12938. Added enums. --- .../model/dictionary/QueryRestBCodeRequestType.kt | 6 ++++++ .../egais/api/model/dictionary/QueryStatus.kt | 7 +++++++ .../model/document/rest_b_code/QueryRestBCode.kt | 6 ++++-- .../api/query/rest_b_code/QueryRestBCodeQuery.kt | 13 +++++++------ 4 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 api/src/main/java/ru/evotor/egais/api/model/dictionary/QueryRestBCodeRequestType.kt create mode 100644 api/src/main/java/ru/evotor/egais/api/model/dictionary/QueryStatus.kt diff --git a/api/src/main/java/ru/evotor/egais/api/model/dictionary/QueryRestBCodeRequestType.kt b/api/src/main/java/ru/evotor/egais/api/model/dictionary/QueryRestBCodeRequestType.kt new file mode 100644 index 0000000..a6d835a --- /dev/null +++ b/api/src/main/java/ru/evotor/egais/api/model/dictionary/QueryRestBCodeRequestType.kt @@ -0,0 +1,6 @@ +package ru.evotor.egais.api.model.dictionary + +enum class QueryRestBCodeRequestType { + AUTO_REQUEST, + MANUAL_REQUEST +} \ No newline at end of file diff --git a/api/src/main/java/ru/evotor/egais/api/model/dictionary/QueryStatus.kt b/api/src/main/java/ru/evotor/egais/api/model/dictionary/QueryStatus.kt new file mode 100644 index 0000000..3c97b57 --- /dev/null +++ b/api/src/main/java/ru/evotor/egais/api/model/dictionary/QueryStatus.kt @@ -0,0 +1,7 @@ +package ru.evotor.egais.api.model.dictionary + +enum class QueryStatus { + NOT_PROCESSED, + FINISH, + REJECTED +} \ No newline at end of file diff --git a/api/src/main/java/ru/evotor/egais/api/model/document/rest_b_code/QueryRestBCode.kt b/api/src/main/java/ru/evotor/egais/api/model/document/rest_b_code/QueryRestBCode.kt index b4d62fc..1ea0f77 100644 --- a/api/src/main/java/ru/evotor/egais/api/model/document/rest_b_code/QueryRestBCode.kt +++ b/api/src/main/java/ru/evotor/egais/api/model/document/rest_b_code/QueryRestBCode.kt @@ -1,5 +1,7 @@ package ru.evotor.egais.api.model.document.rest_b_code +import ru.evotor.egais.api.model.dictionary.QueryRestBCodeRequestType +import ru.evotor.egais.api.model.dictionary.QueryStatus import ru.evotor.egais.api.model.document.EgaisDocument import java.util.UUID @@ -7,8 +9,8 @@ class QueryRestBCode( val uuid: UUID, val owner: String, val informF2RegId: String, - val status: String, + val status: QueryStatus, val rejectComment: String?, val utmDocumentUuid: UUID, - val requestType: String? + val requestType: QueryRestBCodeRequestType? ) : EgaisDocument() \ No newline at end of file diff --git a/api/src/main/java/ru/evotor/egais/api/query/rest_b_code/QueryRestBCodeQuery.kt b/api/src/main/java/ru/evotor/egais/api/query/rest_b_code/QueryRestBCodeQuery.kt index 7fe0f47..51bbcf8 100644 --- a/api/src/main/java/ru/evotor/egais/api/query/rest_b_code/QueryRestBCodeQuery.kt +++ b/api/src/main/java/ru/evotor/egais/api/query/rest_b_code/QueryRestBCodeQuery.kt @@ -1,6 +1,7 @@ package ru.evotor.egais.api.query.rest_b_code -import ru.evotor.egais.api.model.document.reply.ResendDocumentStatus +import ru.evotor.egais.api.model.dictionary.QueryRestBCodeRequestType +import ru.evotor.egais.api.model.dictionary.QueryStatus import ru.evotor.egais.api.model.document.rest_b_code.QueryRestBCode import ru.evotor.egais.api.provider.rest_b_code.QueryRestBCodeContract import ru.evotor.query.Cursor @@ -20,7 +21,7 @@ class QueryRestBCodeQuery : * UUID документа. */ @JvmField - val uuid = addFieldFilter(QueryRestBCodeContract.COLUMN_UUID) + val uuid = addFieldFilter(QueryRestBCodeContract.COLUMN_UUID) /** * Отправитель запроса @@ -38,7 +39,7 @@ class QueryRestBCodeQuery : * Статус запроса */ @JvmField - val status = addFieldFilter(QueryRestBCodeContract.COLUMN_STATUS) + val status = addFieldFilter(QueryRestBCodeContract.COLUMN_STATUS) /** * Комментарий от ЕГАИС @@ -56,7 +57,7 @@ class QueryRestBCodeQuery : * Тип запроса */ @JvmField - val requestType = addFieldFilter(QueryRestBCodeContract.COLUMN_REQUEST_TYPE) + val requestType = addFieldFilter(QueryRestBCodeContract.COLUMN_REQUEST_TYPE) override val currentQuery: QueryRestBCodeQuery get() = this @@ -114,10 +115,10 @@ class QueryRestBCodeQuery : UUID.fromString(cursor.getString(columnIndexUuid)), cursor.getString(columnIndexOwner), cursor.getString(columnIndexInformF2RegId), - cursor.getString(columnIndexStatus), + QueryStatus.valueOf(cursor.getString(columnIndexStatus)), cursor.getString(columnIndexRejectComment), UUID.fromString(cursor.getString(columnIndexUtmDocumentUuid)), - cursor.getString(columnRequestType), + QueryRestBCodeRequestType.valueOf(cursor.getString(columnRequestType)), ) } } \ No newline at end of file From ad0e59bdfd5209740d54d7a97ef959b5a9552eb6 Mon Sep 17 00:00:00 2001 From: Dmitry Sementsov Date: Mon, 9 Jan 2023 09:43:07 +0300 Subject: [PATCH 7/7] STDEV-12938. Added UNKNOWN QueryStatus and QueryRestBCodeRequestType. --- .../model/dictionary/QueryRestBCodeRequestType.kt | 3 ++- .../egais/api/model/dictionary/QueryStatus.kt | 3 ++- .../api/query/rest_b_code/QueryRestBCodeQuery.kt | 15 ++++++++++++--- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/api/src/main/java/ru/evotor/egais/api/model/dictionary/QueryRestBCodeRequestType.kt b/api/src/main/java/ru/evotor/egais/api/model/dictionary/QueryRestBCodeRequestType.kt index a6d835a..4f29ebe 100644 --- a/api/src/main/java/ru/evotor/egais/api/model/dictionary/QueryRestBCodeRequestType.kt +++ b/api/src/main/java/ru/evotor/egais/api/model/dictionary/QueryRestBCodeRequestType.kt @@ -2,5 +2,6 @@ package ru.evotor.egais.api.model.dictionary enum class QueryRestBCodeRequestType { AUTO_REQUEST, - MANUAL_REQUEST + MANUAL_REQUEST, + UNKNOWN } \ No newline at end of file diff --git a/api/src/main/java/ru/evotor/egais/api/model/dictionary/QueryStatus.kt b/api/src/main/java/ru/evotor/egais/api/model/dictionary/QueryStatus.kt index 3c97b57..a7bf5f7 100644 --- a/api/src/main/java/ru/evotor/egais/api/model/dictionary/QueryStatus.kt +++ b/api/src/main/java/ru/evotor/egais/api/model/dictionary/QueryStatus.kt @@ -3,5 +3,6 @@ package ru.evotor.egais.api.model.dictionary enum class QueryStatus { NOT_PROCESSED, FINISH, - REJECTED + REJECTED, + UNKNOWN } \ No newline at end of file diff --git a/api/src/main/java/ru/evotor/egais/api/query/rest_b_code/QueryRestBCodeQuery.kt b/api/src/main/java/ru/evotor/egais/api/query/rest_b_code/QueryRestBCodeQuery.kt index 51bbcf8..0ce3484 100644 --- a/api/src/main/java/ru/evotor/egais/api/query/rest_b_code/QueryRestBCodeQuery.kt +++ b/api/src/main/java/ru/evotor/egais/api/query/rest_b_code/QueryRestBCodeQuery.kt @@ -57,7 +57,8 @@ class QueryRestBCodeQuery : * Тип запроса */ @JvmField - val requestType = addFieldFilter(QueryRestBCodeContract.COLUMN_REQUEST_TYPE) + val requestType = + addFieldFilter(QueryRestBCodeContract.COLUMN_REQUEST_TYPE) override val currentQuery: QueryRestBCodeQuery get() = this @@ -115,10 +116,18 @@ class QueryRestBCodeQuery : UUID.fromString(cursor.getString(columnIndexUuid)), cursor.getString(columnIndexOwner), cursor.getString(columnIndexInformF2RegId), - QueryStatus.valueOf(cursor.getString(columnIndexStatus)), + try { + QueryStatus.valueOf(cursor.getString(columnIndexStatus)) + } catch (e: Exception) { + QueryStatus.UNKNOWN + }, cursor.getString(columnIndexRejectComment), UUID.fromString(cursor.getString(columnIndexUtmDocumentUuid)), - QueryRestBCodeRequestType.valueOf(cursor.getString(columnRequestType)), + try { + QueryRestBCodeRequestType.valueOf(cursor.getString(columnRequestType)) + } catch (e: Exception) { + QueryRestBCodeRequestType.UNKNOWN + } ) } } \ No newline at end of file