Dragonestia/RoomPicker
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved models to new package

Browse Source
This commit is contained in:
Andrey Terentev 2024-05-10 11:08:10 +07:00 committed by Andrey Terentev
parent db7cdd2837
commit de54a8590e
48 changed files with 80 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/src/main/java/ru/dragonestia/picker/aspect/UserMetricsAspect.java
View File

@ -11,8 +11,8 @@ import org.aspectj.lang.annotation.AfterReturning;
import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Aspect;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.dragonestia.picker.model.Node; import ru.dragonestia.picker.model.node.Node;
import ru.dragonestia.picker.model.Room; import ru.dragonestia.picker.model.room.Room;
import ru.dragonestia.picker.repository.RoomRepository; import ru.dragonestia.picker.repository.RoomRepository;
import ru.dragonestia.picker.repository.UserRepository; import ru.dragonestia.picker.repository.UserRepository;
import ru.dragonestia.picker.repository.impl.ContainerRepository; import ru.dragonestia.picker.repository.impl.ContainerRepository;
@ -41,12 +41,12 @@ public class UserMetricsAspect {
meterRegistry.gauge("roompicker_total_users", totalUsers); meterRegistry.gauge("roompicker_total_users", totalUsers);
} }
@After(value = "execution(* ru.dragonestia.picker.repository.UserRepository.linkWithRoom(ru.dragonestia.picker.model.Room, ..)) && args(room, ..)", argNames = "room") @After(value = "execution(* ru.dragonestia.picker.repository.UserRepository.linkWithRoom(ru.dragonestia.picker.model.room.Room, ..)) && args(room, ..)", argNames = "room")
void onLinkUsers(Room room) { void onLinkUsers(Room room) {
countAllUsers(room); countAllUsers(room);
} }
@After(value = "execution(void ru.dragonestia.picker.repository.UserRepository.unlinkWithRoom(ru.dragonestia.picker.model.Room, ..)) && args(room, ..)", argNames = "room") @After(value = "execution(void ru.dragonestia.picker.repository.UserRepository.unlinkWithRoom(ru.dragonestia.picker.model.room.Room, ..)) && args(room, ..)", argNames = "room")
void onUnlinkUsers(Room room) { void onUnlinkUsers(Room room) {
countAllUsers(room); countAllUsers(room);
} }
@ -55,7 +55,7 @@ public class UserMetricsAspect {
totalUsers.set(userRepository.countAllUsers()); totalUsers.set(userRepository.countAllUsers());
} }
@After(value = "execution(void ru.dragonestia.picker.repository.NodeRepository.create(ru.dragonestia.picker.model.Node)) && args(node)", argNames = "node") @After(value = "execution(void ru.dragonestia.picker.repository.NodeRepository.create(ru.dragonestia.picker.model.node.Node)) && args(node)", argNames = "node")
void onCreateNode(Node node) { void onCreateNode(Node node) {
var nodeId = node.getIdentifier(); var nodeId = node.getIdentifier();
var gauge = Gauge.builder("roompicker_node_users_total", () -> data.get(nodeId).users()) var gauge = Gauge.builder("roompicker_node_users_total", () -> data.get(nodeId).users())
@ -78,7 +78,7 @@ public class UserMetricsAspect {
data.put(nodeId, new NodeData(gauge, new AtomicInteger(0), counter, new AtomicInteger(0), lockedGauge, roomsGauge)); data.put(nodeId, new NodeData(gauge, new AtomicInteger(0), counter, new AtomicInteger(0), lockedGauge, roomsGauge));
} }
@After(value = "execution(* ru.dragonestia.picker.repository.NodeRepository.delete(ru.dragonestia.picker.model.Node)) && args(node)", argNames = "node") @After(value = "execution(* ru.dragonestia.picker.repository.NodeRepository.delete(ru.dragonestia.picker.model.node.Node)) && args(node)", argNames = "node")
void onDeleteNode(Node node) { void onDeleteNode(Node node) {
var data = this.data.remove(node.getIdentifier()); var data = this.data.remove(node.getIdentifier());
@ -88,7 +88,7 @@ public class UserMetricsAspect {
meterRegistry.remove(data.roomsGauge()); meterRegistry.remove(data.roomsGauge());
} }
@AfterReturning(value = "execution(* ru.dragonestia.picker.repository.RoomRepository.pick(ru.dragonestia.picker.model.Node, *)) && args(node, ..)", argNames = "node") @AfterReturning(value = "execution(* ru.dragonestia.picker.repository.RoomRepository.pick(ru.dragonestia.picker.model.node.Node, *)) && args(node, ..)", argNames = "node")
void onPickRoom(Node node) { void onPickRoom(Node node) {
data.get(node.getIdentifier()).picksPerMinute().increment(); data.get(node.getIdentifier()).picksPerMinute().increment();
} }

6
server/src/main/java/ru/dragonestia/picker/config/TestConfig.java
View File

@ -16,11 +16,9 @@ import ru.dragonestia.picker.api.repository.type.NodeIdentifier;
import ru.dragonestia.picker.api.repository.type.RoomIdentifier; import ru.dragonestia.picker.api.repository.type.RoomIdentifier;
import ru.dragonestia.picker.api.repository.type.UserIdentifier; import ru.dragonestia.picker.api.repository.type.UserIdentifier;
import ru.dragonestia.picker.interceptor.DebugInterceptor; import ru.dragonestia.picker.interceptor.DebugInterceptor;
import ru.dragonestia.picker.model.Room; import ru.dragonestia.picker.model.node.Node;
import ru.dragonestia.picker.model.Node; import ru.dragonestia.picker.model.user.User;
import ru.dragonestia.picker.model.User;
import ru.dragonestia.picker.model.factory.RoomFactory; import ru.dragonestia.picker.model.factory.RoomFactory;
import ru.dragonestia.picker.model.type.SlotLimit;
import ru.dragonestia.picker.repository.RoomRepository; import ru.dragonestia.picker.repository.RoomRepository;
import ru.dragonestia.picker.repository.NodeRepository; import ru.dragonestia.picker.repository.NodeRepository;
import ru.dragonestia.picker.repository.UserRepository; import ru.dragonestia.picker.repository.UserRepository;

2
server/src/main/java/ru/dragonestia/picker/controller/graphql/GraphqlController.java
View File

@ -9,7 +9,7 @@ import ru.dragonestia.picker.controller.graphql.entity.EntityNode;
import ru.dragonestia.picker.controller.graphql.entity.EntityRoom; import ru.dragonestia.picker.controller.graphql.entity.EntityRoom;
import ru.dragonestia.picker.controller.graphql.entity.EntityUser; import ru.dragonestia.picker.controller.graphql.entity.EntityUser;
import ru.dragonestia.picker.controller.graphql.entity.type.DataProvider; import ru.dragonestia.picker.controller.graphql.entity.type.DataProvider;
import ru.dragonestia.picker.model.User; import ru.dragonestia.picker.model.user.User;
import ru.dragonestia.picker.service.NodeService; import ru.dragonestia.picker.service.NodeService;
import ru.dragonestia.picker.service.RoomService; import ru.dragonestia.picker.service.RoomService;
import ru.dragonestia.picker.service.UserService; import ru.dragonestia.picker.service.UserService;

2
server/src/main/java/ru/dragonestia/picker/controller/graphql/entity/EntityNode.java
View File

@ -2,7 +2,7 @@ package ru.dragonestia.picker.controller.graphql.entity;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import ru.dragonestia.picker.controller.graphql.entity.type.DataProvider; import ru.dragonestia.picker.controller.graphql.entity.type.DataProvider;
import ru.dragonestia.picker.model.Node; import ru.dragonestia.picker.model.node.Node;
import java.util.List; import java.util.List;

2
server/src/main/java/ru/dragonestia/picker/controller/graphql/entity/EntityRoom.java
View File

@ -2,7 +2,7 @@ package ru.dragonestia.picker.controller.graphql.entity;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import ru.dragonestia.picker.controller.graphql.entity.type.DataProvider; import ru.dragonestia.picker.controller.graphql.entity.type.DataProvider;
import ru.dragonestia.picker.model.Room; import ru.dragonestia.picker.model.room.Room;
import java.util.List; import java.util.List;

2
server/src/main/java/ru/dragonestia/picker/controller/graphql/entity/EntityUser.java
View File

@ -3,7 +3,7 @@ package ru.dragonestia.picker.controller.graphql.entity;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import ru.dragonestia.picker.controller.graphql.entity.type.DataProvider; import ru.dragonestia.picker.controller.graphql.entity.type.DataProvider;
import ru.dragonestia.picker.model.User; import ru.dragonestia.picker.model.user.User;
import java.util.List; import java.util.List;

2
server/src/main/java/ru/dragonestia/picker/event/UpdateRoomLockStateEvent.java
View File

@ -1,7 +1,7 @@
package ru.dragonestia.picker.event; package ru.dragonestia.picker.event;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import ru.dragonestia.picker.model.Room; import ru.dragonestia.picker.model.room.Room;
import java.util.function.Consumer; import java.util.function.Consumer;

3
server/src/main/java/ru/dragonestia/picker/model/Account.java → server/src/main/java/ru/dragonestia/picker/model/account/Account.java
View File

@ -1,4 +1,4 @@
package ru.dragonestia.picker.model; package ru.dragonestia.picker.model.account;
import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -6,7 +6,6 @@ import org.springframework.security.core.userdetails.UserDetails;
import ru.dragonestia.picker.api.model.account.IAccount; import ru.dragonestia.picker.api.model.account.IAccount;
import ru.dragonestia.picker.api.model.account.ResponseAccount; import ru.dragonestia.picker.api.model.account.ResponseAccount;
import java.beans.Transient;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;

2
server/src/main/java/ru/dragonestia/picker/model/Permission.java → server/src/main/java/ru/dragonestia/picker/model/account/Permission.java
View File

@ -1,4 +1,4 @@
package ru.dragonestia.picker.model; package ru.dragonestia.picker.model.account;
import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.GrantedAuthority;

5
server/src/main/java/ru/dragonestia/picker/model/factory/RoomFactory.java
View File

@ -3,11 +3,10 @@ package ru.dragonestia.picker.model.factory;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.dragonestia.picker.api.repository.type.RoomIdentifier; import ru.dragonestia.picker.api.repository.type.RoomIdentifier;
import ru.dragonestia.picker.model.Node; import ru.dragonestia.picker.model.node.Node;
import ru.dragonestia.picker.model.Room; import ru.dragonestia.picker.model.room.Room;
@Component @Component
@RequiredArgsConstructor @RequiredArgsConstructor

2
server/src/main/java/ru/dragonestia/picker/model/Node.java → server/src/main/java/ru/dragonestia/picker/model/node/Node.java
View File

@ -1,4 +1,4 @@
package ru.dragonestia.picker.model; package ru.dragonestia.picker.model.node;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;

4
server/src/main/java/ru/dragonestia/picker/model/Room.java → server/src/main/java/ru/dragonestia/picker/model/room/Room.java
View File

@ -1,4 +1,4 @@
package ru.dragonestia.picker.model; package ru.dragonestia.picker.model.room;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@ -7,7 +7,7 @@ import ru.dragonestia.picker.api.model.room.ResponseRoom;
import ru.dragonestia.picker.api.model.room.RoomDetails; import ru.dragonestia.picker.api.model.room.RoomDetails;
import ru.dragonestia.picker.api.model.room.ShortResponseRoom; import ru.dragonestia.picker.api.model.room.ShortResponseRoom;
import ru.dragonestia.picker.api.repository.type.RoomIdentifier; import ru.dragonestia.picker.api.repository.type.RoomIdentifier;
import ru.dragonestia.picker.event.UpdateRoomLockStateEvent; import ru.dragonestia.picker.model.node.Node;
import java.util.Objects; import java.util.Objects;

2
server/src/main/java/ru/dragonestia/picker/model/type/SlotLimit.java → server/src/main/java/ru/dragonestia/picker/model/room/type/SlotLimit.java
View File

@ -1,4 +1,4 @@
package ru.dragonestia.picker.model.type; package ru.dragonestia.picker.model.room.type;
import lombok.Getter; import lombok.Getter;

2
server/src/main/java/ru/dragonestia/picker/model/User.java → server/src/main/java/ru/dragonestia/picker/model/user/User.java
View File

@ -1,4 +1,4 @@
package ru.dragonestia.picker.model; package ru.dragonestia.picker.model.user;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;

2
server/src/main/java/ru/dragonestia/picker/repository/NodeRepository.java
View File

@ -1,7 +1,7 @@
package ru.dragonestia.picker.repository; package ru.dragonestia.picker.repository;
import ru.dragonestia.picker.api.exception.NodeAlreadyExistException; import ru.dragonestia.picker.api.exception.NodeAlreadyExistException;
import ru.dragonestia.picker.model.Node; import ru.dragonestia.picker.model.node.Node;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;

6
server/src/main/java/ru/dragonestia/picker/repository/RoomRepository.java
View File

@ -2,9 +2,9 @@ package ru.dragonestia.picker.repository;
import ru.dragonestia.picker.api.exception.NoRoomsAvailableException; import ru.dragonestia.picker.api.exception.NoRoomsAvailableException;
import ru.dragonestia.picker.api.exception.RoomAlreadyExistException; import ru.dragonestia.picker.api.exception.RoomAlreadyExistException;
import ru.dragonestia.picker.model.Room; import ru.dragonestia.picker.model.room.Room;
import ru.dragonestia.picker.model.Node; import ru.dragonestia.picker.model.node.Node;
import ru.dragonestia.picker.model.User; import ru.dragonestia.picker.model.user.User;
import java.util.Collection; import java.util.Collection;
import java.util.Optional; import java.util.Optional;

5
server/src/main/java/ru/dragonestia/picker/repository/UserRepository.java
View File

@ -1,11 +1,10 @@
package ru.dragonestia.picker.repository; package ru.dragonestia.picker.repository;
import ru.dragonestia.picker.api.exception.RoomAreFullException; import ru.dragonestia.picker.api.exception.RoomAreFullException;
import ru.dragonestia.picker.model.Room; import ru.dragonestia.picker.model.room.Room;
import ru.dragonestia.picker.model.User; import ru.dragonestia.picker.model.user.User;
import java.util.Collection; import java.util.Collection;
import java.util.List;
import java.util.Map; import java.util.Map;
public interface UserRepository { public interface UserRepository {

3
server/src/main/java/ru/dragonestia/picker/repository/impl/ContainerRepository.java
View File

@ -1,10 +1,9 @@
package ru.dragonestia.picker.repository.impl; package ru.dragonestia.picker.repository.impl;
import lombok.extern.log4j.Log4j2;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.dragonestia.picker.api.exception.NodeAlreadyExistException; import ru.dragonestia.picker.api.exception.NodeAlreadyExistException;
import ru.dragonestia.picker.model.Node; import ru.dragonestia.picker.model.node.Node;
import ru.dragonestia.picker.repository.impl.container.NodeContainer; import ru.dragonestia.picker.repository.impl.container.NodeContainer;
import ru.dragonestia.picker.repository.impl.type.UserTransaction; import ru.dragonestia.picker.repository.impl.type.UserTransaction;

3
server/src/main/java/ru/dragonestia/picker/repository/impl/NodeRepositoryImpl.java
View File

@ -1,10 +1,9 @@
package ru.dragonestia.picker.repository.impl; package ru.dragonestia.picker.repository.impl;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.dragonestia.picker.api.exception.NodeAlreadyExistException; import ru.dragonestia.picker.api.exception.NodeAlreadyExistException;
import ru.dragonestia.picker.model.Node; import ru.dragonestia.picker.model.node.Node;
import ru.dragonestia.picker.repository.NodeRepository; import ru.dragonestia.picker.repository.NodeRepository;
import ru.dragonestia.picker.repository.impl.container.NodeContainer; import ru.dragonestia.picker.repository.impl.container.NodeContainer;

7
server/src/main/java/ru/dragonestia/picker/repository/impl/RoomRepositoryImpl.java
View File

@ -5,11 +5,10 @@ import org.springframework.stereotype.Component;
import ru.dragonestia.picker.api.exception.NoRoomsAvailableException; import ru.dragonestia.picker.api.exception.NoRoomsAvailableException;
import ru.dragonestia.picker.api.exception.NodeNotFoundException; import ru.dragonestia.picker.api.exception.NodeNotFoundException;
import ru.dragonestia.picker.api.exception.RoomAlreadyExistException; import ru.dragonestia.picker.api.exception.RoomAlreadyExistException;
import ru.dragonestia.picker.model.Node; import ru.dragonestia.picker.model.node.Node;
import ru.dragonestia.picker.model.Room; import ru.dragonestia.picker.model.room.Room;
import ru.dragonestia.picker.model.User; import ru.dragonestia.picker.model.user.User;
import ru.dragonestia.picker.repository.RoomRepository; import ru.dragonestia.picker.repository.RoomRepository;
import ru.dragonestia.picker.repository.impl.container.NodeContainer;
import ru.dragonestia.picker.repository.impl.container.RoomContainer; import ru.dragonestia.picker.repository.impl.container.RoomContainer;
import java.util.Collection; import java.util.Collection;

4
server/src/main/java/ru/dragonestia/picker/repository/impl/UserRepositoryImpl.java
View File

@ -6,8 +6,8 @@ import org.springframework.stereotype.Component;
import ru.dragonestia.picker.api.exception.NodeNotFoundException; import ru.dragonestia.picker.api.exception.NodeNotFoundException;
import ru.dragonestia.picker.api.exception.RoomAreFullException; import ru.dragonestia.picker.api.exception.RoomAreFullException;
import ru.dragonestia.picker.api.exception.RoomNotFoundException; import ru.dragonestia.picker.api.exception.RoomNotFoundException;
import ru.dragonestia.picker.model.Room; import ru.dragonestia.picker.model.room.Room;
import ru.dragonestia.picker.model.User; import ru.dragonestia.picker.model.user.User;
import ru.dragonestia.picker.repository.UserRepository; import ru.dragonestia.picker.repository.UserRepository;
import ru.dragonestia.picker.repository.impl.container.RoomContainer; import ru.dragonestia.picker.repository.impl.container.RoomContainer;

6
server/src/main/java/ru/dragonestia/picker/repository/impl/container/NodeContainer.java
View File

@ -3,9 +3,9 @@ package ru.dragonestia.picker.repository.impl.container;
import lombok.Getter; import lombok.Getter;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import ru.dragonestia.picker.api.exception.RoomAlreadyExistException; import ru.dragonestia.picker.api.exception.RoomAlreadyExistException;
import ru.dragonestia.picker.model.Node; import ru.dragonestia.picker.model.node.Node;
import ru.dragonestia.picker.model.Room; import ru.dragonestia.picker.model.room.Room;
import ru.dragonestia.picker.model.User; import ru.dragonestia.picker.model.user.User;
import ru.dragonestia.picker.repository.impl.picker.LeastPickedPicker; import ru.dragonestia.picker.repository.impl.picker.LeastPickedPicker;
import ru.dragonestia.picker.repository.impl.picker.RoomPicker; import ru.dragonestia.picker.repository.impl.picker.RoomPicker;
import ru.dragonestia.picker.repository.impl.picker.RoundRobinPicker; import ru.dragonestia.picker.repository.impl.picker.RoundRobinPicker;

4
server/src/main/java/ru/dragonestia/picker/repository/impl/container/RoomContainer.java
View File

@ -3,8 +3,8 @@ package ru.dragonestia.picker.repository.impl.container;
import lombok.Getter; import lombok.Getter;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import ru.dragonestia.picker.api.exception.RoomAreFullException; import ru.dragonestia.picker.api.exception.RoomAreFullException;
import ru.dragonestia.picker.model.Room; import ru.dragonestia.picker.model.room.Room;
import ru.dragonestia.picker.model.User; import ru.dragonestia.picker.model.user.User;
import ru.dragonestia.picker.repository.impl.picker.LeastPickedPicker; import ru.dragonestia.picker.repository.impl.picker.LeastPickedPicker;
import java.util.*; import java.util.*;

2
server/src/main/java/ru/dragonestia/picker/repository/impl/picker/ItemWrapper.java
View File

@ -1,6 +1,6 @@
package ru.dragonestia.picker.repository.impl.picker; package ru.dragonestia.picker.repository.impl.picker;
import ru.dragonestia.picker.model.type.SlotLimit; import ru.dragonestia.picker.model.room.type.SlotLimit;
public interface ItemWrapper<ITEM> { public interface ItemWrapper<ITEM> {

5
server/src/main/java/ru/dragonestia/picker/repository/impl/picker/LeastPickedPicker.java
View File

@ -3,9 +3,8 @@ package ru.dragonestia.picker.repository.impl.picker;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import ru.dragonestia.picker.api.exception.NoRoomsAvailableException; import ru.dragonestia.picker.api.exception.NoRoomsAvailableException;
import ru.dragonestia.picker.api.model.node.PickingMethod; import ru.dragonestia.picker.api.model.node.PickingMethod;
import ru.dragonestia.picker.model.Room; import ru.dragonestia.picker.model.room.Room;
import ru.dragonestia.picker.model.User; import ru.dragonestia.picker.model.user.User;
import ru.dragonestia.picker.repository.UserRepository;
import ru.dragonestia.picker.repository.impl.collection.DynamicSortedMap; import ru.dragonestia.picker.repository.impl.collection.DynamicSortedMap;
import ru.dragonestia.picker.repository.impl.container.NodeContainer; import ru.dragonestia.picker.repository.impl.container.NodeContainer;
import ru.dragonestia.picker.repository.impl.container.RoomContainer; import ru.dragonestia.picker.repository.impl.container.RoomContainer;

2
server/src/main/java/ru/dragonestia/picker/repository/impl/picker/RoomPicker.java
View File

@ -1,7 +1,7 @@
package ru.dragonestia.picker.repository.impl.picker; package ru.dragonestia.picker.repository.impl.picker;
import ru.dragonestia.picker.api.model.node.PickingMethod; import ru.dragonestia.picker.api.model.node.PickingMethod;
import ru.dragonestia.picker.model.User; import ru.dragonestia.picker.model.user.User;
import ru.dragonestia.picker.repository.impl.container.RoomContainer; import ru.dragonestia.picker.repository.impl.container.RoomContainer;
public interface RoomPicker extends Picker<RoomContainer, User> { public interface RoomPicker extends Picker<RoomContainer, User> {

2
server/src/main/java/ru/dragonestia/picker/repository/impl/picker/RoundRobinPicker.java
View File

@ -3,7 +3,7 @@ package ru.dragonestia.picker.repository.impl.picker;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import ru.dragonestia.picker.api.exception.NoRoomsAvailableException; import ru.dragonestia.picker.api.exception.NoRoomsAvailableException;
import ru.dragonestia.picker.api.model.node.PickingMethod; import ru.dragonestia.picker.api.model.node.PickingMethod;
import ru.dragonestia.picker.model.User; import ru.dragonestia.picker.model.user.User;
import ru.dragonestia.picker.repository.impl.collection.QueuedLinkedList; import ru.dragonestia.picker.repository.impl.collection.QueuedLinkedList;
import ru.dragonestia.picker.repository.impl.container.NodeContainer; import ru.dragonestia.picker.repository.impl.container.NodeContainer;
import ru.dragonestia.picker.repository.impl.container.RoomContainer; import ru.dragonestia.picker.repository.impl.container.RoomContainer;

2
server/src/main/java/ru/dragonestia/picker/repository/impl/picker/SequentialFillingPicker.java
View File

@ -3,7 +3,7 @@ package ru.dragonestia.picker.repository.impl.picker;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import ru.dragonestia.picker.api.exception.NoRoomsAvailableException; import ru.dragonestia.picker.api.exception.NoRoomsAvailableException;
import ru.dragonestia.picker.api.model.node.PickingMethod; import ru.dragonestia.picker.api.model.node.PickingMethod;
import ru.dragonestia.picker.model.User; import ru.dragonestia.picker.model.user.User;
import ru.dragonestia.picker.repository.impl.container.NodeContainer; import ru.dragonestia.picker.repository.impl.container.NodeContainer;
import ru.dragonestia.picker.repository.impl.container.RoomContainer; import ru.dragonestia.picker.repository.impl.container.RoomContainer;

4
server/src/main/java/ru/dragonestia/picker/repository/impl/type/UserTransaction.java
View File

@ -1,8 +1,8 @@
package ru.dragonestia.picker.repository.impl.type; package ru.dragonestia.picker.repository.impl.type;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import ru.dragonestia.picker.model.Room; import ru.dragonestia.picker.model.room.Room;
import ru.dragonestia.picker.model.User; import ru.dragonestia.picker.model.user.User;
import java.util.Collection; import java.util.Collection;
import java.util.function.Consumer; import java.util.function.Consumer;

2
server/src/main/java/ru/dragonestia/picker/service/AccountService.java
View File

@ -4,7 +4,7 @@ import org.jetbrains.annotations.NotNull;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.security.core.userdetails.UsernameNotFoundException;
import ru.dragonestia.picker.model.Account; import ru.dragonestia.picker.model.account.Account;
import java.util.Collection; import java.util.Collection;
import java.util.Optional; import java.util.Optional;

5
server/src/main/java/ru/dragonestia/picker/service/NodeService.java
View File

@ -3,13 +3,10 @@ package ru.dragonestia.picker.service;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import ru.dragonestia.picker.api.exception.InvalidNodeIdentifierException; import ru.dragonestia.picker.api.exception.InvalidNodeIdentifierException;
import ru.dragonestia.picker.api.exception.NodeAlreadyExistException; import ru.dragonestia.picker.api.exception.NodeAlreadyExistException;
import ru.dragonestia.picker.api.model.node.NodeDetails; import ru.dragonestia.picker.model.node.Node;
import ru.dragonestia.picker.api.model.node.ResponseNode;
import ru.dragonestia.picker.model.Node;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.Set;
public interface NodeService { public interface NodeService {

9
server/src/main/java/ru/dragonestia/picker/service/RoomService.java
View File

@ -2,15 +2,12 @@ package ru.dragonestia.picker.service;
import ru.dragonestia.picker.api.exception.InvalidRoomIdentifierException; import ru.dragonestia.picker.api.exception.InvalidRoomIdentifierException;
import ru.dragonestia.picker.api.exception.RoomAlreadyExistException; import ru.dragonestia.picker.api.exception.RoomAlreadyExistException;
import ru.dragonestia.picker.api.model.room.RoomDetails;
import ru.dragonestia.picker.api.model.room.ShortResponseRoom;
import ru.dragonestia.picker.api.repository.response.PickedRoomResponse; import ru.dragonestia.picker.api.repository.response.PickedRoomResponse;
import ru.dragonestia.picker.model.Room; import ru.dragonestia.picker.model.room.Room;
import ru.dragonestia.picker.model.Node; import ru.dragonestia.picker.model.node.Node;
import ru.dragonestia.picker.model.User; import ru.dragonestia.picker.model.user.User;
import java.util.Collection; import java.util.Collection;
import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.Set; import java.util.Set;

4
server/src/main/java/ru/dragonestia/picker/service/UserService.java
View File

@ -2,8 +2,8 @@ package ru.dragonestia.picker.service;
import ru.dragonestia.picker.api.exception.RoomAreFullException; import ru.dragonestia.picker.api.exception.RoomAreFullException;
import ru.dragonestia.picker.api.model.user.ResponseUser; import ru.dragonestia.picker.api.model.user.ResponseUser;
import ru.dragonestia.picker.model.Room; import ru.dragonestia.picker.model.room.Room;
import ru.dragonestia.picker.model.User; import ru.dragonestia.picker.model.user.User;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;

4
server/src/main/java/ru/dragonestia/picker/service/impl/AccountServiceImpl.java
View File

@ -8,8 +8,8 @@ import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import ru.dragonestia.picker.api.exception.ConstantAdminParamsException; import ru.dragonestia.picker.api.exception.ConstantAdminParamsException;
import ru.dragonestia.picker.config.RoomPickerServerConfig; import ru.dragonestia.picker.config.RoomPickerServerConfig;
import ru.dragonestia.picker.model.Account; import ru.dragonestia.picker.model.account.Account;
import ru.dragonestia.picker.model.Permission; import ru.dragonestia.picker.model.account.Permission;
import ru.dragonestia.picker.service.AccountService; import ru.dragonestia.picker.service.AccountService;
import java.util.Arrays; import java.util.Arrays;

2
server/src/main/java/ru/dragonestia/picker/service/impl/NodeServiceImpl.java
View File

@ -4,7 +4,7 @@ import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import ru.dragonestia.picker.api.exception.InvalidNodeIdentifierException; import ru.dragonestia.picker.api.exception.InvalidNodeIdentifierException;
import ru.dragonestia.picker.api.exception.NodeAlreadyExistException; import ru.dragonestia.picker.api.exception.NodeAlreadyExistException;
import ru.dragonestia.picker.model.Node; import ru.dragonestia.picker.model.node.Node;
import ru.dragonestia.picker.repository.NodeRepository; import ru.dragonestia.picker.repository.NodeRepository;
import ru.dragonestia.picker.repository.RoomRepository; import ru.dragonestia.picker.repository.RoomRepository;
import ru.dragonestia.picker.service.NodeService; import ru.dragonestia.picker.service.NodeService;

6
server/src/main/java/ru/dragonestia/picker/service/impl/RoomServiceImpl.java
View File

@ -8,9 +8,9 @@ import ru.dragonestia.picker.api.exception.NodeNotFoundException;
import ru.dragonestia.picker.api.exception.NotPersistedNodeException; import ru.dragonestia.picker.api.exception.NotPersistedNodeException;
import ru.dragonestia.picker.api.exception.RoomAlreadyExistException; import ru.dragonestia.picker.api.exception.RoomAlreadyExistException;
import ru.dragonestia.picker.api.repository.response.PickedRoomResponse; import ru.dragonestia.picker.api.repository.response.PickedRoomResponse;
import ru.dragonestia.picker.model.Room; import ru.dragonestia.picker.model.room.Room;
import ru.dragonestia.picker.model.Node; import ru.dragonestia.picker.model.node.Node;
import ru.dragonestia.picker.model.User; import ru.dragonestia.picker.model.user.User;
import ru.dragonestia.picker.repository.NodeRepository; import ru.dragonestia.picker.repository.NodeRepository;
import ru.dragonestia.picker.repository.RoomRepository; import ru.dragonestia.picker.repository.RoomRepository;
import ru.dragonestia.picker.repository.UserRepository; import ru.dragonestia.picker.repository.UserRepository;

4
server/src/main/java/ru/dragonestia/picker/service/impl/UserServiceImpl.java
View File

@ -3,8 +3,8 @@ package ru.dragonestia.picker.service.impl;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import ru.dragonestia.picker.api.model.user.ResponseUser; import ru.dragonestia.picker.api.model.user.ResponseUser;
import ru.dragonestia.picker.model.Room; import ru.dragonestia.picker.model.room.Room;
import ru.dragonestia.picker.model.User; import ru.dragonestia.picker.model.user.User;
import ru.dragonestia.picker.repository.UserRepository; import ru.dragonestia.picker.repository.UserRepository;
import ru.dragonestia.picker.service.UserService; import ru.dragonestia.picker.service.UserService;

4
server/src/main/java/ru/dragonestia/picker/storage/NodeAndRoomStorage.java
View File

@ -1,7 +1,7 @@
package ru.dragonestia.picker.storage; package ru.dragonestia.picker.storage;
import ru.dragonestia.picker.model.Node; import ru.dragonestia.picker.model.node.Node;
import ru.dragonestia.picker.model.Room; import ru.dragonestia.picker.model.room.Room;
public interface NodeAndRoomStorage { public interface NodeAndRoomStorage {

4
server/src/main/java/ru/dragonestia/picker/storage/impl/FileStorageImpl.java
View File

@ -8,8 +8,8 @@ import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Profile; import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.dragonestia.picker.model.Node; import ru.dragonestia.picker.model.node.Node;
import ru.dragonestia.picker.model.Room; import ru.dragonestia.picker.model.room.Room;
import ru.dragonestia.picker.repository.NodeRepository; import ru.dragonestia.picker.repository.NodeRepository;
import ru.dragonestia.picker.repository.RoomRepository; import ru.dragonestia.picker.repository.RoomRepository;
import ru.dragonestia.picker.storage.NodeAndRoomStorage; import ru.dragonestia.picker.storage.NodeAndRoomStorage;

4
server/src/main/java/ru/dragonestia/picker/storage/impl/NullStorageImpl.java
View File

@ -2,8 +2,8 @@ package ru.dragonestia.picker.storage.impl;
import org.springframework.context.annotation.Profile; import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.dragonestia.picker.model.Node; import ru.dragonestia.picker.model.node.Node;
import ru.dragonestia.picker.model.Room; import ru.dragonestia.picker.model.room.Room;
import ru.dragonestia.picker.storage.NodeAndRoomStorage; import ru.dragonestia.picker.storage.NodeAndRoomStorage;
@Profile("test") @Profile("test")

3
server/src/main/java/ru/dragonestia/picker/util/NamingValidator.java
View File

@ -6,11 +6,10 @@ import ru.dragonestia.picker.api.exception.InvalidRoomIdentifierException;
import ru.dragonestia.picker.api.exception.InvalidUsernamesException; import ru.dragonestia.picker.api.exception.InvalidUsernamesException;
import ru.dragonestia.picker.api.repository.type.UserIdentifier; import ru.dragonestia.picker.api.repository.type.UserIdentifier;
import ru.dragonestia.picker.api.util.IdentifierValidator; import ru.dragonestia.picker.api.util.IdentifierValidator;
import ru.dragonestia.picker.model.User; import ru.dragonestia.picker.model.user.User;
import java.util.Collection; import java.util.Collection;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List;
@Component @Component
public class NamingValidator { public class NamingValidator {

5
server/src/test/java/ru/dragonestia/picker/config/FillingNodesConfig.java
View File

@ -7,9 +7,8 @@ import ru.dragonestia.picker.api.model.node.PickingMethod;
import ru.dragonestia.picker.api.repository.type.NodeIdentifier; import ru.dragonestia.picker.api.repository.type.NodeIdentifier;
import ru.dragonestia.picker.api.repository.type.RoomIdentifier; import ru.dragonestia.picker.api.repository.type.RoomIdentifier;
import ru.dragonestia.picker.api.repository.type.UserIdentifier; import ru.dragonestia.picker.api.repository.type.UserIdentifier;
import ru.dragonestia.picker.model.Node; import ru.dragonestia.picker.model.node.Node;
import ru.dragonestia.picker.model.Room; import ru.dragonestia.picker.model.user.User;
import ru.dragonestia.picker.model.User;
import ru.dragonestia.picker.model.factory.RoomFactory; import ru.dragonestia.picker.model.factory.RoomFactory;
import ru.dragonestia.picker.repository.NodeRepository; import ru.dragonestia.picker.repository.NodeRepository;
import ru.dragonestia.picker.repository.RoomRepository; import ru.dragonestia.picker.repository.RoomRepository;

2
server/src/test/java/ru/dragonestia/picker/picker/LeastPickedTests.java
View File

@ -12,7 +12,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
import ru.dragonestia.picker.api.exception.NoRoomsAvailableException; import ru.dragonestia.picker.api.exception.NoRoomsAvailableException;
import ru.dragonestia.picker.config.FillingNodesConfig; import ru.dragonestia.picker.config.FillingNodesConfig;
import ru.dragonestia.picker.model.Node; import ru.dragonestia.picker.model.node.Node;
import ru.dragonestia.picker.repository.RoomRepository; import ru.dragonestia.picker.repository.RoomRepository;
import ru.dragonestia.picker.repository.UserRepository; import ru.dragonestia.picker.repository.UserRepository;
import ru.dragonestia.picker.util.UserFiller; import ru.dragonestia.picker.util.UserFiller;

2
server/src/test/java/ru/dragonestia/picker/picker/RoundRobinTests.java
View File

@ -10,7 +10,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
import ru.dragonestia.picker.api.exception.NoRoomsAvailableException; import ru.dragonestia.picker.api.exception.NoRoomsAvailableException;
import ru.dragonestia.picker.config.FillingNodesConfig; import ru.dragonestia.picker.config.FillingNodesConfig;
import ru.dragonestia.picker.model.Node; import ru.dragonestia.picker.model.node.Node;
import ru.dragonestia.picker.repository.RoomRepository; import ru.dragonestia.picker.repository.RoomRepository;
import ru.dragonestia.picker.repository.UserRepository; import ru.dragonestia.picker.repository.UserRepository;
import ru.dragonestia.picker.util.UserFiller; import ru.dragonestia.picker.util.UserFiller;

2
server/src/test/java/ru/dragonestia/picker/picker/SequentialFillingTests.java
View File

@ -12,7 +12,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
import ru.dragonestia.picker.api.exception.NoRoomsAvailableException; import ru.dragonestia.picker.api.exception.NoRoomsAvailableException;
import ru.dragonestia.picker.config.FillingNodesConfig; import ru.dragonestia.picker.config.FillingNodesConfig;
import ru.dragonestia.picker.model.Node; import ru.dragonestia.picker.model.node.Node;
import ru.dragonestia.picker.repository.RoomRepository; import ru.dragonestia.picker.repository.RoomRepository;
import ru.dragonestia.picker.repository.UserRepository; import ru.dragonestia.picker.repository.UserRepository;
import ru.dragonestia.picker.util.UserFiller; import ru.dragonestia.picker.util.UserFiller;

2
server/src/test/java/ru/dragonestia/picker/service/NodeServiceTests.java
View File

@ -8,7 +8,7 @@ import org.springframework.security.test.context.support.WithMockUser;
import ru.dragonestia.picker.api.exception.NodeAlreadyExistException; import ru.dragonestia.picker.api.exception.NodeAlreadyExistException;
import ru.dragonestia.picker.api.model.node.PickingMethod; import ru.dragonestia.picker.api.model.node.PickingMethod;
import ru.dragonestia.picker.api.repository.type.NodeIdentifier; import ru.dragonestia.picker.api.repository.type.NodeIdentifier;
import ru.dragonestia.picker.model.Node; import ru.dragonestia.picker.model.node.Node;
import java.util.List; import java.util.List;

6
server/src/test/java/ru/dragonestia/picker/service/RoomServiceTests.java
View File

@ -15,11 +15,9 @@ import ru.dragonestia.picker.api.model.room.IRoom;
import ru.dragonestia.picker.api.repository.type.NodeIdentifier; import ru.dragonestia.picker.api.repository.type.NodeIdentifier;
import ru.dragonestia.picker.api.repository.type.RoomIdentifier; import ru.dragonestia.picker.api.repository.type.RoomIdentifier;
import ru.dragonestia.picker.api.repository.type.UserIdentifier; import ru.dragonestia.picker.api.repository.type.UserIdentifier;
import ru.dragonestia.picker.model.Node; import ru.dragonestia.picker.model.node.Node;
import ru.dragonestia.picker.model.Room; import ru.dragonestia.picker.model.user.User;
import ru.dragonestia.picker.model.User;
import ru.dragonestia.picker.model.factory.RoomFactory; import ru.dragonestia.picker.model.factory.RoomFactory;
import ru.dragonestia.picker.model.type.SlotLimit;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;

2
server/src/test/java/ru/dragonestia/picker/util/UserFiller.java
View File

@ -2,7 +2,7 @@ package ru.dragonestia.picker.util;
import org.springframework.boot.test.context.TestComponent; import org.springframework.boot.test.context.TestComponent;
import ru.dragonestia.picker.api.repository.type.UserIdentifier; import ru.dragonestia.picker.api.repository.type.UserIdentifier;
import ru.dragonestia.picker.model.User; import ru.dragonestia.picker.model.user.User;
import java.util.*; import java.util.*;