Added description to create method and calling updateAll on the status monitor

Author: rladdusaw

src/main/java/edu/tamu/app/controller/ServiceController.java

@@ -13,6 +13,7 @@
 
 import edu.tamu.app.model.Service;
 import edu.tamu.app.model.repo.ServiceRepo;
+import edu.tamu.app.service.SystemMonitorService;
 import edu.tamu.framework.aspect.annotation.ApiMapping;
 import edu.tamu.framework.aspect.annotation.ApiValidatedModel;
 import edu.tamu.framework.aspect.annotation.ApiValidation;
@@ -29,6 +30,9 @@ public class ServiceController {
 
     @Autowired
     private ServiceRepo serviceRepo;
+    
+    @Autowired
+    private SystemMonitorService systemMonitorService;
 
     @ApiMapping("/all")
     @Auth(role="ROLE_STAFF")
@@ -53,8 +57,9 @@ public ApiResponse getService(@ApiVariable Long id) {
     @Auth(role = "ROLE_SERVICE_MANAGER")
     @ApiValidation(business = { @ApiValidation.Business(value = CREATE), @ApiValidation.Business(value = EXISTS) })
     public ApiResponse createService(@ApiValidatedModel Service service) {
-        service = serviceRepo.create(service.getName(), service.getStatus(), service.getIsAuto(), service.getIsPublic(), service.getOnShortList(), service.getServiceUrl());
+        service = serviceRepo.create(service.getName(), service.getStatus(), service.getIsAuto(), service.getIsPublic(), service.getOnShortList(), service.getServiceUrl(), service.getDescription());
         simpMessagingTemplate.convertAndSend("/channel/service", new ApiResponse(SUCCESS, serviceRepo.findAll()));
+        systemMonitorService.updateAll();
         return new ApiResponse(SUCCESS, service);
     }
 
@@ -64,6 +69,7 @@ public ApiResponse createService(@ApiValidatedModel Service service) {
     public ApiResponse updateService(@ApiValidatedModel Service service) {
         service = serviceRepo.save(service);
         simpMessagingTemplate.convertAndSend("/channel/service/" + service.getId(), new ApiResponse(SUCCESS, service));
+        systemMonitorService.updateAll();
         return new ApiResponse(SUCCESS, service);
     }
 

src/main/java/edu/tamu/app/model/Service.java

@@ -4,6 +4,7 @@
 import static javax.persistence.CascadeType.REMOVE;
 import static javax.persistence.FetchType.EAGER;
 
+import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -14,6 +15,8 @@
 import javax.persistence.Entity;
 import javax.persistence.Lob;
 import javax.persistence.OneToMany;
+import javax.persistence.PrePersist;
+import javax.persistence.PreUpdate;
 import javax.validation.constraints.Size;
 
 import org.hibernate.annotations.Fetch;
@@ -57,7 +60,7 @@ public class Service extends BaseEntity {
     @Column(nullable = false)
     private Boolean onShortList;
 
-    @Lob
+//    @Lob
     @Column(nullable = true)
     private String description;
 
@@ -72,14 +75,15 @@ public Service() {
         setAliases(new ArrayList<String>());
     }
 
-    public Service(String name, Status status, Boolean isAuto, Boolean isPublic, Boolean onShortList, String serviceUrl) {
+    public Service(String name, Status status, Boolean isAuto, Boolean isPublic, Boolean onShortList, String serviceUrl, String description) {
         this();
         setName(name);
         setStatus(status);
         setIsAuto(isAuto);
         setIsPublic(isPublic);
         setOnShortList(onShortList);
         setServiceUrl(serviceUrl);
+        setDescription(description);
     }
 
     public String getName() {

src/main/java/edu/tamu/app/model/repo/custom/ServiceRepoCustom.java

@@ -5,5 +5,5 @@
 
 public interface ServiceRepoCustom {
 
-    public Service create(String name, Status status, Boolean isAuto, Boolean isPublic, Boolean onShortList, String serviceUrl);
+    public Service create(String name, Status status, Boolean isAuto, Boolean isPublic, Boolean onShortList, String serviceUrl, String description);
 }

src/main/java/edu/tamu/app/model/repo/impl/ServiceRepoImpl.java

@@ -13,8 +13,8 @@ public class ServiceRepoImpl implements ServiceRepoCustom {
     private ServiceRepo serviceRepo;
 
     @Override
-    public Service create(String name, Status status, Boolean isAuto, Boolean isPublic, Boolean onShortList, String serviceUrl) {
-        return serviceRepo.save(new Service(name, status, isAuto, isPublic, onShortList, serviceUrl));
+    public Service create(String name, Status status, Boolean isAuto, Boolean isPublic, Boolean onShortList, String serviceUrl, String description) {
+        return serviceRepo.save(new Service(name, status, isAuto, isPublic, onShortList, serviceUrl, description));
     }
 
 }