README.md

@@ -1,104 +1,29 @@
-# AXR X-Ray Tube 제어/조회 서비스 #
+# README #
 
-## 기능 ##
+This README would normally document whatever steps are necessary to get your application up and running.
-* Tube on/off 제어
-* Tube 전류, 전압 offset 설정
-* 전체 챔버 통계 조회
-* 챔버 개별 튜브별 통계 조회
 
-## 기술 ##
+### What is this repository for? ###
-* Spring Boot 3.1.3
-* Spring web
-* Spring AMQP
-* Spring Data MongoDB
-* Gradle
 
-## 배포 ##
+* Quick summary
-## build ##
+* Version
-```
+* [Learn Markdown](https://bitbucket.org/tutorials/markdowndemo)
-$ ./gradlew clean build -x test
-```
 
-## dockerize ##
+### How do I get set up? ###
-```
-$ docker build --platform linux/amd64 -t control-center-management .
-```
 
-## K8s Envs ##
+* Summary of set up
-### Office Desktop ###
+* Configuration
-```
+* Dependencies
-apiVersion: apps/v1
+* Database configuration
-kind: Deployment
+* How to run tests
-metadata:
+* Deployment instructions
-  name: control-center-management
-  namespace: sdt-cloud
-  labels:
-    name: control-center-management
-spec:
-  selector:
-    matchLabels:
-      name: control-center-management
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        name: control-center-management
-    spec:
-      imagePullSecrets:
-        - name: regcred
-      containers:
-        - name: control-center-management
-          image: 003960268191.dkr.ecr.ap-northeast-2.amazonaws.com/sdt-cloud/control-center-management:0.0.3
-          imagePullPolicy: Always
-          ports:
-            - containerPort: 8087
-          env:
-            - name: SPRING_PROFILES_ACTIVE
-              value: "k8s"
-            - name: SERVER_PORT
-              value: "8087"
-            - name: MONGODB_URL
-              value: "mongodb://sdt:251327@mongo-db.database.svc.cluster.local/awexomeray?authSource=admin"
-            - name: DEPLOYER_ENDPOINT
-              value: "http://device-deployer.sdt-cloud.svc.cluster.local:8085"
-            - name: IAM_AMQP_HOST
-              value: "rabbitmq.sdt-cloud.svc.cluster.local"
-            - name: IAM_AMQP_PORT
-              value: "5672"
-            - name: IAM_AMQP_CREDENTIALS_USERNAME
-              value: "sdt"
-            - name: IAM_AMQP_CREDENTIALS_PASSWORD
-              value: "251327"
-            - name: DATA_FALL_ENDPOINT
-              value: "http://data-fall.sdt-cloud.svc.cluster.local:8083"
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: control-center-management
-  namespace: sdt-cloud
-spec:
-  ports:
-    - port: 8087
-      targetPort: 8087
-      protocol: TCP
-      name: control-center-management
-      nodePort: 30870
-  type: NodePort
-  selector:
-    name: control-center-management
-```
 
+### Contribution guidelines ###
 
-## Container Option ##
+* Writing tests
-|          옵션명           |                설명                |                                        Sample                                        |
+* Code review
-|:----------------------:|:--------------------------------:|:------------------------------------------------------------------------------------:|
+* Other guidelines
-| SPRING_PROFILES_ACTIVE |           스프링 부트 프로파일            |                                         k8s                                          |
+
-| SERVER_PORT                       |              서버 포트               |                                         8087                                         |
+### Who do I talk to? ###
-| MONGODB_URL                       |           MongoDB URL            | mongodb://sdt:251327@mongo-db.database.svc.cluster.local/awexomeray?authSource=admin |
+
-| DEPLOYER_ENDPOINT                       | device deployer service endpoint |                   http://device-deployer.sdt-cloud.svc.cluster.local:8085                   |
+* Repo owner or admin
-| IAM_AMQP_HOST                       |           RabbitMQ URL           |                         rabbitmq.sdt-cloud.svc.cluster.local                         |
+* Other community or team contact
-| IAM_AMQP_PORT                       |          RabbitMQ port           |                                         5672                                         |
-| IAM_AMQP_CREDENTIALS_USERNAME                       |       RabbitMQ 접속 username       |                         sdt                                                             |
-| IAM_AMQP_CREDENTIALS_PASSWORD                       |       RabbitMQ 접속 password       |                        2xxxx7                                                              |
-| DATA_FALL_ENDPOINT                       |    data fall service endpoint    |                                    http://data-fall.sdt-cloud.svc.cluster.local:8083                                                  |

