treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1068 commits 104 branches 25 tags 1.1 GiB
Commit graph

291 commits

Author SHA1 Message Date
akulikov
d2a48a22cf Merge branch 'cls-265' into cls-271 
# Conflicts:
#	platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java
 2023-05-03 15:10:20 +03:00
AKurakin
74238e1f23 http://jira.mfd.msk:8088/browse/CLS-267 поправил значения в TASK_DICTIONARY 2023-05-02 14:17:17 +03:00
akulikov
32d95c175f ClearingAccountUpdateRequest, update clearing account, fix some names 2023-05-02 12:53:40 +03:00
AKurakin
0d35f74b1c http://jira.mfd.msk:8088/browse/CLS-288 fix API endpoint 2023-04-28 19:54:33 +03:00
akulikov
5cefa961b1 Merge branch 'dev' into cls-265 2023-04-28 16:31:36 +03:00
AKurakin
f542cc0441 http://jira.mfd.msk:8088/browse/CLS-256 небольшая чистка кода 2023-04-28 15:43:35 +03:00
AKurakin
fb7ff4711a http://jira.mfd.msk:8088/browse/CLS-257 поправил названия контроллеров 2023-04-28 15:11:55 +03:00
AKurakin
9d1bb95169 http://jira.mfd.msk:8088/browse/CLS-270 http://jira.mfd.msk:8088/browse/CLS-273 api url прописаны в мете destination 2023-04-28 15:01:17 +03:00
akulikov
2f369d6ea1 Merge branch 'dev' into cls-265 2023-04-27 11:28:02 +03:00
psemenkov
d45878e1a2 Merge remote-tracking branch 'origin/dev' into CLS-268 
# Conflicts:
#	clearing-parent/backend-api/src/main/resources/meta/data.xml
#	clearing-parent/backend-api/src/main/resources/meta/meta.xml
#	clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/AbstractControllerTest.java
#	clearing-parent/backend-api/src/test/resources/meta.json
#	clearing-parent/db-scripts/src/main/resources/db/DATA.sql
#	clearing-parent/db-scripts/src/main/resources/db/DDL.sql
 2023-04-26 11:42:16 +03:00
akulikov
67058ad32a fix names and add consts 2023-04-25 15:20:06 +03:00
psemenkov
510dfde848 # Conflicts: 
#	clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/AccountNewAction.java
#	clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/ExecutionDepositHistoryMapStore.java
#	clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/SessionHistoryMapStore.java
#	clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/SessionStatusDictionaryMapStore.java
#	clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/SessionTypeDictionaryMapStore.java
 2023-04-24 18:07:45 +03:00
AKurakin
8528730e9c TradingClearingRegistryType A/C поправил опечатку с кирилицей-латиницей 2023-04-24 12:09:49 +03:00
AKurakin
8d643808c2 data.4 3.5.0.4 (словари попозже доделаю) 2023-04-20 18:58:32 +03:00
AKurakin
a325a7fd2e backend-api http://jira.mfd.msk:8088/browse/CLS-273 2023-04-20 18:48:47 +03:00
AKurakin
43ae4b26d8 backend-api http://jira.mfd.msk:8088/browse/CLS-279 2023-04-20 16:30:44 +03:00
AKurakin
849130f8b3 backend-api http://jira.mfd.msk:8088/browse/CLS-270 2023-04-20 15:57:54 +03:00
psemenkov
9bfc038111 Squashed commit of the following: 
commit 670d21b13f
Merge: dd41ada2 7720f416
Author: AKurakin <akurakin@mfd.ru>
Date:   Wed Apr 19 16:44:12 2023 +0300

    Merge branch 'DDL_CLS-275' into dev

commit 7720f41699
Author: AKurakin <akurakin@mfd.ru>
Date:   Wed Apr 19 15:59:48 2023 +0300

    http://jira.mfd.msk:8088/browse/CLS-275 DDL (3) часть 3 правки тестов и кода TODO

commit 07e4e946de
Author: AKurakin <akurakin@mfd.ru>
Date:   Wed Apr 19 15:51:06 2023 +0300

    http://jira.mfd.msk:8088/browse/CLS-275 DDL (3) часть 2 доделал тест IMDG

commit a1a68d50b2
Author: AKurakin <akurakin@mfd.ru>
Date:   Wed Apr 19 13:06:51 2023 +0300

    http://jira.mfd.msk:8088/browse/CLS-275 DDL (3) часть 2 переименование STrade -> STrades

commit 762ddeacc5
Author: AKurakin <akurakin@mfd.ru>
Date:   Wed Apr 19 12:14:04 2023 +0300

    http://jira.mfd.msk:8088/browse/CLS-275 DDL (3) часть 1

commit dd41ada256
Author: AKurakin <akurakin@mfd.ru>
Date:   Tue Apr 18 16:02:37 2023 +0300

    backend-api . CLS-264 CLS-257

commit d7c74b25b1
Author: AKurakin <akurakin@mfd.ru>
Date:   Tue Apr 18 15:57:32 2023 +0300

    backend-api http://jira.mfd.msk:8088/browse/CLS-257 /accounting/

commit 32590c00f8
Author: AKurakin <akurakin@mfd.ru>
Date:   Tue Apr 18 14:12:41 2023 +0300

    backend-api http://jira.mfd.msk:8088/browse/CLS-257 unit-test дополнил, поправил

