diff --git a/configurationapp/src/main/java/com/att/ConfigurationApp.java b/configurationapp/src/main/java/com/att/ConfigurationApp.java index 1ea7d60..56d3db8 100644 --- a/configurationapp/src/main/java/com/att/ConfigurationApp.java +++ b/configurationapp/src/main/java/com/att/ConfigurationApp.java @@ -7,6 +7,7 @@ public class ConfigurationApp { public static void main(String[] args) { + SpringApplication.run(ConfigurationApp.class, args); } } diff --git a/configurationapp/src/main/java/com/att/dao/configurations/ConfigurationDao.java b/configurationapp/src/main/java/com/att/dao/configurations/ConfigurationDao.java index f889558..46d677f 100644 --- a/configurationapp/src/main/java/com/att/dao/configurations/ConfigurationDao.java +++ b/configurationapp/src/main/java/com/att/dao/configurations/ConfigurationDao.java @@ -3,10 +3,7 @@ import com.att.data.configurations.ConfigValue; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; @Service public class ConfigurationDao { @@ -34,15 +31,24 @@ public ConfigurationDao() { } public List getConfigurationsForYearMonth(String yearMonth) { - return new ArrayList<>(); + if(null == currentConfigurations.get(yearMonth)) { + return new ArrayList<>(); + } + return currentConfigurations.get(yearMonth); } public void addConfiguration(String yearMonth, ConfigValue value) { - int newId = idProvider.getNextId(); - + List adding = new ArrayList<>(); + if(currentConfigurations.containsKey(yearMonth)) { + adding = currentConfigurations.get(yearMonth); + adding.add(new ConfigValue(value.getConfigName(),idProvider.getNextId())); + } else { + adding.add(new ConfigValue(value.getConfigName(),idProvider.getNextId())); + } + currentConfigurations.put(yearMonth, adding); } public void removeAllConfigurationsForYearMonth(String yearMonth) { - + currentConfigurations = new HashMap<>(); } } diff --git a/configurationapp/src/main/java/com/att/web/configuarations/ConfigurationController.java b/configurationapp/src/main/java/com/att/web/configuarations/ConfigurationController.java index 995402a..efc8fa8 100644 --- a/configurationapp/src/main/java/com/att/web/configuarations/ConfigurationController.java +++ b/configurationapp/src/main/java/com/att/web/configuarations/ConfigurationController.java @@ -12,6 +12,7 @@ @RequestMapping(value="/configuration") public class ConfigurationController { + @Autowired private ConfigurationDao dao; @Autowired @@ -23,23 +24,21 @@ public ConfigurationController(ConfigurationDao dao) { @ResponseBody public List getConfigurationsForYearMonth( @PathVariable("yearMonthNumber") String yearMonth) { - - return new ArrayList<>(); + ; + return dao.getConfigurationsForYearMonth(yearMonth); } @RequestMapping(value="/{yearMonthNumber}", method=RequestMethod.DELETE) - public void deleteConfigurationsForYearMonth(@PathVariable("yearMonthNumber") String yearMonth) { - try { - - } catch (Exception ex) { - - } + public String deleteConfigurationsForYearMonth(@PathVariable("yearMonthNumber") String yearMonth) { + dao.removeAllConfigurationsForYearMonth(yearMonth); + return "{\"Status\":\"SUCCESS\"}"; } @RequestMapping(value="/{yearMonthNumber}", method={ RequestMethod.POST, RequestMethod.PUT }) - public void addConfigurationForYearMonth( + public String addConfigurationForYearMonth( @PathVariable("yearMonthNumber") String yearMonth, @RequestBody ConfigValue value) { - + dao.addConfiguration(yearMonth, value); + return "{\"Status\":\"SUCCESS\"}"; } } diff --git a/configurationapp/src/main/resources/static/index.html b/configurationapp/src/main/resources/static/index.html index 7cd14ba..9b355b7 100644 --- a/configurationapp/src/main/resources/static/index.html +++ b/configurationapp/src/main/resources/static/index.html @@ -2,46 +2,116 @@ Configuration App - + - - - -

Welcome To The Configuration App

-
-
- -
-
- - - - - - - - - - -
Configuration IdConfiguration Name
-
-
- -
-
+ + + +

Welcome To The Configuration App

+
+
+ +
+
+ + + + + + + + + +
+ +
+
+ + + + + + + + + + +
Configuration IdConfiguration Name
+
+
\ No newline at end of file diff --git a/configurationapp/src/main/resources/static/js/app.js b/configurationapp/src/main/resources/static/js/app.js index 2d4b945..8789ec4 100644 --- a/configurationapp/src/main/resources/static/js/app.js +++ b/configurationapp/src/main/resources/static/js/app.js @@ -17,7 +17,11 @@ paging: false, sorting: false, searching: false, - info: false + info: false, + columns: [ + { "data": "configId" }, + { "data": "configName" }, + ] }); };