build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = 'inc.sdt.controlcentermanagement'
-version = '0.0.6'
+version = '0.0.3'
 
 java {
     sourceCompatibility = '17'

k8s/command/docker-build-push.sh

@@ -1,4 +1,4 @@
 aws ecr get-login-password --region ap-northeast-2 | docker login --username AWS --password-stdin 003960268191.dkr.ecr.ap-northeast-2.amazonaws.com
 docker build --platform linux/amd64 -t control-center-management ../../
-docker tag control-center-management:latest 003960268191.dkr.ecr.ap-northeast-2.amazonaws.com/sdt-cloud/control-center-management:0.0.6
+docker tag control-center-management:latest 003960268191.dkr.ecr.ap-northeast-2.amazonaws.com/sdt-cloud/control-center-management:0.0.3
-docker push 003960268191.dkr.ecr.ap-northeast-2.amazonaws.com/sdt-cloud/control-center-management:0.0.6
+docker push 003960268191.dkr.ecr.ap-northeast-2.amazonaws.com/sdt-cloud/control-center-management:0.0.3

rest/api.http

@@ -1,20 +1,21 @@
 ## ON/OFF 제어
 #PATCH http://13.209.39.139:30870/chamber/1/tube/toggle
-#PATCH http://13.209.39.139:32171/chambers/1/tube/toggle
+PATCH http://13.209.39.139:32171/chamber/1/tube/toggle
-PATCH http://localhost:8087/chambers/1/tube/toggle
+#PATCH http://localhost:8087/chamber/1/tube/toggle
 Content-Type: application/json
-Authorization: Bearer eyJhbGciOiJIUzI1NiJ9.eyJvcmdhbml6YXRpb25JZCI6ImQxZGJlYWExLWY5ZTUtNGE4OC1hMWM4LTYzMWQ4NTMyOWJmYyIsInJvbGVzIjpbIlJPTEVfQURNSU5JU1RSQVRPUiJdLCJpZCI6IjdjYTBjZWQ5LTk1YjEtNDgzMC05YmJhLWZmZTUwNWVmYzgzMiIsInN1YiI6InNkdC5kZXZAc2R0LmluYyIsImlhdCI6MTY5NDQ5NjE4MiwiZXhwIjoxNjk0NDk5NzgyfQ.n5kpWEiOLrZCSwlc-MWYzJtxbFPGZCOk-NBdhKnlrog
+Authorization: Bearer eyJhbGciOiJIUzI1NiJ9.eyJvcmdhbml6YXRpb25JZCI6ImQxZGJlYWExLWY5ZTUtNGE4OC1hMWM4LTYzMWQ4NTMyOWJmYyIsInJvbGVzIjpbIlJPTEVfQURNSU5JU1RSQVRPUiJdLCJpZCI6IjcyYTUxZDUwLTYwMDEtNDAwYy04NjNmLWZlOGU2OGE1MGExMCIsInN1YiI6InNhLmphbmdAc2R0LmluYyIsImlhdCI6MTY5NDEzNjg4OCwiZXhwIjoxNjk0MTQwNDg4fQ.likh7Ix7p4Yf2iwankLG71VGrgCDzQzhn9Z7QJK0blg
+
+{"command": "ON"}
+
+//{
+//  "command" : "OFF",
+//  "assetCode" : "NODEQ-TEST-1",
+//  "slotNumber" : "1-1",
+//  "tube": [
+//    {"code": "1"}, {"code": "3"}, {"code": "11"}, {"code": "16"}
+//  ]
+//}
 
-{
-  "command" : "ON",
-  "assetCode" : "NQ-R04-TEST-003",
-  "tube": [
-    {"slotNumber": "1", "code": "1"},
-    {"slotNumber": "1", "code": "3"},
-    {"slotNumber": "1", "code": "11"},
-    {"slotNumber": "4", "code": "15"}
-  ]
-}
 
 ### offset 제어
 #PATCH http://localhost:8087/chambers/1/slots/1/tubes/1
@@ -26,8 +27,3 @@ Authorization: Bearer eyJhbGciOiJIUzI1NiJ9.eyJvcmdhbml6YXRpb25JZCI6ImQxZGJlYWExL
   "voltageOffset" : 1.5,
   "ampereOffset": 1.1
 }
