From 8f906b5fb4f53c425b3c4389f8e460e31bf51336 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:12:06 +0900 Subject: [PATCH 1/2] =?UTF-8?q?deployRequest=20=EB=94=94=EB=B0=94=EC=9D=B4?= =?UTF-8?q?=EC=8A=A4=20=ED=83=80=EC=9E=85=20=EC=82=AD=EC=A0=9C,=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=EB=AA=85=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/DefaultTubeService.java | 4 +-- .../domain/DeployRequest.java | 32 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/main/java/inc/sdt/controlcentermanagement/application/DefaultTubeService.java b/src/main/java/inc/sdt/controlcentermanagement/application/DefaultTubeService.java index ada3040..6c2bd8e 100644 --- a/src/main/java/inc/sdt/controlcentermanagement/application/DefaultTubeService.java +++ b/src/main/java/inc/sdt/controlcentermanagement/application/DefaultTubeService.java @@ -50,9 +50,9 @@ class DefaultTubeService implements TubeService { DeployRequest deployRequest = DeployRequest.builder() .assetCode(request.getAssetCode()) - .deviceType("nodeq") .appName(request.getSlotNumber()) .commandType(CommandType.JSON) + .name("") // TODO .parameters(tubeMap) .build(); @@ -83,9 +83,9 @@ class DefaultTubeService implements TubeService { resultMap.forEach((assetCode, slot) -> slot.forEach((slotNumber, tube) -> { DeployRequest deployRequest = DeployRequest.builder() .assetCode(assetCode) - .deviceType("nodeq") .appName(slotNumber) .commandType(CommandType.JSON) + .name("") // TODO .parameters(tube) .build(); diff --git a/src/main/java/inc/sdt/controlcentermanagement/domain/DeployRequest.java b/src/main/java/inc/sdt/controlcentermanagement/domain/DeployRequest.java index 8ef98d4..89d80fb 100644 --- a/src/main/java/inc/sdt/controlcentermanagement/domain/DeployRequest.java +++ b/src/main/java/inc/sdt/controlcentermanagement/domain/DeployRequest.java @@ -7,17 +7,16 @@ import java.util.Map; */ public class DeployRequest { private String assetCode; - private String deviceType; private String appName; private String commandType; -// private String fileName; // TODO: deployer에 추가되면 추가 + private String name; private Map parameters; - public DeployRequest(String assetCode, String deviceType, String appName, String commandType, Map parameters) { + public DeployRequest(String assetCode, String appName, String commandType, String name, Map parameters) { this.assetCode = assetCode; - this.deviceType = deviceType; this.appName = appName; this.commandType = commandType; + this.name = name; this.parameters = parameters; } @@ -29,9 +28,6 @@ public class DeployRequest { return assetCode; } - public String getDeviceType() { - return deviceType; - } public String getAppName() { return appName; @@ -41,6 +37,10 @@ public class DeployRequest { return commandType; } + public String getName() { + return name; + } + public Map getParameters() { return parameters; } @@ -49,18 +49,18 @@ public class DeployRequest { public String toString() { return "DeployRequest{" + "assetCode='" + assetCode + '\'' + - ", deviceType='" + deviceType + '\'' + ", appName='" + appName + '\'' + - ", commandType=" + commandType + + ", commandType='" + commandType + '\'' + + ", name='" + name + '\'' + ", parameters=" + parameters + '}'; } public static final class Builder { private String assetCode; - private String deviceType; private String appName; private String commandType; + private String name; private Map parameters; private Builder() { @@ -71,11 +71,6 @@ public class DeployRequest { return this; } - public Builder deviceType(String deviceType) { - this.deviceType = deviceType; - return this; - } - public Builder appName(String appName) { this.appName = appName; return this; @@ -86,13 +81,18 @@ public class DeployRequest { return this; } + public Builder name(String name) { + this.name = name; + return this; + } + public Builder parameters(Map parameters) { this.parameters = parameters; return this; } public DeployRequest build() { - return new DeployRequest(assetCode, deviceType, appName, commandType, parameters); + return new DeployRequest(assetCode, appName, commandType, name, parameters); } } } 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 2/2] =?UTF-8?q?Tube=20=EC=A0=84=EC=95=95,=20=EC=A0=84?= =?UTF-8?q?=EB=A5=98=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())