feat(dto): refactor dto structure

evrentan · Feb 3, 2024 · 3d8705e · 3d8705e
1 parent 6c6f7e0
commit 3d8705e
Show file tree

Hide file tree

Showing 37 changed files with 50 additions and 43 deletions.
diff --git a/...ger/src/main/java/evrentan/community/communitymanager/controller/CommunityController.java b/...ger/src/main/java/evrentan/community/communitymanager/controller/CommunityController.java
@@ -1,6 +1,6 @@
 package evrentan.community.communitymanager.controller;
 
-import evrentan.community.communitymanager.dto.Community;
+import evrentan.community.communitymanager.dto.entity.Community;
 import evrentan.community.communitymanager.service.CommunityService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;

diff --git a/...unity/communitymanager/dto/Community.java → ...ommunitymanager/dto/entity/Community.java b/...unity/communitymanager/dto/Community.java → ...ommunitymanager/dto/entity/Community.java
@@ -1,4 +1,4 @@
-package evrentan.community.communitymanager.dto;
+package evrentan.community.communitymanager.dto.entity;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

diff --git a/...itymanager/exception/CustomRestError.java → ...anager/dto/exception/CustomRestError.java b/...itymanager/exception/CustomRestError.java → ...anager/dto/exception/CustomRestError.java
@@ -1,4 +1,4 @@
-package evrentan.community.communitymanager.exception;
+package evrentan.community.communitymanager.dto.exception;
 
 import lombok.Builder;
 import lombok.Data;

diff --git a/...ymanager/dto/MyConfigurationProperty.java → ...er/dto/other/MyConfigurationProperty.java b/...ymanager/dto/MyConfigurationProperty.java → ...er/dto/other/MyConfigurationProperty.java
@@ -1,4 +1,4 @@
-package evrentan.community.communitymanager.dto;
+package evrentan.community.communitymanager.dto.other;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;

diff --git a/...ity-manager/src/main/java/evrentan/community/communitymanager/entity/CommunityEntity.java b/...ity-manager/src/main/java/evrentan/community/communitymanager/entity/CommunityEntity.java
@@ -1,13 +1,14 @@
 package evrentan.community.communitymanager.entity;
 