-
-### 통계 디테일 조회
-GET http://localhost:8087/chambers/stats/detail/1
-Content-Type: application/json
-Authorization: Bearer eyJhbGciOiJIUzI1NiJ9.eyJvcmdhbml6YXRpb25JZCI6ImQxZGJlYWExLWY5ZTUtNGE4OC1hMWM4LTYzMWQ4NTMyOWJmYyIsInJvbGVzIjpbIlJPTEVfQURNSU5JU1RSQVRPUiJdLCJpZCI6IjdjYTBjZWQ5LTk1YjEtNDgzMC05YmJhLWZmZTUwNWVmYzgzMiIsInN1YiI6InNkdC5kZXZAc2R0LmluYyIsImlhdCI6MTY5NDQ5MjIyMSwiZXhwIjoxNjk0NDk1ODIxfQ.ZKa8-eKnJr0VDnGMmExAQnXFTfE4Y38OsI3nZ18S80E

src/main/java/inc/sdt/controlcentermanagement/application/DefaultStatsService.java

@@ -8,6 +8,7 @@ import inc.sdt.controlcentermanagement.presentation.StatsCntRecord;
 import inc.sdt.controlcentermanagement.presentation.StatsDetailRecord;
 import inc.sdt.controlcentermanagement.presentation.StatsRecord;
 import inc.sdt.controlcentermanagement.presentation.support.CustomPage;
+import inc.sdt.controlcentermanagement.presentation.support.CustomPageable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -38,7 +39,6 @@ public class DefaultStatsService implements StatsService{
 
     @Override
     public List<StatsRecord> getChamberStats() {
-        log.info("[getChamberStats]");
         List<Slot> all= slotRepositoryDelegate.getAll();
 
         Map<String, List<Slot>> groupByChamber = all.stream().collect(Collectors.groupingBy(Slot::getChamberNumber));
@@ -98,7 +98,6 @@ public class DefaultStatsService implements StatsService{
 
     @Override
     public Page<StatsDetailRecord> getChamberStatsDetail(int page, int size, String chamberNumber) {
-        log.info("[getChamberStatsDetail] chamberNumber: {}", chamberNumber);
         List<Slot> all= slotRepositoryDelegate.getAll().stream().filter(slot -> slot.getChamberNumber().equals(chamberNumber)).toList();
         Pageable pageable = PageRequest.of(page, size);
 
@@ -135,13 +134,9 @@ public class DefaultStatsService implements StatsService{
                         }
                     });
                 }
-            } else {
-                throw new NoSuchElementException();
             }
