diff --git a/front/src/components/core/ModalDialogStyled.js b/front/src/components/core/ModalDialogStyled.js deleted file mode 100644 index 7eaa151..0000000 --- a/front/src/components/core/ModalDialogStyled.js +++ /dev/null @@ -1,9 +0,0 @@ -import {styled} from "@mui/material/styles"; -import Dialog from "@mui/material/Dialog"; - -export const ModalDialogStyled = styled(Dialog)(({theme}) => ({ - backdrop: { - margin: '4px', - border: 'solid', - }, -})); \ No newline at end of file diff --git a/src/main/java/ru/kayashov/bar/bot/annotation/FilterTitle.java b/src/main/java/ru/kayashov/bar/bot/annotation/FilterTitle.java deleted file mode 100644 index 31e51bf..0000000 --- a/src/main/java/ru/kayashov/bar/bot/annotation/FilterTitle.java +++ /dev/null @@ -1,12 +0,0 @@ -package ru.kayashov.bar.bot.annotation; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.METHOD) -public @interface FilterTitle { - String title(); -} diff --git a/src/main/java/ru/kayashov/bar/bot/domain/Bot.java b/src/main/java/ru/kayashov/bar/bot/domain/Bot.java index 6d1402a..a87f837 100644 --- a/src/main/java/ru/kayashov/bar/bot/domain/Bot.java +++ b/src/main/java/ru/kayashov/bar/bot/domain/Bot.java @@ -1,7 +1,5 @@ package ru.kayashov.bar.bot.domain; -import org.telegram.telegrambots.meta.api.objects.User; -import org.telegram.telegrambots.meta.exceptions.TelegramApiException; import ru.kayashov.bar.bot.domain.methods.AbstractDeleteMessage; import ru.kayashov.bar.bot.domain.methods.AbstractInlineKeyboard; import ru.kayashov.bar.bot.domain.methods.AbstractMethod; diff --git a/src/main/java/ru/kayashov/bar/bot/domain/command/impl/StartCommand.java b/src/main/java/ru/kayashov/bar/bot/domain/command/impl/StartCommand.java index c9453c2..2fb0a1c 100644 --- a/src/main/java/ru/kayashov/bar/bot/domain/command/impl/StartCommand.java +++ b/src/main/java/ru/kayashov/bar/bot/domain/command/impl/StartCommand.java @@ -2,32 +2,27 @@ package ru.kayashov.bar.bot.domain.command.impl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; -import org.telegram.telegrambots.meta.api.methods.GetUserProfilePhotos; import ru.kayashov.bar.bot.annotation.CommandData; import ru.kayashov.bar.bot.domain.command.api.Command; -import ru.kayashov.bar.bot.domain.keyboards.reply.ReplyKeyboardMarker; import ru.kayashov.bar.bot.domain.methods.AbstractMethod; import ru.kayashov.bar.bot.domain.model.AbstractChat; import ru.kayashov.bar.bot.domain.model.AbstractUpdate; import ru.kayashov.bar.model.entity.Visitor; import ru.kayashov.bar.repository.VisitorsRepository; -import java.util.Base64; import java.util.List; import java.util.Optional; -import java.util.Random; import static ru.kayashov.bar.bot.domain.keyboards.reply.ReplyKeyboardMarker.getMainMenu; import static ru.kayashov.bar.bot.domain.utils.MethodUtils.sendKeyboardMessage; -import static ru.kayashov.bar.bot.domain.utils.MethodUtils.sendMessage; /** * Команда обработки запроса меню - * + *

* Реализация {@link } */ @Component -@CommandData(name="/start") +@CommandData(name = "/start") @RequiredArgsConstructor public class StartCommand implements Command { @@ -40,7 +35,7 @@ public class StartCommand implements Command { Optional visitorOpt = visitorsRepository.findById(chat.getId()); String message; Visitor visitor; - if(visitorOpt.isPresent()) { + if (visitorOpt.isPresent()) { visitor = visitorOpt.get(); message = "С возвращением "; } else { diff --git a/src/main/java/ru/kayashov/bar/bot/domain/keyboards/reply/ReplyKeyboardMarker.java b/src/main/java/ru/kayashov/bar/bot/domain/keyboards/reply/ReplyKeyboardMarker.java index f54da64..e8c0d87 100644 --- a/src/main/java/ru/kayashov/bar/bot/domain/keyboards/reply/ReplyKeyboardMarker.java +++ b/src/main/java/ru/kayashov/bar/bot/domain/keyboards/reply/ReplyKeyboardMarker.java @@ -1,7 +1,6 @@ package ru.kayashov.bar.bot.domain.keyboards.reply; import lombok.experimental.UtilityClass; -import org.springframework.stereotype.Component; import ru.kayashov.bar.bot.domain.model.AbstractKeyboard; import ru.kayashov.bar.bot.domain.model.AbstractKeyboardButton; diff --git a/src/main/java/ru/kayashov/bar/bot/domain/methods/AbstractInlineKeyboard.java b/src/main/java/ru/kayashov/bar/bot/domain/methods/AbstractInlineKeyboard.java index a38e299..7fada6b 100644 --- a/src/main/java/ru/kayashov/bar/bot/domain/methods/AbstractInlineKeyboard.java +++ b/src/main/java/ru/kayashov/bar/bot/domain/methods/AbstractInlineKeyboard.java @@ -8,8 +8,8 @@ import ru.kayashov.bar.bot.domain.model.AbstractKeyboard; @Getter public class AbstractInlineKeyboard extends AbstractMethod { - private String message; - private AbstractKeyboard keyboard; + private final String message; + private final AbstractKeyboard keyboard; @Builder public AbstractInlineKeyboard(Long chatId, String message, AbstractKeyboard keyboard) { diff --git a/src/main/java/ru/kayashov/bar/bot/domain/model/AbstractUpdate.java b/src/main/java/ru/kayashov/bar/bot/domain/model/AbstractUpdate.java index e703e3d..f0c56d3 100644 --- a/src/main/java/ru/kayashov/bar/bot/domain/model/AbstractUpdate.java +++ b/src/main/java/ru/kayashov/bar/bot/domain/model/AbstractUpdate.java @@ -9,7 +9,4 @@ public class AbstractUpdate { private AbstractCallbackQuery callbackQuery; private AbstractMessage message; - public boolean hasMessage() { - return message != null && message.getMessage() != null && !message.getMessage().isEmpty(); - } } diff --git a/src/main/java/ru/kayashov/bar/bot/domain/model/pojo/CarGenerationDto.java b/src/main/java/ru/kayashov/bar/bot/domain/model/pojo/CarGenerationDto.java deleted file mode 100644 index a5d0e7a..0000000 --- a/src/main/java/ru/kayashov/bar/bot/domain/model/pojo/CarGenerationDto.java +++ /dev/null @@ -1,13 +0,0 @@ -package ru.kayashov.bar.bot.domain.model.pojo; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonRootName; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@JsonRootName(value = "Gen") -@JsonInclude(JsonInclude.Include.NON_NULL) -public class CarGenerationDto extends FindServiceDto { -} diff --git a/src/main/java/ru/kayashov/bar/bot/domain/model/pojo/CarMarkDto.java b/src/main/java/ru/kayashov/bar/bot/domain/model/pojo/CarMarkDto.java deleted file mode 100644 index f91c4ef..0000000 --- a/src/main/java/ru/kayashov/bar/bot/domain/model/pojo/CarMarkDto.java +++ /dev/null @@ -1,13 +0,0 @@ -package ru.kayashov.bar.bot.domain.model.pojo; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonRootName; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonRootName(value = "Mark") -public class CarMarkDto extends FindServiceDto { -} \ No newline at end of file diff --git a/src/main/java/ru/kayashov/bar/bot/domain/model/pojo/CarModelDto.java b/src/main/java/ru/kayashov/bar/bot/domain/model/pojo/CarModelDto.java deleted file mode 100644 index ab46cc5..0000000 --- a/src/main/java/ru/kayashov/bar/bot/domain/model/pojo/CarModelDto.java +++ /dev/null @@ -1,13 +0,0 @@ -package ru.kayashov.bar.bot.domain.model.pojo; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonRootName; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonRootName(value = "Model") -public class CarModelDto extends FindServiceDto { -} \ No newline at end of file diff --git a/src/main/java/ru/kayashov/bar/bot/domain/model/pojo/FindPageableDto.java b/src/main/java/ru/kayashov/bar/bot/domain/model/pojo/FindPageableDto.java deleted file mode 100644 index a190a7b..0000000 --- a/src/main/java/ru/kayashov/bar/bot/domain/model/pojo/FindPageableDto.java +++ /dev/null @@ -1,21 +0,0 @@ -package ru.kayashov.bar.bot.domain.model.pojo; - -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonRootName; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@JsonRootName("Find") -public class FindPageableDto { - - @JsonProperty("l") - private Long locationId; - - @JsonProperty("g") - private Long carGenerationId; - - @JsonProperty("p") - private Integer page; -} diff --git a/src/main/java/ru/kayashov/bar/bot/domain/model/pojo/FindServiceDto.java b/src/main/java/ru/kayashov/bar/bot/domain/model/pojo/FindServiceDto.java deleted file mode 100644 index 3547501..0000000 --- a/src/main/java/ru/kayashov/bar/bot/domain/model/pojo/FindServiceDto.java +++ /dev/null @@ -1,12 +0,0 @@ -package ru.kayashov.bar.bot.domain.model.pojo; - -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -public class FindServiceDto extends PageableDto { - private String name; - private Long value; - private Long old; -} \ No newline at end of file diff --git a/src/main/java/ru/kayashov/bar/bot/domain/model/pojo/LocationDto.java b/src/main/java/ru/kayashov/bar/bot/domain/model/pojo/LocationDto.java deleted file mode 100644 index 5a711b4..0000000 --- a/src/main/java/ru/kayashov/bar/bot/domain/model/pojo/LocationDto.java +++ /dev/null @@ -1,18 +0,0 @@ -package ru.kayashov.bar.bot.domain.model.pojo; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonRootName; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@JsonRootName("Loc") -@JsonInclude(JsonInclude.Include.NON_NULL) -public class LocationDto extends PageableDto { - private Long id; - @JsonProperty("p") - private Long parent; - private String name; -} \ No newline at end of file diff --git a/src/main/java/ru/kayashov/bar/bot/domain/model/pojo/PageableDto.java b/src/main/java/ru/kayashov/bar/bot/domain/model/pojo/PageableDto.java deleted file mode 100644 index 8fd1024..0000000 --- a/src/main/java/ru/kayashov/bar/bot/domain/model/pojo/PageableDto.java +++ /dev/null @@ -1,12 +0,0 @@ -package ru.kayashov.bar.bot.domain.model.pojo; - -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -public class PageableDto { - @JsonProperty(value = "pn") - Integer page; -} diff --git a/src/main/java/ru/kayashov/bar/controller/AuthController.java b/src/main/java/ru/kayashov/bar/controller/AuthController.java index 25cd6e5..758ddbc 100644 --- a/src/main/java/ru/kayashov/bar/controller/AuthController.java +++ b/src/main/java/ru/kayashov/bar/controller/AuthController.java @@ -4,12 +4,10 @@ import io.jsonwebtoken.Claims; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import ru.kayashov.bar.controller.dto.AuthRequestDto; import ru.kayashov.bar.controller.dto.AuthResponseDto; @@ -33,7 +31,7 @@ public class AuthController { @PostMapping("/login") public AuthResponseDto checkTelegramChat(@RequestBody AuthRequestDto dto) { - if(dto.getByLogin()) { + if (dto.getByLogin()) { return checkLogin(dto.getLogin(), dto.getPassword()); } else { return parseCode(dto.getCode()); @@ -59,16 +57,16 @@ public class AuthController { } private AuthResponseDto checkLogin(String login, String password) { - if(login == null || login.isEmpty() || password == null || password.isEmpty()) { + if (login == null || login.isEmpty() || password == null || password.isEmpty()) { return new AuthResponseDto(null, "Поля не могут быть пустые"); } Optional visitorOpt = visitorsRepository.findByLogin(login); - if(visitorOpt.isEmpty()) { + if (visitorOpt.isEmpty()) { return new AuthResponseDto(null, "Не найдет пользователь " + login); } Visitor visitor = visitorOpt.get(); - if(passwordEncoder.matches(password, visitor.getPassword())) { + if (passwordEncoder.matches(password, visitor.getPassword())) { return new AuthResponseDto(jwtTokenProvider.generateToken(visitor), null); } else { return new AuthResponseDto(null, "Неверный логин или пароль"); diff --git a/src/main/java/ru/kayashov/bar/controller/dto/cocktail/CocktailSimpleResponseDto.java b/src/main/java/ru/kayashov/bar/controller/dto/cocktail/CocktailSimpleResponseDto.java index 5118eb6..24d500f 100644 --- a/src/main/java/ru/kayashov/bar/controller/dto/cocktail/CocktailSimpleResponseDto.java +++ b/src/main/java/ru/kayashov/bar/controller/dto/cocktail/CocktailSimpleResponseDto.java @@ -3,11 +3,6 @@ package ru.kayashov.bar.controller.dto.cocktail; import lombok.Getter; import lombok.Setter; import ru.kayashov.bar.model.entity.CocktailEntity; -import ru.kayashov.bar.model.entity.IngredientEntity; -import ru.kayashov.bar.model.entity.ReceiptEntity; -import ru.kayashov.bar.model.entity.TagEntity; - -import java.util.stream.Collectors; @Getter @Setter diff --git a/src/main/java/ru/kayashov/bar/model/entity/IngredientEntity.java b/src/main/java/ru/kayashov/bar/model/entity/IngredientEntity.java index 8678ac7..f8f2409 100644 --- a/src/main/java/ru/kayashov/bar/model/entity/IngredientEntity.java +++ b/src/main/java/ru/kayashov/bar/model/entity/IngredientEntity.java @@ -1,21 +1,18 @@ package ru.kayashov.bar.model.entity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.Table; import java.util.List; @Entity @@ -33,7 +30,7 @@ public class IngredientEntity { private Boolean alcohol; private Integer abv; - @Column(columnDefinition="text") + @Column(columnDefinition = "text") private String description; @OneToMany(mappedBy = "ingredient") diff --git a/src/main/java/ru/kayashov/bar/model/entity/OrderStatus.java b/src/main/java/ru/kayashov/bar/model/entity/OrderStatus.java index 369c1e4..08df636 100644 --- a/src/main/java/ru/kayashov/bar/model/entity/OrderStatus.java +++ b/src/main/java/ru/kayashov/bar/model/entity/OrderStatus.java @@ -1,5 +1,5 @@ package ru.kayashov.bar.model.entity; public enum OrderStatus { - NEW, PROCESS, DONE, CANCEL; + NEW, PROCESS, DONE, CANCEL } diff --git a/src/main/java/ru/kayashov/bar/model/entity/ParserEntity.java b/src/main/java/ru/kayashov/bar/model/entity/ParserEntity.java deleted file mode 100644 index a9feb90..0000000 --- a/src/main/java/ru/kayashov/bar/model/entity/ParserEntity.java +++ /dev/null @@ -1,24 +0,0 @@ -package ru.kayashov.bar.model.entity; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import lombok.Getter; -import lombok.Setter; -import org.springframework.scheduling.annotation.EnableScheduling; - -@Entity -@Table(name = "parser") -@Getter -@Setter -public class ParserEntity { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Integer id; - private Long ingredientId; - private Long cocktailId; - private Long ingredientError; - private Long cocktailError; -} diff --git a/src/main/java/ru/kayashov/bar/model/entity/ReceiptEntity.java b/src/main/java/ru/kayashov/bar/model/entity/ReceiptEntity.java index 302c1ff..43b42e3 100644 --- a/src/main/java/ru/kayashov/bar/model/entity/ReceiptEntity.java +++ b/src/main/java/ru/kayashov/bar/model/entity/ReceiptEntity.java @@ -1,16 +1,14 @@ package ru.kayashov.bar.model.entity; +import lombok.Getter; +import lombok.Setter; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; import javax.persistence.Table; -import lombok.Getter; -import lombok.Setter; - -import java.util.List; @Entity @Table(name = "receipt") diff --git a/src/main/java/ru/kayashov/bar/model/entity/UnitRepository.java b/src/main/java/ru/kayashov/bar/model/entity/UnitRepository.java index f93c147..9440ff9 100644 --- a/src/main/java/ru/kayashov/bar/model/entity/UnitRepository.java +++ b/src/main/java/ru/kayashov/bar/model/entity/UnitRepository.java @@ -5,6 +5,4 @@ import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; public interface UnitRepository extends JpaRepository { - - Optional findByName(String unit); } \ No newline at end of file diff --git a/src/main/java/ru/kayashov/bar/model/entity/Visitor.java b/src/main/java/ru/kayashov/bar/model/entity/Visitor.java index 9d19a51..5204173 100644 --- a/src/main/java/ru/kayashov/bar/model/entity/Visitor.java +++ b/src/main/java/ru/kayashov/bar/model/entity/Visitor.java @@ -7,12 +7,7 @@ import org.springframework.security.core.userdetails.UserDetails; import javax.persistence.CascadeType; import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; import javax.persistence.OneToMany; import java.time.LocalDateTime; import java.util.Collection; diff --git a/src/main/java/ru/kayashov/bar/repository/AlcoholicRepository.java b/src/main/java/ru/kayashov/bar/repository/AlcoholicRepository.java index 229499e..fd9d5ef 100644 --- a/src/main/java/ru/kayashov/bar/repository/AlcoholicRepository.java +++ b/src/main/java/ru/kayashov/bar/repository/AlcoholicRepository.java @@ -7,6 +7,5 @@ import java.util.Optional; public interface AlcoholicRepository extends JpaRepository { - Optional findByEnNameIgnoreCase(String enName); Optional findByName(String name); } \ No newline at end of file diff --git a/src/main/java/ru/kayashov/bar/repository/CategoryRepository.java b/src/main/java/ru/kayashov/bar/repository/CategoryRepository.java index 3edfd71..df44e0c 100644 --- a/src/main/java/ru/kayashov/bar/repository/CategoryRepository.java +++ b/src/main/java/ru/kayashov/bar/repository/CategoryRepository.java @@ -1,13 +1,11 @@ package ru.kayashov.bar.repository; import org.springframework.data.jpa.repository.JpaRepository; -import ru.kayashov.bar.model.entity.AlcoholicEntity; import ru.kayashov.bar.model.entity.CategoryEntity; import java.util.Optional; public interface CategoryRepository extends JpaRepository { - Optional findByEnNameIgnoreCase(String enName); Optional findByNameIgnoreCase(String name); } \ No newline at end of file diff --git a/src/main/java/ru/kayashov/bar/repository/CocktailRepository.java b/src/main/java/ru/kayashov/bar/repository/CocktailRepository.java index 79868c7..82642c4 100644 --- a/src/main/java/ru/kayashov/bar/repository/CocktailRepository.java +++ b/src/main/java/ru/kayashov/bar/repository/CocktailRepository.java @@ -3,8 +3,5 @@ package ru.kayashov.bar.repository; import org.springframework.data.jpa.repository.JpaRepository; import ru.kayashov.bar.model.entity.CocktailEntity; -import java.util.Collection; -import java.util.List; - public interface CocktailRepository extends JpaRepository { } \ No newline at end of file diff --git a/src/main/java/ru/kayashov/bar/repository/GlassRepository.java b/src/main/java/ru/kayashov/bar/repository/GlassRepository.java index 5e8228e..b8d7cec 100644 --- a/src/main/java/ru/kayashov/bar/repository/GlassRepository.java +++ b/src/main/java/ru/kayashov/bar/repository/GlassRepository.java @@ -1,13 +1,11 @@ package ru.kayashov.bar.repository; import org.springframework.data.jpa.repository.JpaRepository; -import ru.kayashov.bar.model.entity.AlcoholicEntity; import ru.kayashov.bar.model.entity.GlassEntity; import java.util.Optional; public interface GlassRepository extends JpaRepository { - Optional findByEnNameIgnoreCase(String enName); Optional findByNameIgnoreCase(String enName); } \ No newline at end of file diff --git a/src/main/java/ru/kayashov/bar/repository/IngredientRepository.java b/src/main/java/ru/kayashov/bar/repository/IngredientRepository.java index 6275c18..c6aa875 100644 --- a/src/main/java/ru/kayashov/bar/repository/IngredientRepository.java +++ b/src/main/java/ru/kayashov/bar/repository/IngredientRepository.java @@ -1,18 +1,11 @@ package ru.kayashov.bar.repository; -import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; import ru.kayashov.bar.model.entity.IngredientEntity; -import java.util.Collection; -import java.util.List; import java.util.Optional; public interface IngredientRepository extends JpaRepository { Optional findByEnNameIgnoreCase(String name); - - @Query("select i from IngredientEntity i where upper(i.name) like upper(?1) or upper(i.enName) like upper(?1)") - List findAllByWord(String name, Pageable pageable); } \ No newline at end of file diff --git a/src/main/java/ru/kayashov/bar/repository/OrdersRepository.java b/src/main/java/ru/kayashov/bar/repository/OrdersRepository.java index 3b8c7dd..5cb1ab0 100644 --- a/src/main/java/ru/kayashov/bar/repository/OrdersRepository.java +++ b/src/main/java/ru/kayashov/bar/repository/OrdersRepository.java @@ -1,12 +1,7 @@ package ru.kayashov.bar.repository; import org.springframework.data.jpa.repository.JpaRepository; -import ru.kayashov.bar.model.entity.OrderStatus; import ru.kayashov.bar.model.entity.Pay; -import java.util.List; - public interface OrdersRepository extends JpaRepository { - - List findAllByStatusOrderById(OrderStatus status); } \ No newline at end of file diff --git a/src/main/java/ru/kayashov/bar/repository/ParserEntityRepository.java b/src/main/java/ru/kayashov/bar/repository/ParserEntityRepository.java deleted file mode 100644 index e67d794..0000000 --- a/src/main/java/ru/kayashov/bar/repository/ParserEntityRepository.java +++ /dev/null @@ -1,7 +0,0 @@ -package ru.kayashov.bar.repository; - -import org.springframework.data.jpa.repository.JpaRepository; -import ru.kayashov.bar.model.entity.ParserEntity; - -public interface ParserEntityRepository extends JpaRepository { -} \ No newline at end of file diff --git a/src/main/java/ru/kayashov/bar/repository/SessionRepository.java b/src/main/java/ru/kayashov/bar/repository/SessionRepository.java index 9319570..97c7f8a 100644 --- a/src/main/java/ru/kayashov/bar/repository/SessionRepository.java +++ b/src/main/java/ru/kayashov/bar/repository/SessionRepository.java @@ -6,6 +6,4 @@ import ru.kayashov.bar.model.entity.SessionEntity; import java.util.List; public interface SessionRepository extends JpaRepository { - - List findAllByIsActiveTrue(); } \ No newline at end of file diff --git a/src/main/java/ru/kayashov/bar/repository/TagRepository.java b/src/main/java/ru/kayashov/bar/repository/TagRepository.java index bcded07..f99f439 100644 --- a/src/main/java/ru/kayashov/bar/repository/TagRepository.java +++ b/src/main/java/ru/kayashov/bar/repository/TagRepository.java @@ -7,7 +7,5 @@ import java.util.Optional; public interface TagRepository extends JpaRepository { - Optional findByEnNameIgnoreCase(String name); - Optional findByName(String names); } \ No newline at end of file diff --git a/src/main/java/ru/kayashov/bar/repository/VisitorsRepository.java b/src/main/java/ru/kayashov/bar/repository/VisitorsRepository.java index 7c6d92d..8896035 100644 --- a/src/main/java/ru/kayashov/bar/repository/VisitorsRepository.java +++ b/src/main/java/ru/kayashov/bar/repository/VisitorsRepository.java @@ -3,12 +3,9 @@ package ru.kayashov.bar.repository; import org.springframework.data.jpa.repository.JpaRepository; import ru.kayashov.bar.model.entity.Visitor; -import java.util.List; import java.util.Optional; public interface VisitorsRepository extends JpaRepository { - Optional findByCode(Integer code); - Optional findByLogin(String login); } \ No newline at end of file diff --git a/src/main/java/ru/kayashov/bar/schedule/Repairer.java b/src/main/java/ru/kayashov/bar/schedule/Repairer.java deleted file mode 100644 index 9c9d9a7..0000000 --- a/src/main/java/ru/kayashov/bar/schedule/Repairer.java +++ /dev/null @@ -1,179 +0,0 @@ -package ru.kayashov.bar.schedule; - -import javax.transaction.Transactional; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.event.ContextRefreshedEvent; -import org.springframework.context.event.EventListener; -import org.springframework.stereotype.Component; -import ru.kayashov.bar.model.api.translate.Translate; -import ru.kayashov.bar.model.entity.CocktailEntity; -import ru.kayashov.bar.model.entity.IngredientEntity; -import ru.kayashov.bar.model.entity.ReceiptEntity; -import ru.kayashov.bar.model.entity.TypeEntity; -import ru.kayashov.bar.model.entity.Unit; -import ru.kayashov.bar.model.entity.UnitRepository; -import ru.kayashov.bar.repository.CocktailRepository; -import ru.kayashov.bar.repository.IngredientRepository; -import ru.kayashov.bar.repository.ReceiptRepository; -import ru.kayashov.bar.repository.TypeRepository; -import ru.kayashov.bar.service.integration.translate.TranslateService; - -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - -import static ru.kayashov.bar.service.integration.translate.TranslateService.translate; - -@Slf4j -@Component -@RequiredArgsConstructor -public class Repairer { - - private final IngredientRepository ingredientRepository; - private final TypeRepository tagRepository; - private final CocktailRepository cocktailRepository; - private final ReceiptRepository receiptRepository; - private final UnitRepository unitRepository; - - // @Transactional -// @EventListener(ContextRefreshedEvent.class) - public void repair() { - unitRepository.findAll().stream() - .peek(u -> u.setName(TranslateService.softTranslate(u.getName()))) - .forEach(unitRepository::save); - - log.info("repaired"); - } - - private Float convertValue(String value) { - if (value.contains("-") || value.contains("/")) { - float f; - if (value.contains("-")) { - f = average(value); - } else if (value.contains("/")) { - f = drob(value); - } else { - f = Float.parseFloat(value); - } - return f; - } - try { - return Float.parseFloat(value); - } catch (NumberFormatException e) { - return null; - } - } - - // @Transactional -// @EventListener(ContextRefreshedEvent.class) - public void repairAllowed() { - List cocktailEntities = cocktailRepository.findAll(); - - for (CocktailEntity cocktail : cocktailEntities) { - List receipts = cocktail.getReceipt(); -// if(receipts.stream().allMatch(r -> r.getIngredient().getIsHave())) { -// cocktail.setIsAllowed(true); -// } else { -// cocktail.setIsAllowed(false); -// } - cocktailRepository.save(cocktail); - } - log.info("Cocktails have been repaired"); - } - - @Transactional -// @EventListener(ContextRefreshedEvent.class) - public void repairReceipts() { -// List receipts = receiptRepository.findAll() -// .stream() -// .filter(r -> r.getMeasureText() != null && r.getMeasure() == null) -// .filter(r -> r.getMeasureText().contains("Slice")) -// .filter(r -> r.getMeasureText().split(" ").length == 2) -// .toList(); -// for (ReceiptEntity receipt : receipts) { -// String[] split = receipt.getMeasureText().split(" "); -// if (split[1].equalsIgnoreCase("Slice")) { -// receipt.setUnitText(split[1]); -// } else { -// continue; -// } -// log.info("convert {} - {}", receipt.getId(), receipt.getMeasureText()); -// -// String measure = split[0]; -// Float f; -// if (measure.contains("-")) { -// f = average(measure); -// } else if (measure.contains("/")) { -// f = drob(measure); -// } else { -// f = Float.parseFloat(measure); -// } -// -// receipt.setMeasure(f == 0 ? null : f); -// receiptRepository.save(receipt); -// } - log.info("repaired"); - } - - private Float average(String s) { - String[] split = s.split("-"); - float sum = 0f; - for (String str : split) { - if (str.contains("/")) { - sum += drob(str); - } else { - sum += Float.parseFloat(str); - } - } - return sum / split.length; - } - - private Float drob(String s) { - String[] split = s.split("/"); - return Float.parseFloat(split[0]) / Float.parseFloat(split[1]); - } - - // @Transactional -// @EventListener(ContextRefreshedEvent.class) - public void repairEnTag() { - List tagEntities = tagRepository.findAll() - .stream() - .filter(t -> t.getName() == null) - .toList(); - for (TypeEntity tagEntity : tagEntities) { - tagEntity.setName(translate(tagEntity.getEnName())); - tagRepository.save(tagEntity); - log.info("tag {} saved", tagEntity.getName()); - } - log.info("repaired"); - } - - - public void repairEnIngredients() { - List ingredients = ingredientRepository.findAll().stream() - .filter(i -> i.getName() == null) -// .filter(i -> i.getDescription() == null && i.getEnDescription() != null && !i.getEnDescription().isEmpty()) - .toList(); - - for (IngredientEntity i : ingredients) { - boolean needSave = false; - if (i.getName() == null) { - String s = translate(i.getEnName()); - i.setName(s); - needSave = true; - } - if (i.getDescription() == null) { -// String s = translate(i.getEnDescription()); -// i.setDescription(s); - needSave = true; - } - if (needSave) { - ingredientRepository.save(i); - log.info("Ingredient {} saved", i.getName()); - } - } - } -} diff --git a/src/main/java/ru/kayashov/bar/security/JwtTokenProvider.java b/src/main/java/ru/kayashov/bar/security/JwtTokenProvider.java index 0977e96..090db50 100644 --- a/src/main/java/ru/kayashov/bar/security/JwtTokenProvider.java +++ b/src/main/java/ru/kayashov/bar/security/JwtTokenProvider.java @@ -1,8 +1,6 @@ package ru.kayashov.bar.security; import io.jsonwebtoken.Claims; -import io.jsonwebtoken.Jws; -import io.jsonwebtoken.JwtParser; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.io.Decoders; import io.jsonwebtoken.security.Keys; diff --git a/src/main/java/ru/kayashov/bar/service/ParserQueueService.java b/src/main/java/ru/kayashov/bar/service/ParserQueueService.java deleted file mode 100644 index 34e65bd..0000000 --- a/src/main/java/ru/kayashov/bar/service/ParserQueueService.java +++ /dev/null @@ -1,55 +0,0 @@ -package ru.kayashov.bar.service; - -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; -import ru.kayashov.bar.model.entity.ParserEntity; -import ru.kayashov.bar.repository.ParserEntityRepository; - -import java.util.List; - -@Service -@RequiredArgsConstructor -public class ParserQueueService { - - private final ParserEntityRepository repository; - - public Long getIngredientOffset() { - return getEntity().getIngredientId(); - } - - public Long getCocktailOffset() { - return getEntity().getCocktailId(); - } - - public void setStepIngredients(long id, int step) { - ParserEntity entity = getEntity(); - entity.setIngredientId(id); - entity.setIngredientError(entity.getIngredientError() + step); - repository.save(entity); - } - - public void setStepCocktails(long id, int step) { - ParserEntity entity = getEntity(); - entity.setCocktailId(id); - entity.setCocktailError(entity.getCocktailError() + step); - repository.save(entity); - } - - private ParserEntity getEntity() { - List entities = repository.findAll(); - if(entities.isEmpty()) { - ParserEntity entity = getNewEntity(); - return repository.save(entity); - } - return entities.get(0); - } - - private ParserEntity getNewEntity() { - ParserEntity entity = new ParserEntity(); - entity.setIngredientId(1L); - entity.setCocktailId(1L); - entity.setCocktailError(0L); - entity.setCocktailError(0L); - return entity; - } -} diff --git a/src/test/java/ru/kayashov/bar/MyBarApplicationTests.java b/src/test/java/ru/kayashov/bar/MyBarApplicationTests.java deleted file mode 100644 index 4884a64..0000000 --- a/src/test/java/ru/kayashov/bar/MyBarApplicationTests.java +++ /dev/null @@ -1,8 +0,0 @@ -package ru.kayashov.bar; - -class MyBarApplicationTests { - - void contextLoads() { - } - -}