рефакторинг

playjim · playjim · commit 44f572955b67 · 2022-04-25T16:32:21.000+03:00
diff --git a/backend/src/main/java/com/booking/backend/controller/OrganizationController.java b/backend/src/main/java/com/booking/backend/controller/OrganizationController.java
@@ -24,17 +24,20 @@ public List<OrganizationDto> getAll(@RequestParam Integer pageNo,
         return organizationService.getSortedOrganization(pageNo, pageSize, sortBy);
     }
 
-    @GetMapping("/organization")
-    @RequestMapping(value = "/organization", params = "name")
-    public List<OrganizationDto> getAll(@RequestParam String name) {
+    @GetMapping("/organization/name={name}")
+//    @RequestMapping(value = "/organization", params = "name")
+    public List<OrganizationDto> getAll(@PathVariable String name) {
         return organizationService.findAllByName(name);
     }
 
-    @GetMapping("/organization")
-    @RequestMapping(value = "/organization", params = "id")
-    public OrganizationDto getById(@RequestParam Long id) {
+    @GetMapping("/organization/id={id}")
+    public OrganizationDto getById(@PathVariable Long id) {
         return organizationService.getById(id);
     }
+//    @RequestMapping(value = "/organization", params = "id")
+//    public OrganizationDto getById(@RequestParam Long id) {
+//        return organizationService.getById(id);
+//    }
 
     @GetMapping("/organization")
     @RequestMapping(value = "/organization")
diff --git a/backend/src/main/java/com/booking/backend/entity/Booking.java b/backend/src/main/java/com/booking/backend/entity/Booking.java
@@ -1,25 +1,19 @@
 package com.booking.backend.entity;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 import javax.persistence.*;
 
-@Data
+@Getter
 @NoArgsConstructor
 @AllArgsConstructor
 @Entity
 @Builder
 public class Booking {
-
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
     @ManyToOne
     private Person person;
-
-
 }
diff --git a/backend/src/main/java/com/booking/backend/entity/Person.java b/backend/src/main/java/com/booking/backend/entity/Person.java
@@ -3,15 +3,13 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.Data;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
 
-@Data
+@Getter
 @NoArgsConstructor
 @AllArgsConstructor
 @Entity
diff --git a/backend/src/main/java/com/booking/backend/entity/Reservation.java b/backend/src/main/java/com/booking/backend/entity/Reservation.java
@@ -2,19 +2,16 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
 
 @Entity
-@Data
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
 public class Reservation {
 
-
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
diff --git a/backend/src/main/java/com/booking/backend/entity/SomeObject.java b/backend/src/main/java/com/booking/backend/entity/SomeObject.java
@@ -2,15 +2,13 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
 
 @Entity
-@Data
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
diff --git a/bot/src/main/java/com/booking/bot/service/ChatServiceImpl.java b/bot/src/main/java/com/booking/bot/service/ChatServiceImpl.java
@@ -4,7 +4,6 @@
 import com.booking.bot.dto.OrganizationDto;
 import com.booking.bot.dto.PersonDto;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
 import org.telegram.telegrambots.meta.api.methods.updatingmessages.EditMessageText;
@@ -16,19 +15,11 @@
 @Service
 @RequiredArgsConstructor
 public class ChatServiceImpl implements ChatService {
-    @Autowired
-    private MenuService menuService;
+    private final MenuService menuService;
+    private final BotAdapter botAdapter;
 
-    @Autowired
-    private BotAdapter botAdapter;
-
-    public ChatServiceImpl(BotAdapter botAdapter, MenuService menuService) {
-        this.botAdapter = botAdapter;
-        this.menuService = menuService;
-    }
-
-    Map<Long, String> chatState = new HashMap<>();
-    Map<Long, String> chatData = new HashMap<>();
+    private final Map<Long, String> chatState = new HashMap<>();
+    private final Map<Long, String> chatData = new HashMap<>();
 
     public SendMessage commandSwitch(Long userId, String command, Message message) {
         String userName = message.getFrom().getUserName();