+import evrentan.community.communitymanager.dto.entity.Community;
 import jakarta.persistence.*;
 import lombok.*;
 
 import java.util.UUID;
 
 /**
  * Community Entity Class represents the community table in the database.
- * It is represented by {@link evrentan.community.communitymanager.dto.Community} in DTO level.
+ * It is represented by {@link Community} in DTO level.
  *
  * @author <a href="https://github.com/evrentan">Evren Tan</a>
  * @since 1.0.0

diff --git a/...c/main/java/evrentan/community/communitymanager/exception/GlobalRestExceptionHandler.java b/...c/main/java/evrentan/community/communitymanager/exception/GlobalRestExceptionHandler.java
@@ -1,5 +1,6 @@
 package evrentan.community.communitymanager.exception;
 
+import evrentan.community.communitymanager.dto.exception.CustomRestError;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.ws.rs.BadRequestException;

diff --git a/...-manager/src/main/java/evrentan/community/communitymanager/impl/CommunityServiceImpl.java b/...-manager/src/main/java/evrentan/community/communitymanager/impl/CommunityServiceImpl.java
@@ -1,6 +1,6 @@
 package evrentan.community.communitymanager.impl;
 
-import evrentan.community.communitymanager.dto.Community;
+import evrentan.community.communitymanager.dto.entity.Community;
 import evrentan.community.communitymanager.entity.CommunityEntity;
 import evrentan.community.communitymanager.mapper.CommunityMapper;
 import evrentan.community.communitymanager.repository.CommunityRepository;

diff --git a/...unity-manager/src/main/java/evrentan/community/communitymanager/impl/TestServiceImpl.java b/...unity-manager/src/main/java/evrentan/community/communitymanager/impl/TestServiceImpl.java
@@ -1,6 +1,6 @@
 package evrentan.community.communitymanager.impl;
 
-import evrentan.community.communitymanager.dto.MyConfigurationProperty;
+import evrentan.community.communitymanager.dto.other.MyConfigurationProperty;
 import evrentan.community.communitymanager.service.TestService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.context.config.annotation.RefreshScope;

diff --git a/...ity-manager/src/main/java/evrentan/community/communitymanager/mapper/CommunityMapper.java b/...ity-manager/src/main/java/evrentan/community/communitymanager/mapper/CommunityMapper.java
@@ -1,6 +1,6 @@
 package evrentan.community.communitymanager.mapper;
 
-import evrentan.community.communitymanager.dto.Community;
+import evrentan.community.communitymanager.dto.entity.Community;
 import evrentan.community.communitymanager.entity.CommunityEntity;
 
 import java.util.List;

diff --git a/...y-manager/src/main/java/evrentan/community/communitymanager/service/CommunityService.java b/...y-manager/src/main/java/evrentan/community/communitymanager/service/CommunityService.java
@@ -1,6 +1,6 @@
 package evrentan.community.communitymanager.service;
 
-import evrentan.community.communitymanager.dto.Community;
+import evrentan.community.communitymanager.dto.entity.Community;
 
 import java.util.List;
 import java.util.UUID;

diff --git a/...er/src/main/java/evrentan/community/usermanager/controller/ApplicationUserController.java b/...er/src/main/java/evrentan/community/usermanager/controller/ApplicationUserController.java
@@ -1,6 +1,6 @@
 package evrentan.community.usermanager.controller;
 
-import evrentan.community.usermanager.dto.ApplicationUser;
+import evrentan.community.usermanager.dto.entity.ApplicationUser;
 import evrentan.community.usermanager.service.ApplicationUserService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;

diff --git a/user-manager/src/main/java/evrentan/community/usermanager/controller/UserTypeController.java b/user-manager/src/main/java/evrentan/community/usermanager/controller/UserTypeController.java
@@ -1,6 +1,6 @@
 package evrentan.community.usermanager.controller;
 
-import evrentan.community.usermanager.dto.UserType;
+import evrentan.community.usermanager.dto.entity.UserType;
 import evrentan.community.usermanager.service.UserTypeService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;

diff --git a/...nity/usermanager/dto/ApplicationUser.java → ...ermanager/dto/entity/ApplicationUser.java b/...nity/usermanager/dto/ApplicationUser.java → ...ermanager/dto/entity/ApplicationUser.java
@@ -1,4 +1,4 @@
-package evrentan.community.usermanager.dto;
+package evrentan.community.usermanager.dto.entity;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

diff --git a/...n/community/usermanager/dto/UserType.java → ...nity/usermanager/dto/entity/UserType.java b/...n/community/usermanager/dto/UserType.java → ...nity/usermanager/dto/entity/UserType.java
@@ -1,4 +1,4 @@
-package evrentan.community.usermanager.dto;
+package evrentan.community.usermanager.dto.entity;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

diff --git a/user-manager/src/main/java/evrentan/community/usermanager/entity/ApplicationUserEntity.java b/user-manager/src/main/java/evrentan/community/usermanager/entity/ApplicationUserEntity.java
@@ -1,5 +1,6 @@
 package evrentan.community.usermanager.entity;
 
+import evrentan.community.usermanager.dto.entity.ApplicationUser;
 import jakarta.persistence.*;
 import lombok.*;
 
@@ -8,7 +9,7 @@
 
 /**
  * Application User Entity Class represents the application_user table in the database.
- * It is represented by {@link evrentan.community.usermanager.dto.ApplicationUser} in DTO level.
+ * It is represented by {@link ApplicationUser} in DTO level.
  *
  * @author <a href="https://github.com/evrentan">Evren Tan</a>
  * @since 1.0.0

diff --git a/user-manager/src/main/java/evrentan/community/usermanager/entity/UserTypeEntity.java b/user-manager/src/main/java/evrentan/community/usermanager/entity/UserTypeEntity.java
@@ -1,5 +1,6 @@
 package evrentan.community.usermanager.entity;
 
+import evrentan.community.usermanager.dto.entity.UserType;
 import jakarta.persistence.*;
 import lombok.*;
 
@@ -8,7 +9,7 @@
 
 /**
  * User Type Entity Class represents the user_type table in the database.
- * It is represented by {@link evrentan.community.usermanager.dto.UserType} in DTO level.
+ * It is represented by {@link UserType} in DTO level.
  *
  * @author <a href="https://github.com/evrentan">Evren Tan</a>
  * @since 1.0.0

diff --git a/...manager/src/main/java/evrentan/community/usermanager/impl/ApplicationUserServiceImpl.java b/...manager/src/main/java/evrentan/community/usermanager/impl/ApplicationUserServiceImpl.java
@@ -1,6 +1,6 @@
 package evrentan.community.usermanager.impl;
 
-import evrentan.community.usermanager.dto.ApplicationUser;
+import evrentan.community.usermanager.dto.entity.ApplicationUser;
 import evrentan.community.usermanager.entity.ApplicationUserEntity;
 import evrentan.community.usermanager.mapper.ApplicationUserMapper;
 import evrentan.community.usermanager.repository.ApplicationUserRepository;

diff --git a/user-manager/src/main/java/evrentan/community/usermanager/impl/UserTypeServiceImpl.java b/user-manager/src/main/java/evrentan/community/usermanager/impl/UserTypeServiceImpl.java
@@ -1,6 +1,6 @@
 package evrentan.community.usermanager.impl;
 
-import evrentan.community.usermanager.dto.UserType;
+import evrentan.community.usermanager.dto.entity.UserType;
 import evrentan.community.usermanager.entity.UserTypeEntity;
 import evrentan.community.usermanager.mapper.UserTypeMapper;
 import evrentan.community.usermanager.repository.UserTypeRepository;

diff --git a/user-manager/src/main/java/evrentan/community/usermanager/mapper/ApplicationUserMapper.java b/user-manager/src/main/java/evrentan/community/usermanager/mapper/ApplicationUserMapper.java
@@ -1,6 +1,6 @@
 package evrentan.community.usermanager.mapper;
 
-import evrentan.community.usermanager.dto.ApplicationUser;
+import evrentan.community.usermanager.dto.entity.ApplicationUser;
 import evrentan.community.usermanager.entity.ApplicationUserEntity;
 
 import java.util.List;

diff --git a/user-manager/src/main/java/evrentan/community/usermanager/mapper/UserTypeMapper.java b/user-manager/src/main/java/evrentan/community/usermanager/mapper/UserTypeMapper.java
@@ -1,6 +1,6 @@
 package evrentan.community.usermanager.mapper;
 
-import evrentan.community.usermanager.dto.UserType;
+import evrentan.community.usermanager.dto.entity.UserType;
 import evrentan.community.usermanager.entity.UserTypeEntity;
 
 import java.util.List;

diff --git a/...-manager/src/main/java/evrentan/community/usermanager/service/ApplicationUserService.java b/...-manager/src/main/java/evrentan/community/usermanager/service/ApplicationUserService.java
@@ -1,6 +1,6 @@
 package evrentan.community.usermanager.service;
 
-import evrentan.community.usermanager.dto.ApplicationUser;
+import evrentan.community.usermanager.dto.entity.ApplicationUser;
 
 import java.util.List;
 import java.util.UUID;

diff --git a/user-manager/src/main/java/evrentan/community/usermanager/service/UserTypeService.java b/user-manager/src/main/java/evrentan/community/usermanager/service/UserTypeService.java
@@ -1,6 +1,6 @@
 package evrentan.community.usermanager.service;
 
-import evrentan.community.usermanager.dto.UserType;
+import evrentan.community.usermanager.dto.entity.UserType;
 
 import java.util.List;
 import java.util.UUID;

diff --git a/venue-manager/src/main/java/evrentan/community/venuemanager/controller/RoomController.java b/venue-manager/src/main/java/evrentan/community/venuemanager/controller/RoomController.java
@@ -1,7 +1,7 @@
 package evrentan.community.venuemanager.controller;
 
-import evrentan.community.venuemanager.dto.Room;
-import evrentan.community.venuemanager.dto.VenueRoom;
+import evrentan.community.venuemanager.dto.entity.Room;
+import evrentan.community.venuemanager.dto.entity.VenueRoom;
 import evrentan.community.venuemanager.service.RoomService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;

diff --git a/venue-manager/src/main/java/evrentan/community/venuemanager/controller/VenueController.java b/venue-manager/src/main/java/evrentan/community/venuemanager/controller/VenueController.java
@@ -1,7 +1,7 @@
 package evrentan.community.venuemanager.controller;
 
-import evrentan.community.venuemanager.dto.Venue;
-import evrentan.community.venuemanager.dto.VenueRoom;
+import evrentan.community.venuemanager.dto.entity.Venue;
+import evrentan.community.venuemanager.dto.entity.VenueRoom;
 import evrentan.community.venuemanager.service.VenueService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;

diff --git a/...ntan/community/venuemanager/dto/Room.java → ...mmunity/venuemanager/dto/entity/Room.java b/...ntan/community/venuemanager/dto/Room.java → ...mmunity/venuemanager/dto/entity/Room.java
@@ -1,4 +1,4 @@
-package evrentan.community.venuemanager.dto;
+package evrentan.community.venuemanager.dto.entity;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

diff --git a/...tan/community/venuemanager/dto/Venue.java → ...munity/venuemanager/dto/entity/Venue.java b/...tan/community/venuemanager/dto/Venue.java → ...munity/venuemanager/dto/entity/Venue.java
@@ -1,4 +1,4 @@
-package evrentan.community.venuemanager.dto;
+package evrentan.community.venuemanager.dto.entity;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

diff --git a/...community/venuemanager/dto/VenueRoom.java → ...ty/venuemanager/dto/entity/VenueRoom.java b/...community/venuemanager/dto/VenueRoom.java → ...ty/venuemanager/dto/entity/VenueRoom.java
@@ -1,4 +1,4 @@
-package evrentan.community.venuemanager.dto;
+package evrentan.community.venuemanager.dto.entity;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

diff --git a/venue-manager/src/main/java/evrentan/community/venuemanager/entity/RoomEntity.java b/venue-manager/src/main/java/evrentan/community/venuemanager/entity/RoomEntity.java
@@ -1,13 +1,14 @@
 package evrentan.community.venuemanager.entity;
 
+import evrentan.community.venuemanager.dto.entity.Room;
 import jakarta.persistence.*;
 import lombok.*;
 
 import java.util.UUID;
 
 /**
  * Room Entity Class represents the venue table in the database.
- * It is represented by {@link evrentan.community.venuemanager.dto.Room} in DTO level.
+ * It is represented by {@link Room} in DTO level.
  *
  * @author <a href="https://github.com/evrentan">Evren Tan</a>
  * @since 1.0.0

diff --git a/venue-manager/src/main/java/evrentan/community/venuemanager/entity/VenueEntity.java b/venue-manager/src/main/java/evrentan/community/venuemanager/entity/VenueEntity.java
@@ -1,13 +1,14 @@
 package evrentan.community.venuemanager.entity;
 
+import evrentan.community.venuemanager.dto.entity.Venue;
 import jakarta.persistence.*;
 import lombok.*;
 
 import java.util.UUID;
 
 /**
  * Venue Entity Class represents the venue table in the database.
- * It is represented by {@link evrentan.community.venuemanager.dto.Venue} in DTO level.
+ * It is represented by {@link Venue} in DTO level.
  *
  * @author <a href="https://github.com/evrentan">Evren Tan</a>
  * @since 1.0.0

diff --git a/venue-manager/src/main/java/evrentan/community/venuemanager/entity/VenueRoomEntity.java b/venue-manager/src/main/java/evrentan/community/venuemanager/entity/VenueRoomEntity.java
@@ -1,13 +1,14 @@
 package evrentan.community.venuemanager.entity;
 
+import evrentan.community.venuemanager.dto.entity.VenueRoom;
 import jakarta.persistence.*;
 import lombok.*;
 
 import java.util.UUID;
 
 /**
  * VenueRoom Entity Class represents the venue_room table in the database.
- * It is represented by {@link evrentan.community.venuemanager.dto.VenueRoom} in DTO level.
+ * It is represented by {@link VenueRoom} in DTO level.
  *
  * @author <a href="https://github.com/evrentan">Evren Tan</a>
  * @since 1.0.0

diff --git a/venue-manager/src/main/java/evrentan/community/venuemanager/impl/RoomServiceImpl.java b/venue-manager/src/main/java/evrentan/community/venuemanager/impl/RoomServiceImpl.java
@@ -1,7 +1,7 @@
 package evrentan.community.venuemanager.impl;
 
-import evrentan.community.venuemanager.dto.Room;
-import evrentan.community.venuemanager.dto.VenueRoom;
+import evrentan.community.venuemanager.dto.entity.Room;
+import evrentan.community.venuemanager.dto.entity.VenueRoom;
 import evrentan.community.venuemanager.entity.RoomEntity;
 import evrentan.community.venuemanager.mapper.RoomMapper;
 import evrentan.community.venuemanager.mapper.VenueRoomMapper;

diff --git a/venue-manager/src/main/java/evrentan/community/venuemanager/impl/VenueServiceImpl.java b/venue-manager/src/main/java/evrentan/community/venuemanager/impl/VenueServiceImpl.java
@@ -1,7 +1,7 @@
 package evrentan.community.venuemanager.impl;
 
-import evrentan.community.venuemanager.dto.Venue;
-import evrentan.community.venuemanager.dto.VenueRoom;
+import evrentan.community.venuemanager.dto.entity.Venue;
+import evrentan.community.venuemanager.dto.entity.VenueRoom;
 import evrentan.community.venuemanager.entity.VenueEntity;
 import evrentan.community.venuemanager.mapper.VenueMapper;
 import evrentan.community.venuemanager.mapper.VenueRoomMapper;

diff --git a/venue-manager/src/main/java/evrentan/community/venuemanager/mapper/RoomMapper.java b/venue-manager/src/main/java/evrentan/community/venuemanager/mapper/RoomMapper.java
@@ -1,6 +1,6 @@
 package evrentan.community.venuemanager.mapper;
 
-import evrentan.community.venuemanager.dto.Room;
+import evrentan.community.venuemanager.dto.entity.Room;
 import evrentan.community.venuemanager.entity.RoomEntity;
 
 import java.util.List;

diff --git a/venue-manager/src/main/java/evrentan/community/venuemanager/mapper/VenueMapper.java b/venue-manager/src/main/java/evrentan/community/venuemanager/mapper/VenueMapper.java
@@ -1,6 +1,6 @@
 package evrentan.community.venuemanager.mapper;
 
-import evrentan.community.venuemanager.dto.Venue;
+import evrentan.community.venuemanager.dto.entity.Venue;
 import evrentan.community.venuemanager.entity.VenueEntity;
 
 import java.util.List;

diff --git a/venue-manager/src/main/java/evrentan/community/venuemanager/mapper/VenueRoomMapper.java b/venue-manager/src/main/java/evrentan/community/venuemanager/mapper/VenueRoomMapper.java
@@ -1,6 +1,6 @@
 package evrentan.community.venuemanager.mapper;
 
-import evrentan.community.venuemanager.dto.VenueRoom;
+import evrentan.community.venuemanager.dto.entity.VenueRoom;
 import evrentan.community.venuemanager.entity.VenueRoomEntity;
 
 import java.util.List;

diff --git a/venue-manager/src/main/java/evrentan/community/venuemanager/service/RoomService.java b/venue-manager/src/main/java/evrentan/community/venuemanager/service/RoomService.java
@@ -1,7 +1,7 @@
 package evrentan.community.venuemanager.service;
 
-import evrentan.community.venuemanager.dto.Room;
-import evrentan.community.venuemanager.dto.VenueRoom;
+import evrentan.community.venuemanager.dto.entity.Room;
+import evrentan.community.venuemanager.dto.entity.VenueRoom;
 
 import java.util.List;
 import java.util.UUID;
@@ -86,7 +86,7 @@ public interface RoomService {
  *
  * @param roomId room id to be assigned to the venue
  * @param assignedVenueRoom venue that the room is assigned to
- * @return UUID which is the id of the VenueRoom instance. Please, see the {@link evrentan.community.venuemanager.dto.VenueRoom} class for details.
+ * @return UUID which is the id of the VenueRoom instance. Please, see the {@link VenueRoom} class for details.
  *
  * @author <a href="https://github.com/evrentan">Evren Tan</a>
  * @since 1.0.0

diff --git a/venue-manager/src/main/java/evrentan/community/venuemanager/service/VenueService.java b/venue-manager/src/main/java/evrentan/community/venuemanager/service/VenueService.java
@@ -1,7 +1,7 @@
 package evrentan.community.venuemanager.service;
 
-import evrentan.community.venuemanager.dto.Venue;
-import evrentan.community.venuemanager.dto.VenueRoom;
+import evrentan.community.venuemanager.dto.entity.Venue;
+import evrentan.community.venuemanager.dto.entity.VenueRoom;
 
 import java.util.List;
 import java.util.UUID;