-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: add calibration table binding to vessel
- Loading branch information
Showing
32 changed files
with
393 additions
and
156 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
78 changes: 0 additions & 78 deletions
78
src/main/java/com/ship4all/service/crude/cargo/CargoService.java
This file was deleted.
Oops, something went wrong.
31 changes: 31 additions & 0 deletions
31
src/main/java/com/ship4all/service/crude/config/DatasourceConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
package com.ship4all.service.crude.config; | ||
|
||
import com.zaxxer.hikari.HikariConfig; | ||
import com.zaxxer.hikari.HikariDataSource; | ||
import javax.sql.DataSource; | ||
import lombok.extern.slf4j.Slf4j; | ||
import org.springframework.context.annotation.Bean; | ||
import org.springframework.context.annotation.Configuration; | ||
import org.springframework.context.annotation.Primary; | ||
import org.springframework.stereotype.Component; | ||
|
||
@Configuration | ||
@Slf4j | ||
@Component | ||
public class DatasourceConfig { | ||
|
||
private String dataSourceUrl = "jdbc:postgresql://localhost:6541/CalibrationTable"; | ||
private String dataSourceUsername = "root"; | ||
private String dataSourcePassword = "root"; | ||
|
||
@Bean | ||
@Primary | ||
public DataSource getDataSource() { | ||
final HikariConfig hikariConfig = new HikariConfig(); | ||
hikariConfig.setMaximumPoolSize(2); | ||
hikariConfig.setJdbcUrl(dataSourceUrl); | ||
hikariConfig.setUsername(dataSourceUsername); | ||
hikariConfig.setPassword(dataSourcePassword); | ||
return new HikariDataSource(hikariConfig); | ||
} | ||
} |
10 changes: 10 additions & 0 deletions
10
src/main/java/com/ship4all/service/crude/enums/Constants.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
package com.ship4all.service.crude.enums; | ||
|
||
public final class Constants { | ||
|
||
/** Entities*/ | ||
public static final String VESSEL_ENTITY_NAME = "VESSEL"; | ||
|
||
/** */ | ||
public static final String FILE_EXTENSION_CSV = ".csv"; | ||
} |
12 changes: 12 additions & 0 deletions
12
...va/com/ship4all/service/crude/exception/CalibrationTableAlreadyBindToVesselException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
package com.ship4all.service.crude.exception; | ||
|
||
import java.util.UUID; | ||
|
||
public class CalibrationTableAlreadyBindToVesselException extends RuntimeException{ | ||
|
||
private final static String EXCEPTION_MESSAGE = "Vessel - %s already has calibration table"; | ||
|
||
public CalibrationTableAlreadyBindToVesselException(UUID vesselId) { | ||
super(String.format(EXCEPTION_MESSAGE, vesselId)); | ||
} | ||
} |
10 changes: 10 additions & 0 deletions
10
src/main/java/com/ship4all/service/crude/exception/ModelNotFoundException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
package com.ship4all.service.crude.exception; | ||
|
||
public class ModelNotFoundException extends RuntimeException { | ||
|
||
private static final String EXCEPTION_MESSAGE = "Entity - %s not found"; | ||
|
||
public ModelNotFoundException(String entityName) { | ||
super(String.format(EXCEPTION_MESSAGE, entityName)); | ||
} | ||
} |
2 changes: 1 addition & 1 deletion
2
...ervice/crude/exception/ErrorResponse.java → ...rude/exception/handler/ErrorResponse.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...rvice/crude/exception/UtilsException.java → ...ude/exception/handler/UtilsException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
src/main/java/com/ship4all/service/crude/model/CalibrationTable.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
package com.ship4all.service.crude.model; | ||
|
||
import jakarta.persistence.Entity; | ||
import jakarta.persistence.Id; | ||
import jakarta.persistence.Table; | ||
|
||
@Entity | ||
@Table(name = "calibrationTable") | ||
public class CalibrationTable { | ||
|
||
@Id | ||
Integer id; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/main/java/com/ship4all/service/crude/model/UllageReport.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 17 additions & 0 deletions
17
src/main/java/com/ship4all/service/crude/model/Vessel.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
package com.ship4all.service.crude.model; | ||
|
||
import jakarta.persistence.Entity; | ||
import jakarta.persistence.Id; | ||
import java.util.UUID; | ||
import lombok.Getter; | ||
import lombok.Setter; | ||
|
||
@Entity | ||
@Getter | ||
@Setter | ||
public class Vessel { | ||
|
||
@Id | ||
private UUID id; | ||
private String name; | ||
} |
2 changes: 1 addition & 1 deletion
2
...all/service/crude/cargo/dto/CargoDto.java → ...all/service/crude/model/dto/CargoDto.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
src/main/java/com/ship4all/service/crude/repository/CalibrationTableRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
package com.ship4all.service.crude.repository; | ||
|
||
import com.ship4all.service.crude.model.CalibrationTable; | ||
import java.util.UUID; | ||
import org.springframework.data.jpa.repository.JpaRepository; | ||
import org.springframework.data.jpa.repository.Modifying; | ||
import org.springframework.data.jpa.repository.Query; | ||
import org.springframework.data.repository.query.Param; | ||
|
||
public interface CalibrationTableRepository extends JpaRepository<CalibrationTable, Integer> { | ||
|
||
@Modifying | ||
@Query(value = "INSERT INTO calibration_table (tank, ullage, cub1f, cub, cub1a, cub2a, cub3a, cub4a, vessel_id) " | ||
+ "VALUES (:tank, :ullage, :cub1f, :cub, :cub1a, :cub2a, :cub3a, :cub4a, :vesselId)", nativeQuery = true) | ||
void add(@Param("tank") String tank, @Param("ullage") double ullage, @Param("cub1f") double cub1f, @Param("cub") double cub, | ||
@Param("cub1a") double cub1a, @Param("cub2a") double cub2a, @Param("cub3a") double cub3a, @Param("cub4a") double cub4a, | ||
@Param("vesselId") UUID vessel_id); | ||
|
||
@Query(value = "SELECT EXISTS(SELECT id from calibration_table where vessel_id = :vesselId)", nativeQuery = true) | ||
Boolean vesselHasCalibrationTable(@Param("vesselId") UUID vesselId); | ||
|
||
} |
3 changes: 2 additions & 1 deletion
3
.../service/crude/cargo/CargoRepository.java → ...ice/crude/repository/CargoRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 9 additions & 0 deletions
9
src/main/java/com/ship4all/service/crude/repository/VesselRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
package com.ship4all.service.crude.repository; | ||
|
||
import com.ship4all.service.crude.model.Vessel; | ||
import java.util.UUID; | ||
import org.springframework.data.jpa.repository.JpaRepository; | ||
|
||
public interface VesselRepository extends JpaRepository<Vessel, UUID> { | ||
|
||
} |
Oops, something went wrong.