-
             for(int i=0 ; i < 16 ; i++){
                 StatsDetailRecord statsDetailRecord = new StatsDetailRecord(
-                        slot.getAssetCode(),
                         slot.getSlotNumber(),
                         String.valueOf(i),
                         "status",

src/main/java/inc/sdt/controlcentermanagement/application/DefaultTubeService.java

@@ -9,7 +9,10 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.util.UriComponentsBuilder;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author sunae.jang (sa.jang@sdt.inc)
@@ -41,51 +44,59 @@ class DefaultTubeService implements TubeService {
     }
 
     @Override
-    public void controlByTubeCode(String authorization, Slot slot) {
+    public void controlByTubeCode(String authorization, Slot request) {
-        log.info("[controlByTubeCode] slot: {}", slot);
+        log.info("[controlByTubeCode] request: {}", request);
-        Map<String, Integer> tubeMap = new LinkedHashMap<>();
+        Map<String, String> tubeMap = new LinkedHashMap<>();
-        Slot request = this.get(slot.getChamberNumber(), slot.getTube().get(0).getSlotNumber()); // TODO: 현재 단건 컨트롤, 추후 변경 필요
+        for (Tube tube : request.getTube()) {
-        for (Tube tube : slot.getTube()) {
             Map<String, Integer> tubeOffsetMap = this.tubeOffset();
             int tubeOffset = tubeOffsetMap.getOrDefault(request.getSlotNumber(), 1);
-            int tubeKey = Integer.parseInt(request.getTube().get(Integer.parseInt(tube.getCode())).getCode()) + tubeOffset;
+            int tubeKey = Integer.parseInt(tube.getCode()) + tubeOffset;
-            tubeMap.put(String.valueOf(tubeKey), slot.getCommand().ordinal());
+            tubeMap.put(String.valueOf(tubeKey), String.valueOf(request.getCommand().ordinal()));
         }
 
         DeployRequest deployRequest = DeployRequest.builder()
-                .assetCode(slot.getAssetCode())
+                .assetCode(request.getAssetCode())
-                .appName("awx_collector") // TODO: appName 픽스되면 수정 필요
+                .appName(request.getSlotNumber())
                 .commandType(CommandType.JSON)
-                .fileName("config.json")
+                .name("") // TODO
                 .parameters(tubeMap)
                 .build();
 
-        log.info("deployRequest: {}", deployRequest);
+        this.invokeDeployer(request.getAssetCode(), authorization, deployRequest);
-        this.invokeDeployer(slot.getAssetCode(), authorization, deployRequest);
     }
 
     @Override
     public void controlAll(String authorization, List<Slot> slots, Command command) {
         log.info("[controlAll] chamberNumber: {}, command: {}", slots.get(0).getChamberNumber(), command);
-        Set<String> assets = new HashSet<>();
+
+        Map<String, Map<String, Map<String, String>>> resultMap = new LinkedHashMap<>();
         for (Slot slot : slots) {
-            assets.add(slot.getAssetCode());
+            String assetCode = slot.getAssetCode();
+            String slotNumber = slot.getSlotNumber();
+            List<Tube> tubes = slot.getTube();
+
+            Map<String, Map<String, String>> assetMap = resultMap.computeIfAbsent(assetCode, k -> new HashMap<>());
+            Map<String, String> slotMap = assetMap.computeIfAbsent(slotNumber, k -> new HashMap<>());
+
+            for (Tube tube : tubes) {
+                Map<String, Integer> tubeOffsetMap = this.tubeOffset();
+                int tubeOffset = tubeOffsetMap.getOrDefault(slotNumber, 1);
+                int offsetResult = Integer.parseInt(tube.getCode()) + tubeOffset;
+                slotMap.put(String.valueOf(offsetResult), String.valueOf(command.ordinal()));
             }
-        assets.forEach(assetCode -> {
+        }
-            Map<String, Integer> parameterMap = new LinkedHashMap<>();
+
-            parameterMap.put("total", command.ordinal());
+        resultMap.forEach((assetCode, slot) -> slot.forEach((slotNumber, tube) -> {
-            for (int i = 1; i <= 2; i++) {
             DeployRequest deployRequest = DeployRequest.builder()
                     .assetCode(assetCode)
-                        .appName("awx_collector") // TODO
+                    .appName(slotNumber)
                     .commandType(CommandType.JSON)
-                        .fileName("config.json")
+                    .name("") // TODO
-                        .parameters(parameterMap)
+                    .parameters(tube)
                     .build();
-                log.info("deployRequest: {}", deployRequest);
+
             this.invokeDeployer(assetCode, authorization, deployRequest);
-            }
+        }));
-        });
     }
 
     @Override

src/main/java/inc/sdt/controlcentermanagement/domain/DeployRequest.java

@@ -9,15 +9,13 @@ public class DeployRequest {
     private String assetCode;
     private String appName;
     private String commandType;
-    private String fileName;
     private String name;
-    private Map<String, Integer> parameters;
+    private Map<String, String> parameters;
 
-    public DeployRequest(String assetCode, String appName, String commandType, String fileName, String name, Map<String, Integer> parameters) {
+    public DeployRequest(String assetCode, String appName, String commandType, String name, Map<String, String> parameters) {
         this.assetCode = assetCode;
         this.appName = appName;
         this.commandType = commandType;
-        this.fileName = fileName;
         this.name = name;
         this.parameters = parameters;
     }
@@ -39,15 +37,11 @@ public class DeployRequest {
         return commandType;
     }
 
-    public String getFileName() {
-        return fileName;
-    }
-
     public String getName() {
         return name;
     }
 
-    public Map<String, Integer> getParameters() {
+    public Map<String, String> getParameters() {
         return parameters;
     }
 
@@ -57,7 +51,6 @@ public class DeployRequest {
                 "assetCode='" + assetCode + '\'' +
                 ", appName='" + appName + '\'' +
                 ", commandType='" + commandType + '\'' +
-                ", fileName='" + fileName + '\'' +
                 ", name='" + name + '\'' +
                 ", parameters=" + parameters +
                 '}';
@@ -68,8 +61,7 @@ public class DeployRequest {
         private String appName;
         private String commandType;
         private String name;
-        private String fileName;
+        private Map<String, String> parameters;
-        private Map<String, Integer> parameters;
 
         private Builder() {
         }
@@ -94,18 +86,13 @@ public class DeployRequest {
             return this;
         }
 
-        public Builder fileName(String fileName) {
+        public Builder parameters(Map<String, String> parameters) {
-            this.fileName = fileName;
-            return this;
-        }
-
-        public Builder parameters(Map<String, Integer> parameters) {
             this.parameters = parameters;
             return this;
         }
 
         public DeployRequest build() {
-            return new DeployRequest(assetCode, appName, commandType, name, fileName, parameters);
+            return new DeployRequest(assetCode, appName, commandType, name, parameters);
         }
     }
 }

src/main/java/inc/sdt/controlcentermanagement/domain/Tube.java

@@ -4,30 +4,18 @@ package inc.sdt.controlcentermanagement.domain;
  * @author sunae.jang (sa.jang@sdt.inc)
  */
 public class Tube {
-    private String slotNumber;
     private String code;
     private Float voltageOffset;
     private Float ampereOffset;
     protected Tube() {
     }
 
-    public Tube(String slotNumber, String code, Float voltageOffset, Float ampereOffset) {
-        this.slotNumber = slotNumber;
-        this.code = code;
-        this.voltageOffset = voltageOffset;
-        this.ampereOffset = ampereOffset;
-    }
-
     public Tube(String code, Float voltageOffset, Float ampereOffset) {
         this.code = code;
         this.voltageOffset = voltageOffset;
         this.ampereOffset = ampereOffset;
     }
 
-    public String getSlotNumber() {
-        return slotNumber;
-    }
-
     public String getCode() {
         return code;
     }
@@ -43,8 +31,7 @@ public class Tube {
     @Override
     public String toString() {
         return "Tube{" +
-                "slotNumber='" + slotNumber + '\'' +
+                "code='" + code + '\'' +
-                ", code='" + code + '\'' +
                 ", voltageOffset=" + voltageOffset +
                 ", ampereOffset=" + ampereOffset +
                 '}';
@@ -55,7 +42,6 @@ public class Tube {
     }
 
     public static final class Builder {
-        private String slotNumber;
         private String code;
         private Float voltageOffset;
         private Float ampereOffset;
@@ -63,11 +49,6 @@ public class Tube {
         private Builder() {
         }
 
-        public Builder slotNumber(String slotNumber) {
-            this.slotNumber = slotNumber;
-            return this;
-        }
-
         public Builder code(String code) {
             this.code = code;
             return this;
@@ -84,7 +65,7 @@ public class Tube {
         }
 
         public Tube build() {
-            return new Tube(slotNumber, code, voltageOffset, ampereOffset);
+            return new Tube(code, voltageOffset, ampereOffset);
         }
     }
 }

src/main/java/inc/sdt/controlcentermanagement/presentation/StatsController.java

@@ -28,7 +28,7 @@ public class StatsController {
     @ResponseStatus(HttpStatus.OK)
     @GetMapping("/chambers/stats")
     public StatsResult chambers(
-            @RequestHeader("Authorization") String authorization
+//            @RequestHeader("Authorization") String authorization
     ){
         log.info("[chambers stats]");
 
@@ -37,11 +37,11 @@ public class StatsController {
         return new StatsResult(chamberStats);
     }
 
-    @ResourceMapping(name = "Chambers_stats_detail", method = "GET", uri = "/chambers/stats/detail/{chamberNumber}", description = "get chamber stats detail")
+    @ResourceMapping(name = "Chambers_stats_detail", method = "GET", uri = "/chambers/stats/{chamberNumber}", description = "get chamber stats detail")
     @ResponseStatus(HttpStatus.OK)
-    @GetMapping("/chambers/stats/detail/{chamberNumber}")
+    @GetMapping("/chambers/stats/{chamberNumber}")
     public PageableResponse<StatsDetailRecord> detail(
-            @RequestHeader("Authorization") String authorization,
+//            @RequestHeader("Authorization") String authorization
             @PathVariable String chamberNumber,
             @RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
             @RequestParam(value = "size", required = false, defaultValue = "20") Integer size

src/main/java/inc/sdt/controlcentermanagement/presentation/StatsDetailRecord.java

@@ -1,7 +1,6 @@
 package inc.sdt.controlcentermanagement.presentation;
 
 public class StatsDetailRecord {
-    private String assetCode;
     private String slotNumber;
     private String tubeId;
     private String status;
@@ -15,8 +14,7 @@ public class StatsDetailRecord {
     private String voltageOffset;
     private String currentOffset;
 
-    public StatsDetailRecord(String assetCode, String slotNumber, String tubeId, String status, String voltage, String current, String pin, String err1, String err2, String passTime, String retentionRate, String voltageOffset, String currentOffset) {
+    public StatsDetailRecord(String slotNumber, String tubeId, String status, String voltage, String current, String pin, String err1, String err2, String passTime, String retentionRate, String voltageOffset, String currentOffset) {
-        this.assetCode = assetCode;
         this.slotNumber = slotNumber;
         this.tubeId = tubeId;
         this.status = status;
@@ -31,10 +29,6 @@ public class StatsDetailRecord {
         this.currentOffset = currentOffset;
     }
 
-    public String getAssetCode() {
-        return assetCode;
-    }
-
     public String getVoltageOffset() {
         return voltageOffset;
     }

src/main/java/inc/sdt/controlcentermanagement/presentation/TubeController.java

@@ -30,12 +30,12 @@ public class TubeController {
     @PatchMapping("/chambers/{chamberNumber}/tube/toggle")
     public void toggle(@RequestHeader("Authorization") String authorization, @PathVariable String chamberNumber, @RequestBody Slot slot) {
         log.info("[toggle] chamberNumber: {}, slot: {}", chamberNumber, slot);
+        List<Slot> slots = tubeService.get(chamberNumber);
+        if (slots.isEmpty()) throw new NoSuchElementException(chamberNumber);
         slot.setChamberNumber(chamberNumber);
         if (slot.getTube() != null) {
             tubeService.controlByTubeCode(authorization, slot);
         } else {
-            List<Slot> slots = tubeService.get(chamberNumber);
-            if (slots.isEmpty()) throw new NoSuchElementException(chamberNumber);
             tubeService.controlAll(authorization, slots, slot.getCommand());
         }
     }

src/main/java/inc/sdt/controlcentermanagement/presentation/exception/RestControllerExceptionHandler.java

@@ -24,11 +24,10 @@ class RestControllerExceptionHandler {
         return ExceptionResponse.builder(HttpStatus.BAD_REQUEST)
                 .build(e.getBindingResult().getAllErrors().get(0).getDefaultMessage());
     }
-
+    @ExceptionHandler
-    @ExceptionHandler(value = NoSuchElementException.class)
+    @ResponseStatus(HttpStatus.NOT_FOUND)
-    @ResponseStatus(HttpStatus.NO_CONTENT)
+    ExceptionResponse handleNoSuchElementException(NoSuchElementException e) {
-    ExceptionResponse handleNoContentException(NoSuchElementException e) {
+        return ExceptionResponse.builder(HttpStatus.NOT_FOUND)
-        return ExceptionResponse.builder(HttpStatus.NO_CONTENT)
+                .build(e.getMessage() + " does not exist.");
-                .build(e.getMessage());
     }
 }