Commit @3a30d298dea82cb6df05cd330bbb4b19f2824b45

박정하 04-18

250418 박정하 이슈 수정

@3a30d298dea82cb6df05cd330bbb4b19f2824b45

60f2e72

3a30d29

src/main/java/com/takensoft/taken_bi_manager/common/connection/api/service/impl/ConnectionApiServiceImpl.java

--- src/main/java/com/takensoft/taken_bi_manager/common/connection/api/service/impl/ConnectionApiServiceImpl.java

+++ src/main/java/com/takensoft/taken_bi_manager/common/connection/api/service/impl/ConnectionApiServiceImpl.java


 public class ConnectionApiServiceImpl implements ConnectionApiService {
     private final ConnectionApiDAO connectionApiDAO;
 
-    private Map<String, Object> findKeyResult = new HashMap<>();
-
     @Override
     public HashMap<String, Object> apiRequestTest(ConnectionApi connApi) throws Exception {
-        List<String> keys = new ArrayList<>();
-
-        if (connApi.getType() != 3) {
-            CommonUtil commonUtil = new CommonUtil();
-            HTTPUtil httpcon = new HTTPUtil();
-            String result = httpcon.HttpGetConnectionApi(connApi.getUrl(), connApi.getParams());
-            connApi.setResult(result);
-
-            if(connApi.getType() == 2) {
-                String jsonStr = commonUtil.xmlStrToJsonStr(connApi.getResult());
-                connApi.setResult(jsonStr);
-            }
-
-            JSONParser parser = new JSONParser();
-            JSONObject jsonObject = null;
-            JSONArray jsonArray = null;
-            if(connApi.getResult().substring(0,1).equals("[")) {
-                jsonArray = (JSONArray) parser.parse(connApi.getResult());
-            } else {
-                jsonObject = (JSONObject) parser.parse(connApi.getResult());
-            }
-
-            if(jsonObject != null) {
-                Map<String, Object> map = commonUtil.jsonObjectToMap(jsonObject);
-
-                if (map.containsKey("response")) {
-                    Map<String, Object> response = (Map<String, Object>) map.get("response");
-                    if (response.containsKey("body")) {
-                        Map<String, Object> body = (Map<String, Object>) response.get("body");
-                        if (body.containsKey("item")) {
-                            keys.add("response>body>item");
-                        } else if (body.containsKey("items")) {
-                            if (body.get("items").toString().substring(0,1).equals("[")) {
-                                keys.add("response>body>items");
-                            } else {
-                                keys.add("response>body>items>item");
-                            }
-                        }
-                    }
-                } else {
-                    String keyString = result.substring(0, result.indexOf('['));
-                    String[] keysArray = keyString.split(",");
-                    String key = keysArray[keysArray.length - 1].substring(1, keysArray[keysArray.length - 1].length() - 2);
-
-                    findKeyResult = new HashMap<>();
-                    findKeyResult.put("key", null);
-                    findKeyResult.put("totalRow", 0);
-                    findKey(map, key);
-
-                    keys.add((String) findKeyResult.get("key"));
-                }
-            }
+        if (connApi.getType() == 3) {
+            return new HashMap<String, Object>() {{
+                put("key", new ArrayList<>());
+            }};
         }
 
+        CommonUtil commonUtil = new CommonUtil();
+        HTTPUtil httpcon = new HTTPUtil();
+        String result = httpcon.HttpGetConnectionApi(connApi.getUrl(), connApi.getParams());
+        connApi.setResult(result);
+
+        // XML을 JSON으로 변환 (Type 2인 경우)
+        if (connApi.getType() == 2) {
+            String jsonStr = commonUtil.xmlStrToJsonStr(connApi.getResult());
+            connApi.setResult(jsonStr);
+        }
+
+        // JSON 파싱
+        Object parsedJson = parseJson(connApi.getResult());
+
+        // 키 경로 찾기
+        List<String> keyPaths = findKeyPathsToArrays(parsedJson, "");
+
         HashMap<String, Object> resultMap = new HashMap<>();
-        resultMap.put("key", keys);
+        resultMap.put("key", keyPaths);
         return resultMap;
     }
 
-    private void findKey(Map<String, Object> map, String key) {
-        for (Map.Entry<String, Object> entrySet : map.entrySet()) {
-            if (entrySet.getKey().equals(key)) {
-                String resultKey = (String) findKeyResult.get("key");
-                if (resultKey == null) {
-                    findKeyResult.put("key", entrySet.getKey() + ">");
-                } else {
-                    findKeyResult.put("key", resultKey + entrySet.getKey() + ">");
+    /**
+     * JSON 문자열을 파싱하여 JSONObject나 JSONArray로 반환
+     */
+    private Object parseJson(String jsonStr) throws Exception {
+        JSONParser parser = new JSONParser();
+        if (jsonStr.trim().startsWith("[")) {
+            return parser.parse(jsonStr);
+        } else {
+            return parser.parse(jsonStr);
+        }
+    }
+
+    /**
+     * 주어진 객체에서 배열로 이어지는 모든 키 경로를 찾아 반환
+     */
+    private List<String> findKeyPathsToArrays(Object jsonData, String currentPath) {
+        List<String> paths = new ArrayList<>();
+
+        // JSONArray인 경우 현재 경로 추가
+        if (jsonData instanceof JSONArray) {
+            paths.add(currentPath.isEmpty() ? "root" : currentPath.substring(0, currentPath.length() - 1)); // 마지막 '>' 제거
+            return paths;
+        }
+
+        // JSONObject인 경우 재귀적으로 탐색
+        if (jsonData instanceof JSONObject) {
+            JSONObject jsonObj = (JSONObject) jsonData;
+
+            // 객체가 비어있으면 빈 리스트 반환
+            if (jsonObj.isEmpty()) {
+                return paths;
+            }
+
+            // 모든 키에 대해 탐색
+            for (Object key : jsonObj.keySet()) {
+                String keyStr = key.toString();
+                Object value = jsonObj.get(keyStr);
+
+                String newPath = currentPath + keyStr + ">";
+
+                // 값이 배열이면 현재 경로 추가
+                if (value instanceof JSONArray) {
+                    paths.add(newPath.substring(0, newPath.length() - 1)); // 마지막 '>' 제거
                 }
-                List<HashMap<String, Object>> datas = (List<HashMap<String, Object>>) entrySet.getValue();
-                findKeyResult.put("totalRow", datas.size());
-            } else {
-                if (entrySet.getValue() instanceof Map) {
-                    Map<String, Object> newMap = (Map<String, Object>) entrySet.getValue();
-                    findKey(newMap, key);
+                // 값이 맵이면 재귀적으로 탐색
+                else if (value instanceof JSONObject) {
+                    paths.addAll(findKeyPathsToArrays(value, newPath));
+                }
+                // 값이 문자열이고 JSON 배열처럼 보이면 파싱 시도
+                else if (value instanceof String && ((String) value).trim().startsWith("[")) {
+                    try {
+                        Object parsed = parseJson((String) value);
+                        if (parsed instanceof JSONArray) {
+                            paths.add(newPath.substring(0, newPath.length() - 1)); // 마지막 '>' 제거
+                        } else {
+                            paths.addAll(findKeyPathsToArrays(parsed, newPath));
+                        }
+                    } catch (Exception e) {
+                        // 파싱 실패 시 무시하고 계속 진행
+                    }
                 }
             }
         }
+
+        // Map 타입인 경우도 처리 (기존 코드 호환성)
+        else if (jsonData instanceof Map) {
+            Map<String, Object> map = (Map<String, Object>) jsonData;
+
+            for (Map.Entry<String, Object> entry : map.entrySet()) {
+                String keyStr = entry.getKey();
+                Object value = entry.getValue();
+
+                String newPath = currentPath + keyStr + ">";
+
+                // 값이 리스트이면 현재 경로 추가
+                if (value instanceof List) {
+                    paths.add(newPath.substring(0, newPath.length() - 1)); // 마지막 '>' 제거
+                }
+                // 값이 맵이면 재귀적으로 탐색
+                else if (value instanceof Map) {
+                    paths.addAll(findKeyPathsToArrays(value, newPath));
+                }
+                // 값이 문자열이고 JSON 배열처럼 보이면 파싱 시도
+                else if (value instanceof String && ((String) value).trim().startsWith("[")) {
+                    try {
+                        Object parsed = parseJson((String) value);
+                        if (parsed instanceof JSONArray) {
+                            paths.add(newPath.substring(0, newPath.length() - 1)); // 마지막 '>' 제거
+                        } else {
+                            paths.addAll(findKeyPathsToArrays(parsed, newPath));
+                        }
+                    } catch (Exception e) {
+                        // 파싱 실패 시 무시하고 계속 진행
+                    }
+                }
+            }
+        }
+
+        return paths;
     }
 
     @Override

60f2e72

3a30d29

src/main/java/com/takensoft/taken_bi_manager/data/service/impl/DataServiceImpl.java

--- src/main/java/com/takensoft/taken_bi_manager/data/service/impl/DataServiceImpl.java

+++ src/main/java/com/takensoft/taken_bi_manager/data/service/impl/DataServiceImpl.java


 
 			datasetDataUpdate(datatable,connectionDB, user);
 
-			if(deleteData.size() > 0) {
+			if(deleteData != null && !deleteData.isEmpty()) {
 				// 삭제 진행 (키값 찾아서 한방에 지워야함)
 				datatable.setRowData(deleteData);
 

 				DBConnectionUtil dbUtil = new DBConnectionUtil();
 				dbUtil.datasetDataDelete(connectionDB, datatable);
 			}
-
 			// 데이터셋 업데이트 로그
 			datasetDAO.insertDatasetPostLog(datasetPostLog);
-
-
 		}catch (Exception e){
 			if(e.toString().length() > 501){
 				resultMap.getCheckMessage().setError(e.toString().substring(0,500));

60f2e72

3a30d29

src/main/java/com/takensoft/taken_bi_manager/schedule/service/impl/DiagramServiceImpl.java

--- src/main/java/com/takensoft/taken_bi_manager/schedule/service/impl/DiagramServiceImpl.java

+++ src/main/java/com/takensoft/taken_bi_manager/schedule/service/impl/DiagramServiceImpl.java


                     List<List<Object>> changeData = new ArrayList<>();
                     List<List<Object>> deleteData = new ArrayList<>();
 
-                    if (jobItm.isItm_option_bool()) {
-                        dataService.datasetRowDataUpdate(jobItm.getItm_id(), changeData, deleteData, newRowData, "admin");
-                    } else {
-                        dataService.datasetRowDataUpdate(jobItm.getItm_id(), newRowData, deleteData, insertData, "admin");
-                    }
+                    dataService.datasetRowDataUpdate(jobItm.getItm_id(), changeData, deleteData, newRowData, "admin");
                 }
 
                 jobItm.getDataTable().setRowData(newRowData);

60f2e72

3a30d29

src/main/resources/spring/mapper/sql/mariadb-SQL.xml

--- src/main/resources/spring/mapper/sql/mariadb-SQL.xml

+++ src/main/resources/spring/mapper/sql/mariadb-SQL.xml


 			TABLE_SCHEMA = #{databaseNm}
 		AND
 			TABLE_NAME = #{tableNm}
-		
+		ORDER BY
+			ORDINAL_POSITION
 	</select>
 	
 	<!-- 

60f2e72

3a30d29

src/main/resources/spring/mapper/sql/mssql-SQL.xml

--- src/main/resources/spring/mapper/sql/mssql-SQL.xml

+++ src/main/resources/spring/mapper/sql/mssql-SQL.xml


             C.TABLE_CATALOG = #{databaseNm}
         AND
             C.TABLE_NAME = #{tableNm}
+        ORDER BY
+            C.ORDINAL_POSITION
     </select>
 
     <!--

60f2e72

3a30d29

src/main/resources/spring/mapper/sql/mysql-SQL.xml

--- src/main/resources/spring/mapper/sql/mysql-SQL.xml

+++ src/main/resources/spring/mapper/sql/mysql-SQL.xml


 			TABLE_SCHEMA = #{databaseNm}
 		AND
 			TABLE_NAME = #{tableNm}
-
+        ORDER BY
+            ORDINAL_POSITION
 	</select>
 
     <!--

60f2e72

3a30d29

src/main/resources/spring/mapper/sql/postgre-SQL.xml

--- src/main/resources/spring/mapper/sql/postgre-SQL.xml

+++ src/main/resources/spring/mapper/sql/postgre-SQL.xml


 		AND
 			c.table_name = #{tableNm}
 		GROUP BY
-			c.table_schema, c.table_name, c.column_name, c.data_type, c.character_maximum_length, c.ordinal_position;
+			c.table_schema, c.table_name, c.column_name, c.data_type, c.character_maximum_length, c.ordinal_position
+		ORDER BY
+			c.ordinal_position;
 	</select>
 
 	<!--

Add a comment

Open 0
Closed 0

List

...	...	@@ -377,7 +377,7 @@
377	377
378	378	datasetDataUpdate(datatable,connectionDB, user);
379	379
380		- if(deleteData.size() > 0) {
	380	+ if(deleteData != null && !deleteData.isEmpty()) {
381	381	// 삭제 진행 (키값 찾아서 한방에 지워야함)
382	382	datatable.setRowData(deleteData);
383	383
...	...	@@ -397,11 +397,8 @@
397	397	DBConnectionUtil dbUtil = new DBConnectionUtil();
398	398	dbUtil.datasetDataDelete(connectionDB, datatable);
399	399	}
400		-
401	400	// 데이터셋 업데이트 로그
402	401	datasetDAO.insertDatasetPostLog(datasetPostLog);
403		-
404		-
405	402	}catch (Exception e){
406	403	if(e.toString().length() > 501){
407	404	resultMap.getCheckMessage().setError(e.toString().substring(0,500));

...	...	@@ -487,11 +487,7 @@
487	487	List<List<Object>> changeData = new ArrayList<>();
488	488	List<List<Object>> deleteData = new ArrayList<>();
489	489
490		- if (jobItm.isItm_option_bool()) {
491		- dataService.datasetRowDataUpdate(jobItm.getItm_id(), changeData, deleteData, newRowData, "admin");
492		- } else {
493		- dataService.datasetRowDataUpdate(jobItm.getItm_id(), newRowData, deleteData, insertData, "admin");
494		- }
	490	+ dataService.datasetRowDataUpdate(jobItm.getItm_id(), changeData, deleteData, newRowData, "admin");
495	491	}
496	492
497	493	jobItm.getDataTable().setRowData(newRowData);

...	...	@@ -45,7 +45,8 @@
45	45	TABLE_SCHEMA = #{databaseNm}
46	46	AND
47	47	TABLE_NAME = #{tableNm}
48		-
	48	+ ORDER BY
	49	+ ORDINAL_POSITION
49	50	</select>
50	51
51	52	<!--

...	...	@@ -69,6 +69,8 @@
69	69	C.TABLE_CATALOG = #{databaseNm}
70	70	AND
71	71	C.TABLE_NAME = #{tableNm}
	72	+ ORDER BY
	73	+ C.ORDINAL_POSITION
72	74	</select>
73	75
74	76	<!--

...	...	@@ -44,7 +44,8 @@
44	44	TABLE_SCHEMA = #{databaseNm}
45	45	AND
46	46	TABLE_NAME = #{tableNm}
47		-
	47	+ ORDER BY
	48	+ ORDINAL_POSITION
48	49	</select>
49	50
50	51	<!--

...	...	@@ -23,87 +23,135 @@
23	23	public class ConnectionApiServiceImpl implements ConnectionApiService {
24	24	private final ConnectionApiDAO connectionApiDAO;
25	25
26		- private Map<String, Object> findKeyResult = new HashMap<>();
27		-
28	26	@Override
29	27	public HashMap<String, Object> apiRequestTest(ConnectionApi connApi) throws Exception {
30		- List<String> keys = new ArrayList<>();
31		-
32		- if (connApi.getType() != 3) {
33		- CommonUtil commonUtil = new CommonUtil();
34		- HTTPUtil httpcon = new HTTPUtil();
35		- String result = httpcon.HttpGetConnectionApi(connApi.getUrl(), connApi.getParams());
36		- connApi.setResult(result);
37		-
38		- if(connApi.getType() == 2) {
39		- String jsonStr = commonUtil.xmlStrToJsonStr(connApi.getResult());
40		- connApi.setResult(jsonStr);
41		- }
42		-
43		- JSONParser parser = new JSONParser();
44		- JSONObject jsonObject = null;
45		- JSONArray jsonArray = null;
46		- if(connApi.getResult().substring(0,1).equals("[")) {
47		- jsonArray = (JSONArray) parser.parse(connApi.getResult());
48		- } else {
49		- jsonObject = (JSONObject) parser.parse(connApi.getResult());
50		- }
51		-
52		- if(jsonObject != null) {
53		- Map<String, Object> map = commonUtil.jsonObjectToMap(jsonObject);
54		-
55		- if (map.containsKey("response")) {
56		- Map<String, Object> response = (Map<String, Object>) map.get("response");
57		- if (response.containsKey("body")) {
58		- Map<String, Object> body = (Map<String, Object>) response.get("body");
59		- if (body.containsKey("item")) {
60		- keys.add("response>body>item");
61		- } else if (body.containsKey("items")) {
62		- if (body.get("items").toString().substring(0,1).equals("[")) {
63		- keys.add("response>body>items");
64		- } else {
65		- keys.add("response>body>items>item");
66		- }
67		- }
68		- }
69		- } else {
70		- String keyString = result.substring(0, result.indexOf('['));
71		- String[] keysArray = keyString.split(",");
72		- String key = keysArray[keysArray.length - 1].substring(1, keysArray[keysArray.length - 1].length() - 2);
73		-
74		- findKeyResult = new HashMap<>();
75		- findKeyResult.put("key", null);
76		- findKeyResult.put("totalRow", 0);
77		- findKey(map, key);
78		-
79		- keys.add((String) findKeyResult.get("key"));
80		- }
81		- }
	28	+ if (connApi.getType() == 3) {
	29	+ return new HashMap<String, Object>() {{
	30	+ put("key", new ArrayList<>());
	31	+ }};
82	32	}
83	33
	34	+ CommonUtil commonUtil = new CommonUtil();
	35	+ HTTPUtil httpcon = new HTTPUtil();
	36	+ String result = httpcon.HttpGetConnectionApi(connApi.getUrl(), connApi.getParams());
	37	+ connApi.setResult(result);
	38	+
	39	+ // XML을 JSON으로 변환 (Type 2인 경우)
	40	+ if (connApi.getType() == 2) {
	41	+ String jsonStr = commonUtil.xmlStrToJsonStr(connApi.getResult());
	42	+ connApi.setResult(jsonStr);
	43	+ }
	44	+
	45	+ // JSON 파싱
	46	+ Object parsedJson = parseJson(connApi.getResult());
	47	+
	48	+ // 키 경로 찾기
	49	+ List<String> keyPaths = findKeyPathsToArrays(parsedJson, "");
	50	+
84	51	HashMap<String, Object> resultMap = new HashMap<>();
85		- resultMap.put("key", keys);
	52	+ resultMap.put("key", keyPaths);
86	53	return resultMap;
87	54	}
88	55
89		- private void findKey(Map<String, Object> map, String key) {
90		- for (Map.Entry<String, Object> entrySet : map.entrySet()) {
91		- if (entrySet.getKey().equals(key)) {
92		- String resultKey = (String) findKeyResult.get("key");
93		- if (resultKey == null) {
94		- findKeyResult.put("key", entrySet.getKey() + ">");
95		- } else {
96		- findKeyResult.put("key", resultKey + entrySet.getKey() + ">");
	56	+ /**
	57	+ * JSON 문자열을 파싱하여 JSONObject나 JSONArray로 반환
	58	+ */
	59	+ private Object parseJson(String jsonStr) throws Exception {
	60	+ JSONParser parser = new JSONParser();
	61	+ if (jsonStr.trim().startsWith("[")) {
	62	+ return parser.parse(jsonStr);
	63	+ } else {
	64	+ return parser.parse(jsonStr);
	65	+ }
	66	+ }
	67	+
	68	+ /**
	69	+ * 주어진 객체에서 배열로 이어지는 모든 키 경로를 찾아 반환
	70	+ */
	71	+ private List<String> findKeyPathsToArrays(Object jsonData, String currentPath) {
	72	+ List<String> paths = new ArrayList<>();
	73	+
	74	+ // JSONArray인 경우 현재 경로 추가
	75	+ if (jsonData instanceof JSONArray) {
	76	+ paths.add(currentPath.isEmpty() ? "root" : currentPath.substring(0, currentPath.length() - 1)); // 마지막 '>' 제거
	77	+ return paths;
	78	+ }
	79	+
	80	+ // JSONObject인 경우 재귀적으로 탐색
	81	+ if (jsonData instanceof JSONObject) {
	82	+ JSONObject jsonObj = (JSONObject) jsonData;
	83	+
	84	+ // 객체가 비어있으면 빈 리스트 반환
	85	+ if (jsonObj.isEmpty()) {
	86	+ return paths;
	87	+ }
	88	+
	89	+ // 모든 키에 대해 탐색
	90	+ for (Object key : jsonObj.keySet()) {
	91	+ String keyStr = key.toString();
	92	+ Object value = jsonObj.get(keyStr);
	93	+
	94	+ String newPath = currentPath + keyStr + ">";
	95	+
	96	+ // 값이 배열이면 현재 경로 추가
	97	+ if (value instanceof JSONArray) {
	98	+ paths.add(newPath.substring(0, newPath.length() - 1)); // 마지막 '>' 제거
97	99	}
98		- List<HashMap<String, Object>> datas = (List<HashMap<String, Object>>) entrySet.getValue();
99		- findKeyResult.put("totalRow", datas.size());
100		- } else {
101		- if (entrySet.getValue() instanceof Map) {
102		- Map<String, Object> newMap = (Map<String, Object>) entrySet.getValue();
103		- findKey(newMap, key);
	100	+ // 값이 맵이면 재귀적으로 탐색
	101	+ else if (value instanceof JSONObject) {
	102	+ paths.addAll(findKeyPathsToArrays(value, newPath));
	103	+ }
	104	+ // 값이 문자열이고 JSON 배열처럼 보이면 파싱 시도
	105	+ else if (value instanceof String && ((String) value).trim().startsWith("[")) {
	106	+ try {
	107	+ Object parsed = parseJson((String) value);
	108	+ if (parsed instanceof JSONArray) {
	109	+ paths.add(newPath.substring(0, newPath.length() - 1)); // 마지막 '>' 제거
	110	+ } else {
	111	+ paths.addAll(findKeyPathsToArrays(parsed, newPath));
	112	+ }
	113	+ } catch (Exception e) {
	114	+ // 파싱 실패 시 무시하고 계속 진행
	115	+ }
104	116	}
105	117	}
106	118	}
	119	+
	120	+ // Map 타입인 경우도 처리 (기존 코드 호환성)
	121	+ else if (jsonData instanceof Map) {
	122	+ Map<String, Object> map = (Map<String, Object>) jsonData;
	123	+
	124	+ for (Map.Entry<String, Object> entry : map.entrySet()) {
	125	+ String keyStr = entry.getKey();
	126	+ Object value = entry.getValue();
	127	+
	128	+ String newPath = currentPath + keyStr + ">";
	129	+
	130	+ // 값이 리스트이면 현재 경로 추가
	131	+ if (value instanceof List) {
	132	+ paths.add(newPath.substring(0, newPath.length() - 1)); // 마지막 '>' 제거
	133	+ }
	134	+ // 값이 맵이면 재귀적으로 탐색
	135	+ else if (value instanceof Map) {
	136	+ paths.addAll(findKeyPathsToArrays(value, newPath));
	137	+ }
	138	+ // 값이 문자열이고 JSON 배열처럼 보이면 파싱 시도
	139	+ else if (value instanceof String && ((String) value).trim().startsWith("[")) {
	140	+ try {
	141	+ Object parsed = parseJson((String) value);
	142	+ if (parsed instanceof JSONArray) {
	143	+ paths.add(newPath.substring(0, newPath.length() - 1)); // 마지막 '>' 제거
	144	+ } else {
	145	+ paths.addAll(findKeyPathsToArrays(parsed, newPath));
	146	+ }
	147	+ } catch (Exception e) {
	148	+ // 파싱 실패 시 무시하고 계속 진행
	149	+ }
	150	+ }
	151	+ }
	152	+ }
	153	+
	154	+ return paths;
107	155	}
108	156
109	157	@Override

...	...	@@ -69,7 +69,9 @@
69	69	AND
70	70	c.table_name = #{tableNm}
71	71	GROUP BY
72		- c.table_schema, c.table_name, c.column_name, c.data_type, c.character_maximum_length, c.ordinal_position;
	72	+ c.table_schema, c.table_name, c.column_name, c.data_type, c.character_maximum_length, c.ordinal_position
	73	+ ORDER BY
	74	+ c.ordinal_position;
73	75	</select>
74	76
75	77	<!--

Delete comment