Skip to content

Commit

Permalink
153-Database-Connection-BugFix (#154)
Browse files Browse the repository at this point in the history 
* Convert trade module IMC creation methods to createIfNotExists, includes test updates

* Reverted to check if shouldRequest, occasional double messages are sent but the check is to see if the request is needed, rather than should it insert into local table.
  • Loading branch information
@Daniel-J-Mason
Daniel-J-Mason authored Mar 18, 2024
1 parent 83a0318 commit 2870c52
Show file tree
Hide file tree
Showing 61 changed files with 339 additions and 321 deletions.
36 changes: 18 additions & 18 deletions trade-module/src/main/java/io/edpn/backend/trade/adapter/config/ServiceConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,30 +13,30 @@
import io.edpn.backend.trade.application.port.outgoing.station.CreateOrLoadStationPort;
import io.edpn.backend.trade.application.port.outgoing.station.LoadStationsByFilterPort;
import io.edpn.backend.trade.application.port.outgoing.station.UpdateStationPort;
import io.edpn.backend.trade.application.port.outgoing.stationarrivaldistancerequest.CreateStationArrivalDistanceRequestPort;
import io.edpn.backend.trade.application.port.outgoing.stationarrivaldistancerequest.CreateIfNotExistsStationArrivalDistanceRequestPort;
import io.edpn.backend.trade.application.port.outgoing.stationarrivaldistancerequest.DeleteStationArrivalDistanceRequestPort;
import io.edpn.backend.trade.application.port.outgoing.stationarrivaldistancerequest.ExistsStationArrivalDistanceRequestPort;
import io.edpn.backend.trade.application.port.outgoing.stationarrivaldistancerequest.LoadAllStationArrivalDistanceRequestsPort;
import io.edpn.backend.trade.application.port.outgoing.stationlandingpadsizerequest.CreateStationLandingPadSizeRequestPort;
import io.edpn.backend.trade.application.port.outgoing.stationlandingpadsizerequest.CreateIfNotExistsStationLandingPadSizeRequestPort;
import io.edpn.backend.trade.application.port.outgoing.stationlandingpadsizerequest.DeleteStationLandingPadSizeRequestPort;
import io.edpn.backend.trade.application.port.outgoing.stationlandingpadsizerequest.ExistsStationLandingPadSizeRequestPort;
import io.edpn.backend.trade.application.port.outgoing.stationlandingpadsizerequest.LoadAllStationLandingPadSizeRequestsPort;
import io.edpn.backend.trade.application.port.outgoing.stationplanetaryrequest.CreateStationPlanetaryRequestPort;
import io.edpn.backend.trade.application.port.outgoing.stationplanetaryrequest.CreateIfNotExistsStationPlanetaryRequestPort;
import io.edpn.backend.trade.application.port.outgoing.stationplanetaryrequest.DeleteStationPlanetaryRequestPort;
import io.edpn.backend.trade.application.port.outgoing.stationplanetaryrequest.ExistsStationPlanetaryRequestPort;
import io.edpn.backend.trade.application.port.outgoing.stationplanetaryrequest.LoadAllStationPlanetaryRequestsPort;
import io.edpn.backend.trade.application.port.outgoing.stationrequireodysseyrequest.CreateStationRequireOdysseyRequestPort;
import io.edpn.backend.trade.application.port.outgoing.stationrequireodysseyrequest.CreateIfNotExistsStationRequireOdysseyRequestPort;
import io.edpn.backend.trade.application.port.outgoing.stationrequireodysseyrequest.DeleteStationRequireOdysseyRequestPort;
import io.edpn.backend.trade.application.port.outgoing.stationrequireodysseyrequest.ExistsStationRequireOdysseyRequestPort;
import io.edpn.backend.trade.application.port.outgoing.stationrequireodysseyrequest.LoadAllStationRequireOdysseyRequestsPort;
import io.edpn.backend.trade.application.port.outgoing.system.CreateOrLoadSystemPort;
import io.edpn.backend.trade.application.port.outgoing.system.LoadSystemsByFilterPort;
import io.edpn.backend.trade.application.port.outgoing.system.UpdateSystemPort;
import io.edpn.backend.trade.application.port.outgoing.systemcoordinaterequest.CreateSystemCoordinateRequestPort;
import io.edpn.backend.trade.application.port.outgoing.systemcoordinaterequest.CreateIfNotExistsSystemCoordinateRequestPort;
import io.edpn.backend.trade.application.port.outgoing.systemcoordinaterequest.DeleteSystemCoordinateRequestPort;
import io.edpn.backend.trade.application.port.outgoing.systemcoordinaterequest.ExistsSystemCoordinateRequestPort;
import io.edpn.backend.trade.application.port.outgoing.systemcoordinaterequest.LoadAllSystemCoordinateRequestsPort;
import io.edpn.backend.trade.application.port.outgoing.systemeliteidrequest.CreateSystemEliteIdRequestPort;
import io.edpn.backend.trade.application.port.outgoing.systemeliteidrequest.CreateIfNotExistsSystemEliteIdRequestPort;
import io.edpn.backend.trade.application.port.outgoing.systemeliteidrequest.DeleteSystemEliteIdRequestPort;
import io.edpn.backend.trade.application.port.outgoing.systemeliteidrequest.ExistsSystemEliteIdRequestPort;
import io.edpn.backend.trade.application.port.outgoing.systemeliteidrequest.LoadAllSystemEliteIdRequestsPort;
Expand Down Expand Up @@ -111,7 +111,7 @@ public StationArrivalDistanceInterModuleCommunicationService stationArrivalDista
CreateOrLoadSystemPort createOrLoadSystemPort,
CreateOrLoadStationPort createOrLoadStationPort,
ExistsStationArrivalDistanceRequestPort existsStationArrivalDistanceRequestPort,
CreateStationArrivalDistanceRequestPort createStationArrivalDistanceRequestPort,
CreateIfNotExistsStationArrivalDistanceRequestPort createIfNotExistsStationArrivalDistanceRequestPort,
DeleteStationArrivalDistanceRequestPort deleteStationArrivalDistanceRequestPort,
UpdateStationPort updateStationPort,
SendKafkaMessagePort sendKafkaMessagePort,
Expand All @@ -125,7 +125,7 @@ public StationArrivalDistanceInterModuleCommunicationService stationArrivalDista
createOrLoadSystemPort,
createOrLoadStationPort,
existsStationArrivalDistanceRequestPort,
createStationArrivalDistanceRequestPort,
createIfNotExistsStationArrivalDistanceRequestPort,
deleteStationArrivalDistanceRequestPort,
updateStationPort,
sendKafkaMessagePort,
Expand All @@ -141,7 +141,7 @@ public SystemCoordinateInterModuleCommunicationService systemCoordinateInterModu
LoadAllSystemCoordinateRequestsPort loadAllSystemCoordinateRequestsPort,
CreateOrLoadSystemPort createOrLoadSystemPort,
ExistsSystemCoordinateRequestPort existsSystemCoordinateRequestPort,
CreateSystemCoordinateRequestPort createSystemCoordinateRequestPort,
CreateIfNotExistsSystemCoordinateRequestPort createIfNotExistsSystemCoordinateRequestPort,
DeleteSystemCoordinateRequestPort deleteSystemCoordinateRequestPort,
UpdateSystemPort updateSystemPort,
SendKafkaMessagePort sendKafkaMessagePort,
Expand All @@ -155,7 +155,7 @@ public SystemCoordinateInterModuleCommunicationService systemCoordinateInterModu
loadAllSystemCoordinateRequestsPort,
createOrLoadSystemPort,
existsSystemCoordinateRequestPort,
createSystemCoordinateRequestPort,
createIfNotExistsSystemCoordinateRequestPort,
deleteSystemCoordinateRequestPort,
updateSystemPort,
sendKafkaMessagePort,
Expand All @@ -173,7 +173,7 @@ public StationLandingPadSizeInterModuleCommunicationService stationLandingPadSiz
CreateOrLoadSystemPort createOrLoadSystemPort,
CreateOrLoadStationPort createOrLoadStationPort,
ExistsStationLandingPadSizeRequestPort existsStationLandingPadSizeRequestPort,
CreateStationLandingPadSizeRequestPort createStationLandingPadSizeRequestPort,
CreateIfNotExistsStationLandingPadSizeRequestPort createIfNotExistsStationLandingPadSizeRequestPort,
DeleteStationLandingPadSizeRequestPort deleteStationLandingPadSizeRequestPort,
UpdateStationPort updateStationPort,
SendKafkaMessagePort sendKafkaMessagePort,
Expand All @@ -188,7 +188,7 @@ public StationLandingPadSizeInterModuleCommunicationService stationLandingPadSiz
createOrLoadSystemPort,
createOrLoadStationPort,
existsStationLandingPadSizeRequestPort,
createStationLandingPadSizeRequestPort,
createIfNotExistsStationLandingPadSizeRequestPort,
deleteStationLandingPadSizeRequestPort,
updateStationPort,
sendKafkaMessagePort,
Expand All @@ -206,7 +206,7 @@ public StationPlanetaryInterModuleCommunicationService stationPlanetaryInterModu
CreateOrLoadSystemPort createOrLoadSystemPort,
CreateOrLoadStationPort createOrLoadStationPort,
ExistsStationPlanetaryRequestPort existsStationPlanetaryRequestPort,
CreateStationPlanetaryRequestPort createStationPlanetaryRequestPort,
CreateIfNotExistsStationPlanetaryRequestPort createIfNotExistsStationPlanetaryRequestPort,
DeleteStationPlanetaryRequestPort deleteStationPlanetaryRequestPort,
UpdateStationPort updateStationPort,
SendKafkaMessagePort sendKafkaMessagePort,
Expand All @@ -221,7 +221,7 @@ public StationPlanetaryInterModuleCommunicationService stationPlanetaryInterModu
createOrLoadSystemPort,
createOrLoadStationPort,
existsStationPlanetaryRequestPort,
createStationPlanetaryRequestPort,
createIfNotExistsStationPlanetaryRequestPort,
deleteStationPlanetaryRequestPort,
updateStationPort,
sendKafkaMessagePort,
Expand All @@ -239,7 +239,7 @@ public StationRequireOdysseyInterModuleCommunicationService stationRequireOdysse
CreateOrLoadSystemPort createOrLoadSystemPort,
CreateOrLoadStationPort createOrLoadStationPort,
ExistsStationRequireOdysseyRequestPort existsStationRequireOdysseyRequestPort,
CreateStationRequireOdysseyRequestPort createStationRequireOdysseyRequestPort,
CreateIfNotExistsStationRequireOdysseyRequestPort createIfNotExistsStationRequireOdysseyRequestPort,
DeleteStationRequireOdysseyRequestPort deleteStationRequireOdysseyRequestPort,
UpdateStationPort updateStationPort,
SendKafkaMessagePort sendKafkaMessagePort,
Expand All @@ -254,7 +254,7 @@ public StationRequireOdysseyInterModuleCommunicationService stationRequireOdysse
createOrLoadSystemPort,
createOrLoadStationPort,
existsStationRequireOdysseyRequestPort,
createStationRequireOdysseyRequestPort,
createIfNotExistsStationRequireOdysseyRequestPort,
deleteStationRequireOdysseyRequestPort,
updateStationPort,
sendKafkaMessagePort,
Expand All @@ -271,7 +271,7 @@ public SystemEliteIdInterModuleCommunicationService systemEliteIdInterModuleComm
LoadAllSystemEliteIdRequestsPort loadAllSystemEliteIdRequestsPort,
CreateOrLoadSystemPort createOrLoadSystemPort,
ExistsSystemEliteIdRequestPort existsSystemEliteIdRequestPort,
CreateSystemEliteIdRequestPort createSystemEliteIdRequestPort,
CreateIfNotExistsSystemEliteIdRequestPort createIfNotExistsSystemEliteIdRequestPort,
DeleteSystemEliteIdRequestPort deleteSystemEliteIdRequestPort,
UpdateSystemPort updateSystemPort,
SendKafkaMessagePort sendKafkaMessagePort,
Expand All @@ -285,7 +285,7 @@ public SystemEliteIdInterModuleCommunicationService systemEliteIdInterModuleComm
loadAllSystemEliteIdRequestsPort,
createOrLoadSystemPort,
existsSystemEliteIdRequestPort,
createSystemEliteIdRequestPort,
createIfNotExistsSystemEliteIdRequestPort,
deleteSystemEliteIdRequestPort,
updateSystemPort,
sendKafkaMessagePort,
Expand Down
8 changes: 4 additions & 4 deletions ...va/io/edpn/backend/trade/adapter/persistence/StationArrivalDistanceRequestRepository.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import io.edpn.backend.trade.application.domain.intermodulecommunication.StationDataRequest;
import io.edpn.backend.trade.adapter.persistence.entity.mapper.MybatisStationDataRequestEntityMapper;
import io.edpn.backend.trade.adapter.persistence.repository.MybatisStationArrivalDistanceRequestRepository;
import io.edpn.backend.trade.application.port.outgoing.stationarrivaldistancerequest.CreateStationArrivalDistanceRequestPort;
import io.edpn.backend.trade.application.port.outgoing.stationarrivaldistancerequest.CreateIfNotExistsStationArrivalDistanceRequestPort;
import io.edpn.backend.trade.application.port.outgoing.stationarrivaldistancerequest.DeleteStationArrivalDistanceRequestPort;
import io.edpn.backend.trade.application.port.outgoing.stationarrivaldistancerequest.ExistsStationArrivalDistanceRequestPort;
import io.edpn.backend.trade.application.port.outgoing.stationarrivaldistancerequest.LoadAllStationArrivalDistanceRequestsPort;
Expand All @@ -15,14 +15,14 @@

@RequiredArgsConstructor
@Slf4j
public class StationArrivalDistanceRequestRepository implements CreateStationArrivalDistanceRequestPort, ExistsStationArrivalDistanceRequestPort, DeleteStationArrivalDistanceRequestPort, LoadAllStationArrivalDistanceRequestsPort {
public class StationArrivalDistanceRequestRepository implements CreateIfNotExistsStationArrivalDistanceRequestPort, ExistsStationArrivalDistanceRequestPort, DeleteStationArrivalDistanceRequestPort, LoadAllStationArrivalDistanceRequestsPort {

private final MybatisStationArrivalDistanceRequestRepository mybatisStationArrivalDistanceRequestRepository;
private final MybatisStationDataRequestEntityMapper mybatisStationDataRequestEntityMapper;

@Override
public void create(String systemName, String stationName) {
mybatisStationArrivalDistanceRequestRepository.insert(systemName, stationName);
public void createIfNotExists(String systemName, String stationName) {
mybatisStationArrivalDistanceRequestRepository.insertIfNotExists(systemName, stationName);
}

@Override
Expand Down
8 changes: 4 additions & 4 deletions ...ava/io/edpn/backend/trade/adapter/persistence/StationLandingPadSizeRequestRepository.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import io.edpn.backend.trade.application.domain.intermodulecommunication.StationDataRequest;
import io.edpn.backend.trade.adapter.persistence.entity.mapper.MybatisStationDataRequestEntityMapper;
import io.edpn.backend.trade.adapter.persistence.repository.MybatisStationLandingPadSizeRequestRepository;
import io.edpn.backend.trade.application.port.outgoing.stationlandingpadsizerequest.CreateStationLandingPadSizeRequestPort;
import io.edpn.backend.trade.application.port.outgoing.stationlandingpadsizerequest.CreateIfNotExistsStationLandingPadSizeRequestPort;
import io.edpn.backend.trade.application.port.outgoing.stationlandingpadsizerequest.DeleteStationLandingPadSizeRequestPort;
import io.edpn.backend.trade.application.port.outgoing.stationlandingpadsizerequest.ExistsStationLandingPadSizeRequestPort;
import io.edpn.backend.trade.application.port.outgoing.stationlandingpadsizerequest.LoadAllStationLandingPadSizeRequestsPort;
Expand All @@ -15,14 +15,14 @@

@RequiredArgsConstructor
@Slf4j
public class StationLandingPadSizeRequestRepository implements CreateStationLandingPadSizeRequestPort, ExistsStationLandingPadSizeRequestPort, DeleteStationLandingPadSizeRequestPort, LoadAllStationLandingPadSizeRequestsPort {
public class StationLandingPadSizeRequestRepository implements CreateIfNotExistsStationLandingPadSizeRequestPort, ExistsStationLandingPadSizeRequestPort, DeleteStationLandingPadSizeRequestPort, LoadAllStationLandingPadSizeRequestsPort {

private final MybatisStationLandingPadSizeRequestRepository mybatisStationLandingPadSizeRequestRepository;
private final MybatisStationDataRequestEntityMapper mybatisStationDataRequestEntityMapper;

@Override
public void create(String systemName, String stationName) {
mybatisStationLandingPadSizeRequestRepository.insert(systemName, stationName);
public void createIfNotExists(String systemName, String stationName) {
mybatisStationLandingPadSizeRequestRepository.insertIfNotExists(systemName, stationName);
}

@Override
Expand Down
8 changes: 4 additions & 4 deletions ...ain/java/io/edpn/backend/trade/adapter/persistence/StationPlanetaryRequestRepository.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import io.edpn.backend.trade.application.domain.intermodulecommunication.StationDataRequest;
import io.edpn.backend.trade.adapter.persistence.entity.mapper.MybatisStationDataRequestEntityMapper;
import io.edpn.backend.trade.adapter.persistence.repository.MybatisStationPlanetaryRequestRepository;
import io.edpn.backend.trade.application.port.outgoing.stationplanetaryrequest.CreateStationPlanetaryRequestPort;
import io.edpn.backend.trade.application.port.outgoing.stationplanetaryrequest.CreateIfNotExistsStationPlanetaryRequestPort;
import io.edpn.backend.trade.application.port.outgoing.stationplanetaryrequest.DeleteStationPlanetaryRequestPort;
import io.edpn.backend.trade.application.port.outgoing.stationplanetaryrequest.ExistsStationPlanetaryRequestPort;
import io.edpn.backend.trade.application.port.outgoing.stationplanetaryrequest.LoadAllStationPlanetaryRequestsPort;
Expand All @@ -15,14 +15,14 @@

@RequiredArgsConstructor
@Slf4j
public class StationPlanetaryRequestRepository implements CreateStationPlanetaryRequestPort, ExistsStationPlanetaryRequestPort, DeleteStationPlanetaryRequestPort, LoadAllStationPlanetaryRequestsPort {
public class StationPlanetaryRequestRepository implements CreateIfNotExistsStationPlanetaryRequestPort, ExistsStationPlanetaryRequestPort, DeleteStationPlanetaryRequestPort, LoadAllStationPlanetaryRequestsPort {

private final MybatisStationPlanetaryRequestRepository mybatisStationPlanetaryRequestRepository;
private final MybatisStationDataRequestEntityMapper mybatisStationDataRequestEntityMapper;

@Override
public void create(String systemName, String stationName) {
mybatisStationPlanetaryRequestRepository.insert(systemName, stationName);
public void createIfNotExists(String systemName, String stationName) {
mybatisStationPlanetaryRequestRepository.insertIfNotExists(systemName, stationName);
}

@Override
Expand Down
8 changes: 4 additions & 4 deletions ...ava/io/edpn/backend/trade/adapter/persistence/StationRequireOdysseyRequestRepository.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import io.edpn.backend.trade.application.domain.intermodulecommunication.StationDataRequest;
import io.edpn.backend.trade.adapter.persistence.entity.mapper.MybatisStationDataRequestEntityMapper;
import io.edpn.backend.trade.adapter.persistence.repository.MybatisStationRequireOdysseyRequestRepository;
import io.edpn.backend.trade.application.port.outgoing.stationrequireodysseyrequest.CreateStationRequireOdysseyRequestPort;
import io.edpn.backend.trade.application.port.outgoing.stationrequireodysseyrequest.CreateIfNotExistsStationRequireOdysseyRequestPort;
import io.edpn.backend.trade.application.port.outgoing.stationrequireodysseyrequest.DeleteStationRequireOdysseyRequestPort;
import io.edpn.backend.trade.application.port.outgoing.stationrequireodysseyrequest.ExistsStationRequireOdysseyRequestPort;
import io.edpn.backend.trade.application.port.outgoing.stationrequireodysseyrequest.LoadAllStationRequireOdysseyRequestsPort;
Expand All @@ -15,14 +15,14 @@

@RequiredArgsConstructor
@Slf4j
public class StationRequireOdysseyRequestRepository implements CreateStationRequireOdysseyRequestPort, ExistsStationRequireOdysseyRequestPort, DeleteStationRequireOdysseyRequestPort, LoadAllStationRequireOdysseyRequestsPort {
public class StationRequireOdysseyRequestRepository implements CreateIfNotExistsStationRequireOdysseyRequestPort, ExistsStationRequireOdysseyRequestPort, DeleteStationRequireOdysseyRequestPort, LoadAllStationRequireOdysseyRequestsPort {

private final MybatisStationRequireOdysseyRequestRepository mybatisStationRequireOdysseyRequestRepository;
private final MybatisStationDataRequestEntityMapper mybatisStationDataRequestEntityMapper;

@Override
public void create(String systemName, String stationName) {
mybatisStationRequireOdysseyRequestRepository.insert(systemName, stationName);
public void createIfNotExists(String systemName, String stationName) {
mybatisStationRequireOdysseyRequestRepository.insertIfNotExists(systemName, stationName);
}

@Override
Expand Down
Loading

0 comments on commit 2870c52

Please sign in to comment.