Get all info user #93 by VladNesterov · Pull Request #93 · receipt-project/receipt-java

VladNesterov · 2020-06-15T19:24:09Z

No description provided.

…ebClient

…n you signUp

vladimirshefer · 2020-06-16T01:00:24Z

fns-sdk/src/main/kotlin/space/shefer/receipt/fnssdk/excepion/FnsException.kt

    : FnsException("Login with phone $login failed", cause)
+
+@ResponseStatus(code = HttpStatus.CONFLICT)
+class UserWasExistException(userName: String, cause: Throwable? = null)


UserAlreadyExistsException

исправил

vladimirshefer · 2020-06-16T01:03:17Z

fns-sdk/src/main/kotlin/space/shefer/receipt/fnssdk/webclient/FnsReceiptWebClient.kt

+            throw UserWasExistException(name, e)
+        } catch (c: HttpClientErrorException.BadRequest) {
+            throw IncorrectEmailException(email, c)
+        } catch (d: HttpServerErrorException.InternalServerError) {


InternalServerError возникает буквально в любой непонятной ситуации.
Не всякий IE (InternalError) - это неправильный номер.

Есть варианты как понять что дело именно в номере?
Может, там приходит текст в ответ с описанием

переделал

fns-sdk/src/main/kotlin/space/shefer/receipt/fnssdk/excepion/FnsException.kt

fns-sdk/src/main/kotlin/space/shefer/receipt/fnssdk/webclient/FnsReceiptWebClient.kt

…oken

vladimirshefer · 2020-06-20T18:00:00Z

fns-sdk/src/main/kotlin/space/shefer/receipt/fnssdk/service/ResponseErrorHandleFNS.kt

+
+    @Throws(IOException::class)
+    override fun handleError(httpResponse: ClientHttpResponse) {
+        when {


Внутри when какой то бесполезный код

поправил

fns-sdk/src/main/kotlin/space/shefer/receipt/fnssdk/webclient/FnsReceiptWebClient.kt

vladimirshefer · 2020-06-20T18:02:11Z

fns-sdk/src/main/kotlin/space/shefer/receipt/fnssdk/webclient/FnsReceiptWebClient.kt

    }

-    fun login(login: String, password: String) {
+    fun login(phone: String, password: String): ResponseEntity<UserResponseLoginFnsDto>? {


Тут нужно возвращать просто UserResponseLoginDto

исправил

сделал

vladimirshefer · 2020-06-24T01:09:57Z

fns-sdk/src/main/kotlin/space/shefer/receipt/fnssdk/service/ResponseErrorHandleFNS.kt

+
+    @Throws(IOException::class)
+    override fun handleError(httpResponse: ClientHttpResponse) {
+        if (httpResponse.statusCode == HttpStatus.NO_CONTENT) {


А если hasError всегда возвращает false, то разве он сюда вообще зайдет когда нибудь?

fns-sdk/src/main/kotlin/space/shefer/receipt/fnssdk/webclient/FnsReceiptWebClient.kt

vladimirshefer · 2020-06-24T01:14:56Z

fns-sdk/src/main/kotlin/space/shefer/receipt/fnssdk/dto/UserResponseLoginFnsDto.kt

+package space.shefer.receipt.fnssdk.dto
+
+
+class UserResponseLoginFnsDto {


Переименуй FnsLoginResponse

fns-sdk/src/main/kotlin/space/shefer/receipt/fnssdk/excepion/FnsException.kt

vladimirshefer · 2020-06-24T09:33:12Z

fns-sdk/src/main/kotlin/space/shefer/receipt/fnssdk/webclient/FnsReceiptWebClient.kt

+            } else if (responseEntity.statusCode == HttpStatus.INTERNAL_SERVER_ERROR) {
+                throw IncorrectPhoneException(phone)
+            }
+        } catch (e: Exception) {


зачем ловить Exception? какие ошибки мы тут ожидаем?

ловлю UnsupportedOperationException, подозреваю что это дублирование кода, так как все ошибки я уже отработал в ResponseErrorHandleFNS

vladimirshefer · 2020-06-30T14:06:45Z

rest-api/src/main/java/space/shefer/receipt/rest/controller/UserController.java

+    if (authHeader != null) {
+      return fnsUserService.getUserByToken(authHeader.substring(authHeader.indexOf(" ") + 1));
+    }
+    return null;


не null а 404 нужно

vladimirshefer · 2020-06-30T14:07:39Z

rest-api/src/main/java/space/shefer/receipt/rest/service/FnsUserService.java

+    FnsLoginResponse responseEntity = fnsReceiptWebClient.login(userLoginDto.getPhone(), userLoginDto.getPassword());
+    if (responseEntity != null) {
+      UserProfile userProfile = userProfileRepository.getByPhone(userLoginDto.getPhone());
+      if (userProfile != null && userProfile.getUpdatedAt() == null) {


а зачем проверка updatedAt?

изменил. Она тут не нужна, забыл убрать, логику переделал.

vladimirshefer · 2020-06-30T14:09:09Z

rest-api/src/main/java/space/shefer/receipt/rest/controller/UserController.java

+  @RequestMapping(value = "/users/me", method = RequestMethod.GET)
+  public UserSignUpDto getInfoByToken(@Nullable @RequestHeader("Authorization") String authHeader) {
+    if (authHeader != null) {
+      return fnsUserService.getUserByToken(authHeader.substring(authHeader.indexOf(" ") + 1));


authHeader.substring(authHeader.indexOf(" ") + 1)
вынести в новый метод getTokenFromAuthHeader(String header)

сделал

vladimirshefer · 2020-06-30T14:09:53Z

fns-sdk/src/main/kotlin/space/shefer/receipt/fnssdk/webclient/FnsReceiptWebClient.kt

-                    String::class.java
-            )
+                    FnsLoginResponse::class.java
+            ).body


поставь тут !! и в методе возвращаемый тип сделай без вопросика

Расскажи подробнее, что это и как. Я даже не знаю как это загуглить)

vladimirshefer · 2020-06-30T14:10:39Z

fns-sdk/src/main/kotlin/space/shefer/receipt/fnssdk/webclient/FnsReceiptWebClient.kt

                HttpEntity("""{"email":"$email","name":"$name","phone":"$phone"}""", headers),
                String::class.java
        )
+        if (responseEntity.statusCode == HttpStatus.CONFLICT) {


сначала нужно проверить что если 2XX, то сразу return. иначе начинать перебиравть ифами ошибки

сделал

fns-sdk/src/main/kotlin/space/shefer/receipt/fnssdk/webclient/FnsReceiptWebClient.kt

vladimirshefer · 2020-06-30T14:14:15Z

fns-sdk/src/main/kotlin/space/shefer/receipt/fnssdk/service/ResponseErrorHandleFNS.kt

+
+    @Throws(IOException::class)
+    override fun handleError(httpResponse: ClientHttpResponse) {
+        if (httpResponse.statusCode == HttpStatus.NO_CONTENT) {


этот код обрабатывает ошибки
а еще код в тоже обрабатываает эти же самые ошибки

нужно чтобы обрабатывалось все в FnsReceiptWebClient::signUp, а тут ничего не обрабатывалось
перенеси логику отсюда туда
hasError должен всегда возвращать false

перенес

VladNesterov added 2 commits June 15, 2020 21:16

RCJ-93 for switch

337b880

RCJ-93 Get user by token and improve logic in singIn method from FnsW…

161ddd0

…ebClient

VladNesterov self-assigned this Jun 15, 2020

VladNesterov changed the title ~~Get all info user~~ Get all info user #93 Jun 15, 2020

VladNesterov linked an issue Jun 15, 2020 that may be closed by this pull request

Получение полной инфы о юзере #90

Open

VladNesterov added 2 commits June 15, 2020 22:25

RCJ-93 rename

271368d

RCJ-93 add email and name in first login, also add email and name whe…

a9e936a

…n you signUp

VladNesterov requested a review from vladimirshefer June 15, 2020 22:00

vladimirshefer requested changes Jun 16, 2020

View reviewed changes

RCJ-93 add new Exception Handler and finish logic with searching by t…

f272340

…oken

vladimirshefer requested changes Jun 21, 2020

View reviewed changes

VladNesterov added 2 commits June 22, 2020 14:28

RCJ-93 rewrite ResponseErrorHandleFNS.kt

5cc7773

RCJ-93 add check on HttpStatus.NO_CONTENT

8ec3480

vladimirshefer requested changes Jun 24, 2020

View reviewed changes

RCJ-93 rebuild exception handler, rename dto, and add try cuth to signUp

f85e365

vladimirshefer requested changes Jun 24, 2020

View reviewed changes

VladNesterov added 2 commits June 24, 2020 13:41

RCJ-93 change http status for exception

a9ccaa6

RCJ-93 removed exception

c2e09fa

vladimirshefer requested changes Jun 30, 2020

View reviewed changes

VladNesterov added 3 commits July 11, 2020 00:31

RCJ-93 move logic from ErrorHandler to FnsReceiptWebClient.kt

5187e14

RCJ-93 rewrite logic for login

3fdbe24

RCJ-93 return 404 if token not found

9d515ed

		package space.shefer.receipt.fnssdk.dto


		class UserResponseLoginFnsDto {

Conversation

VladNesterov commented Jun 15, 2020

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

VladNesterov Jun 24, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

VladNesterov Jul 10, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

VladNesterov Jun 24, 2020 •

edited

Loading

VladNesterov Jul 10, 2020 •

edited

Loading