refactor: structure refactor

bababebr · Feb 1, 2024 · 46edb1f · 46edb1f
1 parent c37eaca
commit 46edb1f
Show file tree

Hide file tree

Showing 42 changed files with 135 additions and 132 deletions.
diff --git a/crude-server/src/main/java/ru/oil/cargo/CargoMapper.java b/crude-server/src/main/java/ru/oil/cargo/CargoMapper.java
@@ -1,10 +1,10 @@
 package ru.oil.cargo;
 
 import ru.oil.cargo.dto.CargoDto;
-import ru.oil.units.api.Api;
-import ru.oil.units.api.ApiDto;
-import ru.oil.units.temperature.Temperature;
-import ru.oil.units.temperature.TemperatureDto;
+import ru.oil.model.Api;
+import ru.oil.model.dto.ApiDto;
+import ru.oil.model.Temperature;
+import ru.oil.model.dto.TemperatureDto;
 
 public class CargoMapper {
 

diff --git a/crude-server/src/main/java/ru/oil/cargo/CargoService.java b/crude-server/src/main/java/ru/oil/cargo/CargoService.java
@@ -4,8 +4,8 @@
 import org.springframework.stereotype.Service;
 import ru.oil.cargo.dto.CargoDto;
 import ru.oil.enums.CargoType;
-import ru.oil.units.api.Api;
-import ru.oil.units.temperature.Temperature;
+import ru.oil.model.Api;
+import ru.oil.model.Temperature;
 
 import java.util.List;
 import java.util.NoSuchElementException;

diff --git a/crude-server/src/main/java/ru/oil/cargo/dto/CargoDto.java b/crude-server/src/main/java/ru/oil/cargo/dto/CargoDto.java
@@ -6,8 +6,8 @@
 import lombok.Setter;
 import lombok.experimental.FieldDefaults;
 import ru.oil.enums.CargoType;
-import ru.oil.units.api.ApiDto;
-import ru.oil.units.temperature.TemperatureDto;
+import ru.oil.model.dto.ApiDto;
+import ru.oil.model.dto.TemperatureDto;
 
 import javax.validation.constraints.NotNull;
 @Getter

diff --git a/.../java/ru/oil/ullage/dto/UllageMapper.java → ...main/java/ru/oil/mapper/UllageMapper.java b/.../java/ru/oil/ullage/dto/UllageMapper.java → ...main/java/ru/oil/mapper/UllageMapper.java
@@ -1,6 +1,7 @@
-package ru.oil.ullage.dto;
+package ru.oil.mapper;
 
-import ru.oil.ullage.Ullage;
+import ru.oil.model.Ullage;
+import ru.oil.model.dto.UllageDto;
 
 public class UllageMapper {
 

diff --git a/.../oil/ullageReport/UllageReportMapper.java → ...ava/ru/oil/mapper/UllageReportMapper.java b/.../oil/ullageReport/UllageReportMapper.java → ...ava/ru/oil/mapper/UllageReportMapper.java
@@ -1,7 +1,7 @@
-package ru.oil.ullageReport;
+package ru.oil.mapper;
 
-import ru.oil.ullageReport.model.UllageReport;
-import ru.oil.ullageReport.model.UllageReportDto;
+import ru.oil.model.UllageReport;
+import ru.oil.model.dto.UllageReportDto;
 
 public class UllageReportMapper {
 

diff --git a/...n/java/ru/oil/utils/mapper/VcfMapper.java → ...rc/main/java/ru/oil/mapper/VcfMapper.java b/...n/java/ru/oil/utils/mapper/VcfMapper.java → ...rc/main/java/ru/oil/mapper/VcfMapper.java
@@ -1,7 +1,7 @@
-package ru.oil.utils.mapper;
+package ru.oil.mapper;
 
-import ru.oil.units.vcf.Vcf;
-import ru.oil.utils.model.VcfDto;
+import ru.oil.model.Vcf;
+import ru.oil.model.dto.VcfDto;
 
 public class VcfMapper {
 

diff --git a/...n/java/ru/oil/utils/mapper/WcfMapper.java → ...rc/main/java/ru/oil/mapper/WcfMapper.java b/...n/java/ru/oil/utils/mapper/WcfMapper.java → ...rc/main/java/ru/oil/mapper/WcfMapper.java
@@ -1,7 +1,7 @@
-package ru.oil.utils.mapper;
+package ru.oil.mapper;
 
-import ru.oil.units.wcf.Wcf;
-import ru.oil.utils.model.WcfDto;
+import ru.oil.model.Wcf;
+import ru.oil.model.dto.WcfDto;
 
 public class WcfMapper {
 

diff --git a/...r/src/main/java/ru/oil/units/api/Api.java → ...erver/src/main/java/ru/oil/model/Api.java b/...r/src/main/java/ru/oil/units/api/Api.java → ...erver/src/main/java/ru/oil/model/Api.java
@@ -1,4 +1,4 @@
-package ru.oil.units.api;
+package ru.oil.model;
 
 import lombok.AccessLevel;
 import lombok.Data;

diff --git a/...ru/oil/units/temperature/Temperature.java → ...c/main/java/ru/oil/model/Temperature.java b/...ru/oil/units/temperature/Temperature.java → ...c/main/java/ru/oil/model/Temperature.java
@@ -1,4 +1,4 @@
-package ru.oil.units.temperature;
+package ru.oil.model;
 
 import lombok.AccessLevel;
 import lombok.Data;

diff --git a/...r/src/main/java/ru/oil/ullage/Ullage.java → ...er/src/main/java/ru/oil/model/Ullage.java b/...r/src/main/java/ru/oil/ullage/Ullage.java → ...er/src/main/java/ru/oil/model/Ullage.java
@@ -1,4 +1,4 @@
-package ru.oil.ullage;
+package ru.oil.model;
 
 import lombok.AccessLevel;
 import lombok.Getter;

diff --git a/.../oil/ullageReport/model/UllageReport.java → .../main/java/ru/oil/model/UllageReport.java b/.../oil/ullageReport/model/UllageReport.java → .../main/java/ru/oil/model/UllageReport.java
@@ -1,9 +1,9 @@
-package ru.oil.ullageReport.model;
+package ru.oil.model;
 
 import ru.oil.cargo.dto.CargoDto;
-import ru.oil.ullage.dto.UllageDtoFull;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
+import ru.oil.model.dto.UllageDtoFull;
 
 @Getter
 @Setter

diff --git a/crude-server/src/main/java/ru/oil/model/Vcf.java b/crude-server/src/main/java/ru/oil/model/Vcf.java
@@ -0,0 +1,7 @@
+package ru.oil.model;
+
+public interface Vcf {
+    double getVcf();
+    Api getApi();
+    Temperature getTemp();
+}
diff --git a/...rc/main/java/ru/oil/units/vcf/Vcf54A.java → ...er/src/main/java/ru/oil/model/Vcf54A.java b/...rc/main/java/ru/oil/units/vcf/Vcf54A.java → ...er/src/main/java/ru/oil/model/Vcf54A.java
@@ -1,7 +1,5 @@
-package ru.oil.units.vcf;
+package ru.oil.model;
 
-import ru.oil.units.api.Api;
-import ru.oil.units.temperature.Temperature;
 import lombok.Data;
 
 @Data

diff --git a/...rc/main/java/ru/oil/units/vcf/Vcf54B.java → ...er/src/main/java/ru/oil/model/Vcf54B.java b/...rc/main/java/ru/oil/units/vcf/Vcf54B.java → ...er/src/main/java/ru/oil/model/Vcf54B.java
@@ -1,7 +1,5 @@
-package ru.oil.units.vcf;
+package ru.oil.model;
 
-import ru.oil.units.api.Api;
-import ru.oil.units.temperature.Temperature;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
 import lombok.experimental.NonFinal;

diff --git a/.../src/main/java/ru/oil/units/vcf/Vcf6.java → ...rver/src/main/java/ru/oil/model/Vcf6.java b/.../src/main/java/ru/oil/units/vcf/Vcf6.java → ...rver/src/main/java/ru/oil/model/Vcf6.java
@@ -1,4 +1,4 @@
-package ru.oil.units.vcf;
+package ru.oil.model;
 
 /**
  * TODO:

diff --git a/...src/main/java/ru/oil/units/vcf/Vcf6A.java → ...ver/src/main/java/ru/oil/model/Vcf6A.java b/...src/main/java/ru/oil/units/vcf/Vcf6A.java → ...ver/src/main/java/ru/oil/model/Vcf6A.java
@@ -1,7 +1,5 @@
-package ru.oil.units.vcf;
+package ru.oil.model;
 
-import ru.oil.units.api.Api;
-import ru.oil.units.temperature.Temperature;
 import lombok.Data;
 
 @Data

diff --git a/...src/main/java/ru/oil/units/vcf/Vcf6B.java → ...ver/src/main/java/ru/oil/model/Vcf6B.java b/...src/main/java/ru/oil/units/vcf/Vcf6B.java → ...ver/src/main/java/ru/oil/model/Vcf6B.java
@@ -1,7 +1,5 @@
-package ru.oil.units.vcf;
+package ru.oil.model;
 
-import ru.oil.units.api.Api;
-import ru.oil.units.temperature.Temperature;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;

diff --git a/...r/src/main/java/ru/oil/units/wcf/Wcf.java → ...erver/src/main/java/ru/oil/model/Wcf.java b/...r/src/main/java/ru/oil/units/wcf/Wcf.java → ...erver/src/main/java/ru/oil/model/Wcf.java
@@ -1,8 +1,6 @@
-package ru.oil.units.wcf;
+package ru.oil.model;
 
 import lombok.AllArgsConstructor;
-import ru.oil.units.vcf.Vcf;
-import lombok.RequiredArgsConstructor;
 
 @AllArgsConstructor(staticName = "create")
 public class Wcf {

diff --git a/...rc/main/java/ru/oil/units/api/ApiDto.java → ...rc/main/java/ru/oil/model/dto/ApiDto.java b/...rc/main/java/ru/oil/units/api/ApiDto.java → ...rc/main/java/ru/oil/model/dto/ApiDto.java
@@ -1,7 +1,8 @@
-package ru.oil.units.api;
+package ru.oil.model.dto;
 
 import lombok.*;
 import lombok.experimental.FieldDefaults;
+import ru.oil.model.Api;
 
 @RequiredArgsConstructor(staticName = "create")
 @AllArgsConstructor(staticName = "create")

diff --git a/...oil/units/temperature/TemperatureDto.java → ...java/ru/oil/model/dto/TemperatureDto.java b/...oil/units/temperature/TemperatureDto.java → ...java/ru/oil/model/dto/TemperatureDto.java
@@ -1,7 +1,8 @@
-package ru.oil.units.temperature;
+package ru.oil.model.dto;
 
 import lombok.*;
 import lombok.experimental.FieldDefaults;
+import ru.oil.model.Temperature;
 
 @RequiredArgsConstructor
 @AllArgsConstructor(staticName = "create")

diff --git a/...ain/java/ru/oil/ullage/dto/UllageDto.java → ...main/java/ru/oil/model/dto/UllageDto.java b/...ain/java/ru/oil/ullage/dto/UllageDto.java → ...main/java/ru/oil/model/dto/UllageDto.java
@@ -1,4 +1,4 @@
-package ru.oil.ullage.dto;
+package ru.oil.model.dto;
 
 import lombok.AccessLevel;
 import lombok.Getter;

diff --git a/...java/ru/oil/ullage/dto/UllageDtoFull.java → .../java/ru/oil/model/dto/UllageDtoFull.java b/...java/ru/oil/ullage/dto/UllageDtoFull.java → .../java/ru/oil/model/dto/UllageDtoFull.java
@@ -1,7 +1,7 @@
-package ru.oil.ullage.dto;
+package ru.oil.model.dto;
 
-import ru.oil.units.api.Api;
-import ru.oil.units.temperature.Temperature;
+import ru.oil.model.Api;
+import ru.oil.model.Temperature;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
 

diff --git a/...l/ullageReport/model/UllageReportDto.java → ...ava/ru/oil/model/dto/UllageReportDto.java b/...l/ullageReport/model/UllageReportDto.java → ...ava/ru/oil/model/dto/UllageReportDto.java
@@ -1,4 +1,4 @@
-package ru.oil.ullageReport.model;
+package ru.oil.model.dto;
 
 import lombok.*;
 import lombok.experimental.FieldDefaults;

diff --git a/...a/ru/oil/ullage/dto/UllageRequestDto.java → ...va/ru/oil/model/dto/UllageRequestDto.java b/...a/ru/oil/ullage/dto/UllageRequestDto.java → ...va/ru/oil/model/dto/UllageRequestDto.java
@@ -1,4 +1,4 @@
-package ru.oil.ullage.dto;
+package ru.oil.model.dto;
 
 import ru.oil.enums.Tables;
 import lombok.*;

diff --git a/.../main/java/ru/oil/utils/model/VcfDto.java → ...rc/main/java/ru/oil/model/dto/VcfDto.java b/.../main/java/ru/oil/utils/model/VcfDto.java → ...rc/main/java/ru/oil/model/dto/VcfDto.java
@@ -1,4 +1,4 @@
-package ru.oil.utils.model;
+package ru.oil.model.dto;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;

diff --git a/.../main/java/ru/oil/utils/model/WcfDto.java → ...rc/main/java/ru/oil/model/dto/WcfDto.java b/.../main/java/ru/oil/utils/model/WcfDto.java → ...rc/main/java/ru/oil/model/dto/WcfDto.java
@@ -1,4 +1,4 @@
-package ru.oil.utils.model;
+package ru.oil.model.dto;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;

diff --git a/.../java/ru/oil/ullage/UllageRepository.java → ...a/ru/oil/repository/UllageRepository.java b/.../java/ru/oil/ullage/UllageRepository.java → ...a/ru/oil/repository/UllageRepository.java
@@ -1,11 +1,12 @@
-package ru.oil.ullage;
+package ru.oil.repository;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import ru.oil.model.Ullage;
 
 @Repository
 public interface UllageRepository extends JpaRepository<Ullage, Long> {

diff --git a/...oil/ullageReport/UllageReportService.java → ...a/ru/oil/service/UllageReportService.java b/...oil/ullageReport/UllageReportService.java → ...a/ru/oil/service/UllageReportService.java
@@ -1,21 +1,26 @@
-package ru.oil.ullageReport;
+package ru.oil.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.lang.Nullable;
 import org.springframework.stereotype.Service;
 import ru.oil.cargo.CargoService;
 import ru.oil.cargo.dto.CargoDto;
 import ru.oil.enums.Tables;
-import ru.oil.ullage.UllageService;
-import ru.oil.ullage.dto.UllageDto;
-import ru.oil.ullage.dto.UllageDtoFull;
-import ru.oil.ullage.dto.UllageRequestDto;
-import ru.oil.ullageReport.model.UllageReport;
-import ru.oil.ullageReport.model.UllageReportDto;
-import ru.oil.units.api.Api;
-import ru.oil.units.temperature.Temperature;
-import ru.oil.units.vcf.*;
-import ru.oil.units.wcf.Wcf;
+import ru.oil.model.Vcf;
+import ru.oil.model.Vcf54A;
+import ru.oil.model.Vcf54B;
+import ru.oil.model.Vcf6A;
+import ru.oil.model.Vcf6B;
+import ru.oil.model.dto.UllageDto;
+import ru.oil.model.dto.UllageDtoFull;
+import ru.oil.model.dto.UllageRequestDto;
+import ru.oil.service.interfaces.IUllageReportService;
+import ru.oil.mapper.UllageReportMapper;
+import ru.oil.model.UllageReport;
+import ru.oil.model.dto.UllageReportDto;
+import ru.oil.model.Api;
+import ru.oil.model.Temperature;
+import ru.oil.model.Wcf;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...ain/java/ru/oil/ullage/UllageService.java → ...in/java/ru/oil/service/UllageService.java b/...ain/java/ru/oil/ullage/UllageService.java → ...in/java/ru/oil/service/UllageService.java
@@ -1,15 +1,17 @@
-package ru.oil.ullage;
+package ru.oil.service;
 
-import ru.oil.ullage.dto.UllageDto;
-import ru.oil.ullage.dto.UllageMapper;
-import ru.oil.ullage.dto.UllageRequestDto;
+import java.util.List;
+import java.util.NoSuchElementException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-import java.util.NoSuchElementException;
+import ru.oil.repository.UllageRepository;
+import ru.oil.model.Ullage;
+import ru.oil.model.dto.UllageDto;
+import ru.oil.mapper.UllageMapper;
+import ru.oil.model.dto.UllageRequestDto;
+import ru.oil.service.interfaces.IUllageService;
 
 @Service
 @RequiredArgsConstructor

diff --git a/...java/ru/oil/utils/service/VcfService.java → .../main/java/ru/oil/service/VcfService.java b/...java/ru/oil/utils/service/VcfService.java → .../main/java/ru/oil/service/VcfService.java
@@ -1,13 +1,17 @@
-package ru.oil.utils.service;
+package ru.oil.service;
 
 import org.springframework.stereotype.Service;
 import ru.oil.enums.Tables;
 import ru.oil.exception.UtilsException;
-import ru.oil.units.api.Api;
-import ru.oil.units.temperature.Temperature;
-import ru.oil.units.vcf.*;
-import ru.oil.utils.mapper.VcfMapper;
-import ru.oil.utils.model.VcfDto;
+import ru.oil.model.Vcf54A;
+import ru.oil.model.Vcf54B;
+import ru.oil.model.Vcf6A;
+import ru.oil.model.Vcf6B;
+import ru.oil.service.interfaces.IVcfService;
+import ru.oil.model.Api;
+import ru.oil.model.Temperature;
+import ru.oil.mapper.VcfMapper;
+import ru.oil.model.dto.VcfDto;
 
 @Service
 public class VcfService implements IVcfService {

diff --git a/...java/ru/oil/utils/service/WcfService.java → .../main/java/ru/oil/service/WcfService.java b/...java/ru/oil/utils/service/WcfService.java → .../main/java/ru/oil/service/WcfService.java
@@ -1,10 +1,11 @@
-package ru.oil.utils.service;
+package ru.oil.service;
 
 import org.springframework.stereotype.Service;
-import ru.oil.units.api.Api;
-import ru.oil.units.wcf.Wcf;
-import ru.oil.utils.mapper.WcfMapper;
-import ru.oil.utils.model.WcfDto;
+import ru.oil.service.interfaces.IWcfService;
+import ru.oil.model.Api;
+import ru.oil.model.Wcf;
+import ru.oil.mapper.WcfMapper;
+import ru.oil.model.dto.WcfDto;
 
 @Service
 public class WcfService implements IWcfService {

diff --git a/...il/ullageReport/IUllageReportService.java → ...vice/interfaces/IUllageReportService.java b/...il/ullageReport/IUllageReportService.java → ...vice/interfaces/IUllageReportService.java
@@ -1,7 +1,7 @@
-package ru.oil.ullageReport;
+package ru.oil.service.interfaces;
 
-import ru.oil.ullage.dto.UllageRequestDto;
-import ru.oil.ullageReport.model.UllageReportDto;
+import ru.oil.model.dto.UllageRequestDto;
+import ru.oil.model.dto.UllageReportDto;
 
 import java.util.List;
 

diff --git a/crude-server/src/main/java/ru/oil/service/interfaces/IUllageService.java b/crude-server/src/main/java/ru/oil/service/interfaces/IUllageService.java
@@ -0,0 +1,10 @@
+package ru.oil.service.interfaces;
+
+import ru.oil.model.dto.UllageDto;
+import ru.oil.model.dto.UllageRequestDto;
+
+public interface IUllageService {
+
+    UllageDto getTankUllage(UllageRequestDto requestDto);
+
+}
diff --git a/...ava/ru/oil/utils/service/IVcfService.java → ...u/oil/service/interfaces/IVcfService.java b/...ava/ru/oil/utils/service/IVcfService.java → ...u/oil/service/interfaces/IVcfService.java
@@ -1,7 +1,7 @@
-package ru.oil.utils.service;
+package ru.oil.service.interfaces;
 
 import ru.oil.enums.Tables;
-import ru.oil.utils.model.VcfDto;
+import ru.oil.model.dto.VcfDto;
 
 public interface IVcfService {
 

diff --git a/crude-server/src/main/java/ru/oil/service/interfaces/IWcfService.java b/crude-server/src/main/java/ru/oil/service/interfaces/IWcfService.java
@@ -0,0 +1,10 @@
+package ru.oil.service.interfaces;
+
+import ru.oil.model.dto.WcfDto;
+
+public interface IWcfService {
+
+    WcfDto getWcf(double api);
+
+    WcfDto getWcfByDensity(double density);
+}