Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

51 Trade-Loop-Finder #179

Merged
merged 6 commits into from
May 5, 2024
Merged

51 Trade-Loop-Finder #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
20884c2
fix type in Single hop name
Daniel-J-Mason May 4, 2024
9afe776
migrate supply demand mapping for cargo capacity to the web mapper as…
Daniel-J-Mason May 4, 2024
11b935d
add LoopTrade which utilizes a single direction best trade in area an…
Daniel-J-Mason May 4, 2024
30e4327
modify for legibility and correct case match
Daniel-J-Mason May 5, 2024
c30f938
Add tests for LoopTrade
Daniel-J-Mason May 5, 2024
f9d5a71
add annotation to explain filter implementation details
Daniel-J-Mason May 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions boot/src/main/java/io/edpn/backend/application/controller/BootTradeModuleController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@
import io.edpn.backend.trade.adapter.web.TradeModuleController;
import io.edpn.backend.trade.adapter.web.dto.filter.mapper.RestFindCommodityFilterDtoMapper;
import io.edpn.backend.trade.adapter.web.dto.filter.mapper.RestLocateCommodityFilterDtoMapper;
import io.edpn.backend.trade.adapter.web.dto.filter.mapper.RestLocateLoopRouteFilterDtoMapper;
import io.edpn.backend.trade.adapter.web.dto.filter.mapper.RestLocateSingleHopRouteFilterDtoMapper;
import io.edpn.backend.trade.adapter.web.dto.object.mapper.RestCommodityMarketInfoDtoMapper;
import io.edpn.backend.trade.adapter.web.dto.object.mapper.RestLocateCommodityDtoMapper;
import io.edpn.backend.trade.adapter.web.dto.object.mapper.RestLoopRouteDtoMapper;
import io.edpn.backend.trade.adapter.web.dto.object.mapper.RestSingleHopRouteDtoMapper;
import io.edpn.backend.trade.adapter.web.dto.object.mapper.RestValidatedCommodityDtoMapper;
import io.edpn.backend.trade.application.port.incomming.commoditymarketinfo.GetFullCommodityMarketInfoUseCase;
import io.edpn.backend.trade.application.port.incomming.locatecommodity.LocateCommodityUseCase;
import io.edpn.backend.trade.application.port.incomming.locatetraderoute.LocateLoopTradeRouteUseCase;
import io.edpn.backend.trade.application.port.incomming.locatetraderoute.LocateSingleHopTradeRouteUseCase;
import io.edpn.backend.trade.application.port.incomming.validatedcommodity.FindAllValidatedCommodityUseCase;
import io.edpn.backend.trade.application.port.incomming.validatedcommodity.FindValidatedCommodityByFilterUseCase;
Expand All @@ -25,15 +28,18 @@ public BootTradeModuleController(FindAllValidatedCommodityUseCase findAllValidat
LocateCommodityUseCase locateCommodityUseCase,
GetFullCommodityMarketInfoUseCase getFullCommodityMarketInfoUseCase,
LocateSingleHopTradeRouteUseCase locateSingleHopTradeRouteUseCase,
LocateLoopTradeRouteUseCase locateLoopTradeRouteUseCase,

RestValidatedCommodityDtoMapper restValidatedCommodityDtoMapper,
RestLocateCommodityDtoMapper restLocateCommodityDtoMapper,
RestCommodityMarketInfoDtoMapper restCommodityMarketInfoDtoMapper,
RestSingleHopRouteDtoMapper restSingleHopRouteDtoMapper,
RestLoopRouteDtoMapper restLoopRouteDtoMapper,

RestFindCommodityFilterDtoMapper restFindCommodityFilterDtoMapper,
RestLocateCommodityFilterDtoMapper restLocateCommodityFilterDtoMapper,
RestLocateSingleHopRouteFilterDtoMapper restLocateSingleHopRouteFilterDtoMapper
RestLocateSingleHopRouteFilterDtoMapper restLocateSingleHopRouteFilterDtoMapper,
RestLocateLoopRouteFilterDtoMapper restLocateLoopRouteFilterDtoMapper
) {
super(
findAllValidatedCommodityUseCase,
Expand All @@ -42,13 +48,16 @@ public BootTradeModuleController(FindAllValidatedCommodityUseCase findAllValidat
locateCommodityUseCase,
getFullCommodityMarketInfoUseCase,
locateSingleHopTradeRouteUseCase,
locateLoopTradeRouteUseCase,
restValidatedCommodityDtoMapper,
restLocateCommodityDtoMapper,
restCommodityMarketInfoDtoMapper,
restSingleHopRouteDtoMapper,
restLoopRouteDtoMapper,
restFindCommodityFilterDtoMapper,
restLocateCommodityFilterDtoMapper,
restLocateSingleHopRouteFilterDtoMapper
restLocateSingleHopRouteFilterDtoMapper,
restLocateLoopRouteFilterDtoMapper
);
}
}
10 changes: 9 additions & 1 deletion trade-module/src/main/java/io/edpn/backend/trade/adapter/config/MyBatisConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import io.edpn.backend.trade.adapter.persistence.repository.MybatisCommodityRepository;
import io.edpn.backend.trade.adapter.persistence.repository.MybatisLatestMarketDatumRepository;
import io.edpn.backend.trade.adapter.persistence.repository.MybatisLocateCommodityRepository;
import io.edpn.backend.trade.adapter.persistence.repository.MybatisLocateLoopTradeRouteRepository;
import io.edpn.backend.trade.adapter.persistence.repository.MybatisLocateSingleHopTradeRouteRepository;
import io.edpn.backend.trade.adapter.persistence.repository.MybatisMarketDatumRepository;
import io.edpn.backend.trade.adapter.persistence.repository.MybatisMessageRepository;
Expand Down Expand Up @@ -61,13 +62,20 @@ public MapperFactoryBean<MybatisLocateCommodityRepository> mybatisLocateCommodit
return factoryBean;
}

