From 1fbc7215998121d91c7ec0b016b055a5b7e090e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=8C=E1=85=A1=E1=86=BC=E1=84=89=E1=85=A5=E1=86=AB?= =?UTF-8?q?=E1=84=8B=E1=85=A2?= Date: Fri, 8 Sep 2023 14:24:46 +0900 Subject: [PATCH] =?UTF-8?q?Tube=20=EC=A0=84=EC=95=95,=20=EC=A0=84=EB=A5=98?= =?UTF-8?q?=20offset=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controlcentermanagement/domain/Tube.java | 22 ++++++++++++------- .../nosql/SlotNoSQLRepository.java | 2 +- .../infrastructure/nosql/TubeDocument.java | 21 ++++++++++++------ .../nosql/SlotNoSQLRepositoryTest.java | 2 +- 4 files changed, 30 insertions(+), 17 deletions(-) diff --git a/src/main/java/inc/sdt/controlcentermanagement/domain/Tube.java b/src/main/java/inc/sdt/controlcentermanagement/domain/Tube.java index af11073..7edf063 100644 --- a/src/main/java/inc/sdt/controlcentermanagement/domain/Tube.java +++ b/src/main/java/inc/sdt/controlcentermanagement/domain/Tube.java @@ -5,29 +5,35 @@ package inc.sdt.controlcentermanagement.domain; */ public class Tube { private String code; - private String offset; - + private Float voltageOffset; + private Float ampereOffset; protected Tube() { } - public Tube(String code, String offset) { + public Tube(String code, Float voltageOffset, Float ampereOffset) { this.code = code; - this.offset = offset; + this.voltageOffset = voltageOffset; + this.ampereOffset = ampereOffset; } public String getCode() { return code; } - public String getOffset() { - return offset; + public Float getVoltageOffset() { + return voltageOffset; + } + + public Float getAmpereOffset() { + return ampereOffset; } @Override public String toString() { return "Tube{" + - "number='" + code + '\'' + - ", offset=" + offset + + "code='" + code + '\'' + + ", voltageOffset=" + voltageOffset + + ", ampereOffset=" + ampereOffset + '}'; } } diff --git a/src/main/java/inc/sdt/controlcentermanagement/infrastructure/nosql/SlotNoSQLRepository.java b/src/main/java/inc/sdt/controlcentermanagement/infrastructure/nosql/SlotNoSQLRepository.java index 31ee454..5bb78d2 100644 --- a/src/main/java/inc/sdt/controlcentermanagement/infrastructure/nosql/SlotNoSQLRepository.java +++ b/src/main/java/inc/sdt/controlcentermanagement/infrastructure/nosql/SlotNoSQLRepository.java @@ -40,7 +40,7 @@ public class SlotNoSQLRepository implements SlotRepositoryDelegate { .chamberNumber(slotDocument.getChamberNumber()) .tube(slotDocument.getTube() .stream() - .map(tubeDocument -> new Tube(tubeDocument.getCode(), tubeDocument.getOffset())) + .map(tubeDocument -> new Tube(tubeDocument.getCode(), tubeDocument.getVoltageOffset(), tubeDocument.getAmpereOffset())) .toList()) .build(); } diff --git a/src/main/java/inc/sdt/controlcentermanagement/infrastructure/nosql/TubeDocument.java b/src/main/java/inc/sdt/controlcentermanagement/infrastructure/nosql/TubeDocument.java index c66e69a..6083313 100644 --- a/src/main/java/inc/sdt/controlcentermanagement/infrastructure/nosql/TubeDocument.java +++ b/src/main/java/inc/sdt/controlcentermanagement/infrastructure/nosql/TubeDocument.java @@ -5,26 +5,33 @@ package inc.sdt.controlcentermanagement.infrastructure.nosql; */ public class TubeDocument { private String code; - private String offset; + private Float voltageOffset; + private Float ampereOffset; - public TubeDocument(String code, String offset) { + public TubeDocument(String code, Float voltageOffset, Float ampereOffset) { this.code = code; - this.offset = offset; + this.voltageOffset = voltageOffset; + this.ampereOffset = ampereOffset; } public String getCode() { return code; } - public String getOffset() { - return offset; + public Float getVoltageOffset() { + return voltageOffset; + } + + public Float getAmpereOffset() { + return ampereOffset; } @Override public String toString() { return "TubeDocument{" + - "id='" + code + '\'' + - ", offset=" + offset + + "code='" + code + '\'' + + ", voltageOffset=" + voltageOffset + + ", ampereOffset=" + ampereOffset + '}'; } } diff --git a/src/test/java/inc/sdt/controlcentermanagement/infrastructure/nosql/SlotNoSQLRepositoryTest.java b/src/test/java/inc/sdt/controlcentermanagement/infrastructure/nosql/SlotNoSQLRepositoryTest.java index db31b60..e46ad70 100644 --- a/src/test/java/inc/sdt/controlcentermanagement/infrastructure/nosql/SlotNoSQLRepositoryTest.java +++ b/src/test/java/inc/sdt/controlcentermanagement/infrastructure/nosql/SlotNoSQLRepositoryTest.java @@ -29,7 +29,7 @@ class SlotNoSQLRepositoryTest { private Slot to(SlotDocument slotDocument) { List tube = slotDocument.getTube().stream() - .map(tubeDocument -> new Tube(tubeDocument.getCode(), tubeDocument.getOffset())).toList(); + .map(tubeDocument -> new Tube(tubeDocument.getCode(), tubeDocument.getVoltageOffset(), tubeDocument.getAmpereOffset())).toList(); return Slot.builder() .id(slotDocument.getId()) .slotNumber(slotDocument.getSlotNumber())