From c9fb6f4f3398e096c73189d7e40302bf52ad0ac4 Mon Sep 17 00:00:00 2001 From: ElEgEv <112943269+ElEgEv@users.noreply.github.com> Date: Tue, 12 Dec 2023 09:24:41 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=BC=D0=B5=D0=B6=D1=83?= =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BD=D0=BE=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../8.0/executionHistory/executionHistory.bin | Bin 4285520 -> 4451581 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes compose/.gradle/8.0/fileHashes/fileHashes.bin | Bin 455891 -> 455991 bytes .../.gradle/8.0/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../8.0/fileHashes/resourceHashesCache.bin | Bin 407677 -> 408187 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .../ru/ulstu/is/pmu/tank/api/ApiRoutes.kt | 6 +++--- .../ru/ulstu/is/pmu/tank/api/ServerService.kt | 4 ++-- .../tank/api/repository/RestUserRepository.kt | 1 + compose/server/package.json | 2 +- 10 files changed, 7 insertions(+), 6 deletions(-) diff --git a/compose/.gradle/8.0/executionHistory/executionHistory.bin b/compose/.gradle/8.0/executionHistory/executionHistory.bin index c75d56148882d5ba8d23818a528962d74a0a66c3..bd2d7ece210fb7885b60304ae817e445784cb862 100644 GIT binary patch delta 10167 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 Pzx^SA`Fg9lYX5%$LT_xq delta 4268 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 diff --git a/compose/.gradle/8.0/executionHistory/executionHistory.lock b/compose/.gradle/8.0/executionHistory/executionHistory.lock index 772189ff386baf97aa027c31712e863926685c2d..e162cbd9f4f7b108dc94090d23db320a88305ccb 100644 GIT binary patch literal 17 VcmZQp`#gpfSeTe7V6!{4S|XT3Ke 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 DGeJ#R delta 7563 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 aC(M2wv$qwJSm)pWE^*GQI$H~$}-C);NL diff --git a/compose/.gradle/8.0/fileHashes/fileHashes.lock b/compose/.gradle/8.0/fileHashes/fileHashes.lock index a54bda6eb8fc8ba41ff964c74755918d04a4a075..26a0ed09a46e6ee0395ef725bb990ababf8d1203 100644 GIT binary patch literal 17 WcmZQ(aBaLGm;b_n0R$N9uK)lkKLn!y literal 17 WcmZQ(aBaLGm;b_n0R$LpwgUhu90Y>^ diff --git a/compose/.gradle/8.0/fileHashes/resourceHashesCache.bin b/compose/.gradle/8.0/fileHashes/resourceHashesCache.bin index 4f08e908afda9ef0c6a82a2eebc07238a8c421f3..d53c5786fbd63526ecb04bb82c78e115288dd9f5 100644 GIT binary patch delta 967 zcmezSLE`rpi47(ajQN{QB_f&lXGN}PC~yDC00L}Q=9^okG$r}xb4nE|Ef9tXTCU%` z)c7(RW98sG85)g)A9^1sNA^uk&KuBhTot-8zfW zk(>XpEoZydF;l3ji`$D!8FvXW$q7#Pa%A1Q{Z9wu+jhp7?XLuwezNl){JxXjqHQTe zt;NCZwn6Z|-}@=?OJ~b^9Y3ra~6}Z*yOkNPPSb5w(ik?xo1YEWo&N`!qwQ z9U_cL+x^{`P73oMV8840=&vgD5hjyM#t^l=}a&98Oyhqlrwco@vk`Sl*w_u z9cq^7_Ae8eW^*uFZeKBr$xV*Yc>DVuOb6NcqYCe<+w$2%&C1@sd_U7d7XFxnR~E5O zSAd9GJl<}9gb5f5H>Zo&v*xxNTw~g9aE&?oB4hscp5-jF#Q2U%-b>6q4K+i3yUae8 z)7*@e8x?2pPS;<_$~WD18H>{P6W3WZSQ&G-f4sv|!6xwS-yYVoobuX)4dWk_WkRL}hF??PFFnHYC&RE!V= zSyZxJEsOOJAEVWFe zdSjphNgx&kVS%Nk;ty1Q{O`}YwW0HzcJ4)>pd6|S@uMFL-6ACx-P$hi9)33^5mSYb z#IJ)#cP!p-v!|~4R>pgf;b>+wv}vExTjs*CFJ`~`(v5xBBQTZ7bdI)bU|yvw0~o6a9CUKI26WaKnIzR7{18R(JYz!!$xS9K?}E(bpf#w0v-96GC>8+ zxBQ3!?S}zbx9SiA`3JZA7y<|cw;LS-Xau*LAp-gj0cn^0=maH~I_U%$mxAd8*tcUc z0_zh2VYg340?8A%Fj@jy4FxFx0QC)*b$yR4wweMs9sx18@3;cN2Diw+0+xCwiyr1p#TXA*d3!FR2Aik3+zbR{#J2 diff --git a/compose/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/compose/.gradle/buildOutputCleanup/buildOutputCleanup.lock index d0c7ee20a64855ee99324092b87a11df4b98276c..bb170faf22f8ebeb76095c46753a524e5b02da54 100644 GIT binary patch literal 17 VcmZQhF*rNr{gMY+3}A5N3jjSt295v# literal 17 VcmZQhF*rNr{gMY+3}A310{}d@1_A&8 diff --git a/compose/app/src/main/java/ru/ulstu/is/pmu/tank/api/ApiRoutes.kt b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/api/ApiRoutes.kt index 7594d0b..b7e80c0 100644 --- a/compose/app/src/main/java/ru/ulstu/is/pmu/tank/api/ApiRoutes.kt +++ b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/api/ApiRoutes.kt @@ -3,9 +3,9 @@ package ru.ulstu.`is`.pmu.tank.api object ApiRoutes { const val BASE = "http://10.0.2.2:8079/" const val USER = "users" - const val LEVEL = "level" - const val NATION = "nation" - const val TANK = "TANK" + const val LEVEL = "levels" + const val NATION = "nations" + const val TANK = "tanks" const val USER_TANK = "userTanks" const val NOT_USER_TANK = "notUserTanks" } \ No newline at end of file diff --git a/compose/app/src/main/java/ru/ulstu/is/pmu/tank/api/ServerService.kt b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/api/ServerService.kt index e59883d..94d65dd 100644 --- a/compose/app/src/main/java/ru/ulstu/is/pmu/tank/api/ServerService.kt +++ b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/api/ServerService.kt @@ -78,7 +78,7 @@ interface ServerService { @Query("_limit") limit: Int ): List - @GET(ApiRoutes.NATION) + @GET("/getall/${ApiRoutes.NATION}") suspend fun getAllNations(): List @GET("${ApiRoutes.NATION}/{id}") @@ -162,7 +162,7 @@ interface ServerService { // ![USER_TANK_CROSS_REF] companion object { - private const val BASE_URL = ApiRoutes.BASE + private const val BASE_URL = "http://10.0.2.2:8079/" @Volatile private var INSTANCE: ServerService? = null diff --git a/compose/app/src/main/java/ru/ulstu/is/pmu/tank/api/repository/RestUserRepository.kt b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/api/repository/RestUserRepository.kt index 12f376e..e3dfc35 100644 --- a/compose/app/src/main/java/ru/ulstu/is/pmu/tank/api/repository/RestUserRepository.kt +++ b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/api/repository/RestUserRepository.kt @@ -32,6 +32,7 @@ class RestUserRepository( override suspend fun insertUser(user: User) { service.insertUser(user.toRemote()) + dbUserRepository.insertUser(user) } override suspend fun updateUser(user: User) { diff --git a/compose/server/package.json b/compose/server/package.json index 0fb3100..2fb0529 100644 --- a/compose/server/package.json +++ b/compose/server/package.json @@ -1,5 +1,5 @@ { - "name": "fake-db", + "name": "20-db", "version": "1.0.0", "scripts": { "start": "json-server --watch data.json --host 0.0.0.0 -p 8079"