@Bean(name = "tradeMybatisLocateTradeRouteRepository")
@Bean(name = "tradeMybatisLocateSingleHopTradeRouteRepository")
public MapperFactoryBean<MybatisLocateSingleHopTradeRouteRepository> mybatisLocateSingleHopTradeRouteRepository(@Qualifier("tradeSqlSessionFactory") SqlSessionFactory sqlSessionFactory) {
MapperFactoryBean<MybatisLocateSingleHopTradeRouteRepository> factoryBean = new MapperFactoryBean<>(MybatisLocateSingleHopTradeRouteRepository.class);
factoryBean.setSqlSessionFactory(sqlSessionFactory);
return factoryBean;
}

@Bean(name = "tradeMybatisLocateLoopTradeRouteRepository")
public MapperFactoryBean<MybatisLocateLoopTradeRouteRepository> mybatisLocateLoopTradeRouteRepository(@Qualifier("tradeSqlSessionFactory") SqlSessionFactory sqlSessionFactory){
MapperFactoryBean<MybatisLocateLoopTradeRouteRepository> factoryBean = new MapperFactoryBean<>(MybatisLocateLoopTradeRouteRepository.class);
factoryBean.setSqlSessionFactory(sqlSessionFactory);
return factoryBean;
}

@Bean(name = "tradeMybatisLatestMarketDatumRepository")
public MapperFactoryBean<MybatisLatestMarketDatumRepository> mybatisLatestMarketDatumRepository(@Qualifier("tradeSqlSessionFactory") SqlSessionFactory sqlSessionFactory) {
MapperFactoryBean<MybatisLatestMarketDatumRepository> factoryBean = new MapperFactoryBean<>(MybatisLatestMarketDatumRepository.class);
Expand Down
13 changes: 13 additions & 0 deletions ...-module/src/main/java/io/edpn/backend/trade/adapter/config/MybatisEntityMapperConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import io.edpn.backend.trade.adapter.persistence.entity.mapper.MybatisCommodityEntityMapper;
import io.edpn.backend.trade.adapter.persistence.entity.mapper.MybatisCommodityMarketInfoEntityMapper;
import io.edpn.backend.trade.adapter.persistence.entity.mapper.MybatisLocateCommodityEntityMapper;
import io.edpn.backend.trade.adapter.persistence.entity.mapper.MybatisLoopTradeEntityMapper;
import io.edpn.backend.trade.adapter.persistence.entity.mapper.MybatisMarketDatumEntityMapper;
import io.edpn.backend.trade.adapter.persistence.entity.mapper.MybatisSingleHopEntityMapper;
import io.edpn.backend.trade.adapter.persistence.entity.mapper.MybatisStationDataRequestEntityMapper;
Expand All @@ -14,6 +15,7 @@
import io.edpn.backend.trade.adapter.persistence.filter.mapper.MybatisFindStationFilterMapper;
import io.edpn.backend.trade.adapter.persistence.filter.mapper.MybatisFindSystemFilterMapper;
import io.edpn.backend.trade.adapter.persistence.filter.mapper.MybatisLocateCommodityFilterMapper;
import io.edpn.backend.trade.adapter.persistence.filter.mapper.MybatisLocateLoopTradeFilterMapper;
import io.edpn.backend.trade.adapter.persistence.filter.mapper.MybatisLocateSingleHopTradeFilterMapper;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
Expand Down Expand Up @@ -76,12 +78,23 @@ public MybatisLocateSingleHopTradeFilterMapper locateSingleHopTradeFilterMapper(
return new MybatisLocateSingleHopTradeFilterMapper();
}

@Bean(name = "tradeLocateLoopTradeFilterMapper")
public MybatisLocateLoopTradeFilterMapper locateLoopTradeFilterMapper() {
return new MybatisLocateLoopTradeFilterMapper();
}

@Bean(name = "tradeSingleHopTradeEntityMapper")
public MybatisSingleHopEntityMapper singleHopEntityMapper(
MybatisValidatedCommodityEntityMapper mybatisValidatedCommodityEntityMapper,
MybatisStationEntityMapper mybatisStationEntityMapper){
return new MybatisSingleHopEntityMapper(mybatisValidatedCommodityEntityMapper, mybatisStationEntityMapper);
}

@Bean(name = "tradeLoopTradeEntityMapper")
public MybatisLoopTradeEntityMapper loopTradeEntityMapper(
MybatisSingleHopEntityMapper mybatisSingleHopEntityMapper) {
return new MybatisLoopTradeEntityMapper(mybatisSingleHopEntityMapper);
}

@Bean(name = "tradeCommodityMarketInfoEntityMapper")
public MybatisCommodityMarketInfoEntityMapper commodityMarketInfoEntityMapper(
Expand Down
15 changes: 13 additions & 2 deletions trade-module/src/main/java/io/edpn/backend/trade/adapter/config/RepositoryConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import io.edpn.backend.trade.adapter.persistence.entity.mapper.MybatisCommodityEntityMapper;
import io.edpn.backend.trade.adapter.persistence.entity.mapper.MybatisCommodityMarketInfoEntityMapper;
import io.edpn.backend.trade.adapter.persistence.entity.mapper.MybatisLocateCommodityEntityMapper;
import io.edpn.backend.trade.adapter.persistence.entity.mapper.MybatisLoopTradeEntityMapper;
import io.edpn.backend.trade.adapter.persistence.entity.mapper.MybatisMarketDatumEntityMapper;
import io.edpn.backend.trade.adapter.persistence.entity.mapper.MybatisSingleHopEntityMapper;
import io.edpn.backend.trade.adapter.persistence.entity.mapper.MybatisStationDataRequestEntityMapper;
Expand All @@ -29,11 +30,13 @@
import io.edpn.backend.trade.adapter.persistence.filter.mapper.MybatisFindStationFilterMapper;
import io.edpn.backend.trade.adapter.persistence.filter.mapper.MybatisFindSystemFilterMapper;
import io.edpn.backend.trade.adapter.persistence.filter.mapper.MybatisLocateCommodityFilterMapper;
import io.edpn.backend.trade.adapter.persistence.filter.mapper.MybatisLocateLoopTradeFilterMapper;
import io.edpn.backend.trade.adapter.persistence.filter.mapper.MybatisLocateSingleHopTradeFilterMapper;
import io.edpn.backend.trade.adapter.persistence.repository.MybatisCommodityMarketInfoRepository;
import io.edpn.backend.trade.adapter.persistence.repository.MybatisCommodityRepository;
import io.edpn.backend.trade.adapter.persistence.repository.MybatisLatestMarketDatumRepository;
import io.edpn.backend.trade.adapter.persistence.repository.MybatisLocateCommodityRepository;
import io.edpn.backend.trade.adapter.persistence.repository.MybatisLocateLoopTradeRouteRepository;
import io.edpn.backend.trade.adapter.persistence.repository.MybatisLocateSingleHopTradeRouteRepository;
import io.edpn.backend.trade.adapter.persistence.repository.MybatisMarketDatumRepository;
import io.edpn.backend.trade.adapter.persistence.repository.MybatisStationArrivalDistanceRequestRepository;
Expand Down Expand Up @@ -77,8 +80,16 @@ public LocateCommodityRepository locateCommodityRepository(
public LocateTradeRouteRepository locateTradeRouteRepository(
MybatisLocateSingleHopTradeRouteRepository mybatisLocateSingleHopTradeRouteRepository,
MybatisLocateSingleHopTradeFilterMapper mybatisLocateSingleHopTradeFilterMapper,
MybatisSingleHopEntityMapper mybatisSingleHopEntityMapper) {
return new LocateTradeRouteRepository(mybatisLocateSingleHopTradeRouteRepository, mybatisLocateSingleHopTradeFilterMapper, mybatisSingleHopEntityMapper);
MybatisSingleHopEntityMapper mybatisSingleHopEntityMapper,
MybatisLocateLoopTradeRouteRepository mybatisLocateLoopTradeRouteRepository,
MybatisLocateLoopTradeFilterMapper mybatisLocateLoopTradeFilterMapper,
MybatisLoopTradeEntityMapper mybatisLoopTradeEntityMapper) {
return new LocateTradeRouteRepository(mybatisLocateSingleHopTradeRouteRepository,
mybatisLocateSingleHopTradeFilterMapper,
mybatisSingleHopEntityMapper,
mybatisLocateLoopTradeRouteRepository,
mybatisLocateLoopTradeFilterMapper,
mybatisLoopTradeEntityMapper);
}

@Bean(name = "tradeMarketDatumRepository")
Expand Down
8 changes: 5 additions & 3 deletions trade-module/src/main/java/io/edpn/backend/trade/adapter/config/ServiceConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
import io.edpn.backend.trade.application.port.outgoing.commoditymarketinfo.GetFullCommodityMarketInfoPort;
import io.edpn.backend.trade.application.port.outgoing.kafka.SendKafkaMessagePort;
import io.edpn.backend.trade.application.port.outgoing.locatecommodity.LocateCommodityByFilterPort;
import io.edpn.backend.trade.application.port.outgoing.locatetraderoute.LocateSingleHopeTradeByFilterPort;
import io.edpn.backend.trade.application.port.outgoing.locatetraderoute.LocateLoopTradeByFilterPort;
import io.edpn.backend.trade.application.port.outgoing.locatetraderoute.LocateSingleHopTradeByFilterPort;
import io.edpn.backend.trade.application.port.outgoing.marketdatum.CreateWhenNotExistsMarketDatumPort;
import io.edpn.backend.trade.application.port.outgoing.marketdatum.createOrUpdateExistingWhenNewerLatestMarketDatumPort;
import io.edpn.backend.trade.application.port.outgoing.station.CreateOrLoadStationPort;
Expand Down Expand Up @@ -89,8 +90,9 @@ public LocateCommodityService locateCommodityService(

@Bean(name = "tradeLocateTradeRouteService")
public LocateTradeRouteService locateTradeRouteService(
LocateSingleHopeTradeByFilterPort locateSingleHopeTradeByFilterPort) {
return new LocateTradeRouteService(locateSingleHopeTradeByFilterPort);
LocateSingleHopTradeByFilterPort locateSingleHopTradeByFilterPort,
LocateLoopTradeByFilterPort locateLoopTradeByFilterPort) {
return new LocateTradeRouteService(locateSingleHopTradeByFilterPort, locateLoopTradeByFilterPort);
}

@Bean(name = "tradeReceiveCommodityMessageUsecase")
Expand Down
14 changes: 14 additions & 0 deletions trade-module/src/main/java/io/edpn/backend/trade/adapter/config/WebDtoMapperConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@

import io.edpn.backend.trade.adapter.web.dto.filter.mapper.RestFindCommodityFilterDtoMapper;
import io.edpn.backend.trade.adapter.web.dto.filter.mapper.RestLocateCommodityFilterDtoMapper;
import io.edpn.backend.trade.adapter.web.dto.filter.mapper.RestLocateLoopRouteFilterDtoMapper;
import io.edpn.backend.trade.adapter.web.dto.filter.mapper.RestLocateSingleHopRouteFilterDtoMapper;
import io.edpn.backend.trade.adapter.web.dto.object.mapper.RestCommodityMarketInfoDtoMapper;
import io.edpn.backend.trade.adapter.web.dto.object.mapper.RestLocateCommodityDtoMapper;
import io.edpn.backend.trade.adapter.web.dto.object.mapper.RestLoopRouteDtoMapper;
import io.edpn.backend.trade.adapter.web.dto.object.mapper.RestSingleHopRouteDtoMapper;
import io.edpn.backend.trade.adapter.web.dto.object.mapper.RestStationDtoMapper;
import io.edpn.backend.trade.adapter.web.dto.object.mapper.RestSystemDtoMapper;
Expand Down Expand Up @@ -43,6 +45,13 @@ public RestSingleHopRouteDtoMapper singleHopRouteDtoMapper(
) {
return new RestSingleHopRouteDtoMapper(restValidatedCommodityDtoMapper, restStationDtoMapper);
}

@Bean(name = "tradeLoopRouteMapper")
public RestLoopRouteDtoMapper loopRouteDtoMapper(
RestSingleHopRouteDtoMapper restSingleHopRouteDtoMapper
) {
return new RestLoopRouteDtoMapper(restSingleHopRouteDtoMapper);
}

@Bean(name = "tradeLocateCommodityDtoMapper")
public RestLocateCommodityDtoMapper locateCommodityDtoMapper(
Expand All @@ -67,4 +76,9 @@ public RestLocateCommodityFilterDtoMapper locateCommodityFilterDtoMapper() {
public RestLocateSingleHopRouteFilterDtoMapper locateSingleHopRouteFilterDtoMapper(){
return new RestLocateSingleHopRouteFilterDtoMapper();
}

@Bean(name = "tradeLocateLoopRouteFilterMapper")
public RestLocateLoopRouteFilterDtoMapper locateLoopRouteFilterDtoMapper(){
return new RestLocateLoopRouteFilterDtoMapper();
}
}
Loading
Loading