commit 5d75c6f53d
Author: AKurakin <akurakin@mfd.ru>
Date:   Tue Apr 18 12:19:29 2023 +0300

    backend-api http://jira.mfd.msk:8088/browse/CLS-257

commit a213ca1872
Author: AKurakin <akurakin@mfd.ru>
Date:   Mon Apr 17 17:21:33 2023 +0300

    backend-api .

commit 0ea216fef2
Author: AKurakin <akurakin@mfd.ru>
Date:   Mon Apr 17 17:19:55 2023 +0300

    http://jira.mfd.msk:8088/browse/CLS-256 backend-api. Юбилейный 256 таск :)
 2023-04-20 14:44:52 +03:00
AKurakin
7720f41699 http://jira.mfd.msk:8088/browse/CLS-275 DDL (3) часть 3 правки тестов и кода TODO 2023-04-19 16:01:33 +03:00
AKurakin
762ddeacc5 http://jira.mfd.msk:8088/browse/CLS-275 DDL (3) часть 1 2023-04-19 12:23:56 +03:00
AKurakin
dd41ada256 backend-api . CLS-264 CLS-257 2023-04-18 16:14:10 +03:00
AKurakin
d7c74b25b1 backend-api http://jira.mfd.msk:8088/browse/CLS-257 /accounting/ 2023-04-18 15:57:32 +03:00
AKurakin
32590c00f8 backend-api http://jira.mfd.msk:8088/browse/CLS-257 unit-test дополнил, поправил 2023-04-18 14:12:41 +03:00
AKurakin
5d75c6f53d backend-api http://jira.mfd.msk:8088/browse/CLS-257 2023-04-18 12:19:29 +03:00
AKurakin
a213ca1872 backend-api . 2023-04-17 17:21:33 +03:00
AKurakin
0ea216fef2 http://jira.mfd.msk:8088/browse/CLS-256 backend-api. Юбилейный 256 таск :) 2023-04-17 17:19:55 +03:00
AKurakin
f71ae406a2 http://jira.mfd.msk:8088/browse/CLS-261 DDL правки mapstore. Осторожно: удаление классов! 2023-04-11 14:46:37 +03:00
AKurakin
57b912dee1 http://jira.mfd.msk:8088/browse/CLS-261 DDL, meta.2 refactoring 2023-04-11 12:07:56 +03:00
AKurakin
7f58755bb8 http://jira.mfd.msk:8088/browse/CLS-261 DDL, meta.2 2023-04-10 21:23:18 +03:00
AKurakin
e3bc062346 meta.1.xml вернул нужные *History mapstore. Скоро будет обновление до meta.2.xml + ddl 2023-04-09 20:34:13 +03:00
ialbert
ce9ea6b1b2 Merge remote-tracking branch 'origin/dev' into dev 2023-04-07 19:25:26 +03:00
AKurakin
d44bea5228 Переименование комментариев. 2023-04-07 19:25:06 +03:00
ialbert
6652cc7465 json.xsl and meta.xml update 2023-04-07 19:25:01 +03:00
AKurakin
db8da95d32 Merge remote-tracking branch 'origin/dev' into dev 2023-04-07 18:55:05 +03:00
AKurakin
700ecaf547 Merge branch 'CLS_258_259' into dev 
# Conflicts:
#	clearing-parent/backend-api/src/main/resources/meta/data.xml
#	clearing-parent/backend-api/src/main/resources/meta/meta.xml
 2023-04-07 18:50:40 +03:00
psemenkov
4294321613 http://jira.mfd.msk:8088/browse/CLS-258 
Перенес общие классы и конфиги в test-clearing.
 2023-04-07 18:25:11 +03:00
psemenkov
5aea636e35 http://jira.mfd.msk:8088/browse/CLS-258 
Перенес тестовые утилиты в test-clearing.
 2023-04-07 17:09:20 +03:00
AKurakin
c1b17eb6c5 update meta 3.5.0.18 2023-04-06 18:53:10 +03:00
psemenkov
d7680f6bdf Перенес тестовые утилиты в новый модуль test-clearing. 2023-04-06 18:35:13 +03:00
AKurakin
cf22ea1074 platform-imdg-api-hazelcast-impl: HazelcastHelper refactoring 2023-04-06 17:59:47 +03:00
AKurakin
167db4a815 New meta 3.5.0.17 2023-04-06 12:55:36 +03:00
psemenkov
eb4e730bdf http://jira.mfd.msk:8088/browse/CLS-258 
Поменял Double на BigDecimal в полях nominalValue и lotSize.
 2023-04-06 10:13:17 +03:00
akulikov
15404dbec1 contact meta fix 2023-04-05 17:23:16 +03:00
akulikov
6ea7520b7b new CompanyErrors added 2023-04-05 13:50:40 +03:00
AKurakin
64e0dbbcf3 backend-api, UserMapStore: заполнение BaseRequest.userId fix unittest 2023-04-05 13:30:18 +03:00
AKurakin
316e2fe042 backend-api, UserMapStore: заполнение BaseRequest.userId 2 2023-04-05 13:18:59 +03:00
AKurakin
1e5e4e393d backend-api . 2023-04-05 12:33:37 +03:00
AKurakin
9aeb6ca6ee backend-api, UserMapStore: заполнение BaseRequest.userId 2023-04-05 12:33:20 +03:00
AKurakin
3140ea911e backend-api: ContactUpdateRequest and meta.xml fix 2023-04-05 12:31:50 +03:00
akulikov
ddc27dbb33 ContactUpdateRequest and meta.xml fix 2023-04-05 11:30:41 +03:00