Skip to content

Commit e34b8ce

Browse files
jcreeljcreel
authored
Merge pull request #7 from TAMULib/sprint1-b03256-merge-status-changes
Sprint1 b03256 merge status changes
2 parents a5e20ad + cd4c902 commit e34b8ce

7 files changed

Lines changed: 93 additions & 22 deletions

File tree

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,9 @@ public ApiResponse getService(@ApiVariable Long id) {
5353
@Auth(role = "ROLE_SERVICE_MANAGER")
5454
@ApiValidation(business = { @ApiValidation.Business(value = CREATE), @ApiValidation.Business(value = EXISTS) })
5555
public ApiResponse createService(@ApiValidatedModel Service service) {
56-
service = serviceRepo.create(service.getName(), service.getStatus(), service.getIsAuto(), service.getIsPublic(), service.getOnShortList(),service.getServiceUrl());
57-
simpMessagingTemplate.convertAndSend("/channel/service", new ApiResponse(SUCCESS, serviceRepo.findOne(service.getId())));
56+
System.out.println(service.getServiceUrl());
57+
service = serviceRepo.create(service.getName(), service.getStatus(), service.getIsAuto(), service.getIsPublic(), service.getOnShortList(), service.getServiceUrl());
58+
simpMessagingTemplate.convertAndSend("/channel/service", new ApiResponse(SUCCESS, serviceRepo.findAll()));
5859
return new ApiResponse(SUCCESS, service);
5960
}
6061

@@ -63,7 +64,7 @@ public ApiResponse createService(@ApiValidatedModel Service service) {
6364
@ApiValidation(business = { @ApiValidation.Business(value = UPDATE), @ApiValidation.Business(value = NONEXISTS) })
6465
public ApiResponse updateService(@ApiValidatedModel Service service) {
6566
service = serviceRepo.save(service);
66-
simpMessagingTemplate.convertAndSend("/channel/service", new ApiResponse(SUCCESS, serviceRepo.findOne(service.getId())));
67+
simpMessagingTemplate.convertAndSend("/channel/service", new ApiResponse(SUCCESS, serviceRepo.findAll()));
6768
return new ApiResponse(SUCCESS, service);
6869
}
6970

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class Service extends BaseEntity {
4141
@Column(nullable = false)
4242
private boolean isAuto;
4343

44-
@Column(nullable = true, unique = true)
44+
@Column(nullable = true)
4545
private String serviceUrl;
4646

4747
@Column(nullable = false)

‎src/main/java/edu/tamu/app/model/validation/ServiceValidator.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@
77
public class ServiceValidator extends BaseModelValidator {
88

99
public ServiceValidator() {
10-
System.out.println("validating");
1110
String nameProperty = "name";
1211
this.addInputValidator(new InputValidator(InputValidationType.required, "Service requires a name", nameProperty, true));
13-
this.addInputValidator(new InputValidator(InputValidationType.minlength, "Service name must be at least 1 characters", nameProperty, 1));
12+
this.addInputValidator(new InputValidator(InputValidationType.minlength, "Service name must be at least 3 characters", nameProperty, 3));
1413

1514
String statusProperty = "status";
1615
this.addInputValidator(new InputValidator(InputValidationType.required, "Service requires an enum status", statusProperty, true));

‎src/main/java/edu/tamu/app/service/OverallStatusService.java‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
package edu.tamu.app.service;
2+
3+
import static edu.tamu.app.enums.OverallMessageType.ERROR;
4+
import static edu.tamu.app.enums.OverallMessageType.SUCCESS;
5+
6+
import java.util.List;
7+
8+
import org.springframework.beans.factory.annotation.Autowired;
9+
10+
import edu.tamu.app.enums.Status;
11+
import edu.tamu.app.model.OverallStatus;
12+
import edu.tamu.app.model.Service;
13+
import edu.tamu.app.model.repo.ServiceRepo;
14+
15+
@org.springframework.stereotype.Service
16+
public class OverallStatusService {
17+
18+
@Autowired
19+
private ServiceRepo serviceRepo;
20+
21+
private OverallStatus overallStatusFull;
22+
23+
private OverallStatus overallStatusPublic;
24+
25+
private static final String SUCCESS_MESSAGE = "All services are working.";
26+
private static final String ERROR_MESSAGE = "Some services are experiencing problems.";
27+
28+
public OverallStatus getOverallStatusFull() {
29+
return overallStatusFull;
30+
}
31+
32+
public OverallStatus getOverallStatusPublic() {
33+
return overallStatusPublic;
34+
}
35+
36+
public void updateStatuses() {
37+
38+
List<Service> servicesFull = serviceRepo.findAll();
39+
List<Service> servicesPublic = serviceRepo.findByIsPublic(true);
40+
41+
boolean fullServicesAreUp = true;
42+
boolean publicServicesAreUp = true;
43+
44+
for(Service service : servicesFull) {
45+
if(service.getStatus().equals(Status.DOWN)) {
46+
fullServicesAreUp = false;
47+
break;
48+
}
49+
}
50+
51+
for(Service service : servicesPublic) {
52+
if(service.getStatus().equals(Status.DOWN)) {
53+
publicServicesAreUp = false;
54+
break;
55+
}
56+
}
57+
58+
if(fullServicesAreUp) {
59+
this.overallStatusFull = new OverallStatus(SUCCESS, SUCCESS_MESSAGE);
60+
} else {
61+
this.overallStatusFull = new OverallStatus(ERROR, ERROR_MESSAGE);
62+
}
63+
64+
if(publicServicesAreUp) {
65+
this.overallStatusPublic = new OverallStatus(SUCCESS, SUCCESS_MESSAGE);
66+
} else {
67+
this.overallStatusPublic = new OverallStatus(ERROR, ERROR_MESSAGE);
68+
}
69+
70+
}
71+
}

‎src/test/java/controller/ServiceControllerTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ public class ServiceControllerTest {
4141
protected static final Boolean TEST_ON_SHORT_LIST = true;
4242
protected static final Boolean TEST_NOT_ON_SHORT_LIST = false;
4343

44-
protected static Service TEST_SERVICE1 = new Service(TEST_SERVICE1_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST,null);
45-
protected static Service TEST_SERVICE2 = new Service(TEST_SERVICE2_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_NOT_PUBLIC, TEST_ON_SHORT_LIST,null);
46-
protected static Service TEST_SERVICE3 = new Service(TEST_SERVICE3_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_NOT_ON_SHORT_LIST,null);
47-
protected static Service TEST_MODIFIED_SERVICE1 = new Service(TEST_SERVICE1_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_NOT_PUBLIC, TEST_NOT_ON_SHORT_LIST,null);
44+
protected static Service TEST_SERVICE1 = new Service(TEST_SERVICE1_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, "");
45+
protected static Service TEST_SERVICE2 = new Service(TEST_SERVICE2_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_NOT_PUBLIC, TEST_ON_SHORT_LIST, "");
46+
protected static Service TEST_SERVICE3 = new Service(TEST_SERVICE3_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_NOT_ON_SHORT_LIST, "");
47+
protected static Service TEST_MODIFIED_SERVICE1 = new Service(TEST_SERVICE1_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_NOT_PUBLIC, TEST_NOT_ON_SHORT_LIST, "");
4848
protected static List<Service> mockServiceList = new ArrayList<Service>(Arrays.asList(new Service[] { TEST_SERVICE1, TEST_SERVICE2,TEST_SERVICE3 }));
4949
protected static List<Service> mockPublicServiceList = new ArrayList<Service>(Arrays.asList(new Service[] { TEST_SERVICE1, TEST_SERVICE3 }));
5050

@@ -65,7 +65,7 @@ public void setUp() {
6565
when(serviceRepo.findAll()).thenReturn(mockServiceList);
6666
when(serviceRepo.findByIsPublic(true)).thenReturn(mockPublicServiceList);
6767
when(serviceRepo.findOne(any(Long.class))).thenReturn(TEST_SERVICE1);
68-
when(serviceRepo.create(any(String.class), any(Status.class), any(Boolean.class), any(Boolean.class), any(Boolean.class),null)).thenReturn(TEST_SERVICE1);
68+
when(serviceRepo.create(any(String.class), any(Status.class), any(Boolean.class), any(Boolean.class), any(Boolean.class), any(String.class))).thenReturn(TEST_SERVICE1);
6969
when(serviceRepo.save(any(Service.class))).thenReturn(TEST_MODIFIED_SERVICE1);
7070
doNothing().when(serviceRepo).delete(any(Service.class));
7171
}

‎src/test/java/edu/tamu/app/model/NoteTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ private Note refreshNote(Note note) {
9797

9898
@Test
9999
public void testUpdateServices() {
100-
Service service1 = serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST,null);
100+
Service service1 = serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, null);
101101
Service service2 = serviceRepo.create(TEST_ALTERNATIVE_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, null);
102102
List<Service> serviceList1 = Arrays.asList(service1);
103103
List<Service> serviceList2 = Arrays.asList(service1, service2);

‎src/test/java/edu/tamu/app/model/ServiceTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,28 +59,28 @@ public void setUp() {
5959
@Test
6060
public void testCreate() {
6161
long initalCount = serviceRepo.count();
62-
serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST,null);
62+
serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, null);
6363
assertEquals("The number of Services did not increase by one", initalCount + 1, serviceRepo.count());
6464
}
6565

6666
@Test(expected = DataIntegrityViolationException.class)
6767
public void testNameNotNull() {
68-
serviceRepo.create(null, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST,null);
68+
serviceRepo.create(null, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, null);
6969
}
7070

7171
@Test(expected = DataIntegrityViolationException.class)
7272
public void testStatusNotNull() {
73-
serviceRepo.create(TEST_SERVICE_NAME, null, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST,null);
73+
serviceRepo.create(TEST_SERVICE_NAME, null, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, null);
7474
}
7575

7676
@Test(expected = ConstraintViolationException.class)
7777
public void testNameNotEmpty() {
78-
serviceRepo.create("", TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST,null);
78+
serviceRepo.create("", TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, null);
7979
}
8080

8181
@Test
8282
public void testUpdateName() {
83-
Service service = serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST,null);
83+
Service service = serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, null);
8484
service.setName(TEST_ALTERNATIVE_SERVICE_NAME);
8585
service = refreshService(service);
8686
assertEquals("Service name was not changed", TEST_ALTERNATIVE_SERVICE_NAME, service.getName());
@@ -93,7 +93,7 @@ private Service refreshService(Service service) {
9393

9494
@Test
9595
public void testUpdateAliases() {
96-
Service service = serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST,null);
96+
Service service = serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, null);
9797
service.setAliases(TEST_SERVICE_ALIASES);
9898
service = refreshService(service);
9999
assertEquals("Service aliases not set", true, service.getAliases().contains("Alias 1"));
@@ -104,15 +104,15 @@ public void testUpdateAliases() {
104104

105105
@Test
106106
public void testUpdateStatus() {
107-
Service service = serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST,null);
107+
Service service = serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, null);
108108
service.setStatus(TEST_ALTERNATIVE_SERVICE_STATUS);
109109
service = refreshService(service);
110110
assertEquals("Service status was not changed", TEST_ALTERNATIVE_SERVICE_STATUS, service.getStatus());
111111
}
112112

113113
@Test
114114
public void testUpdateServiceUrl() {
115-
Service service = serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST,null);
115+
Service service = serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, null);
116116
service.setServiceUrl(TEST_SERVICE_URL);
117117
service = refreshService(service);
118118
assertEquals("Service status url was not changed", TEST_SERVICE_URL, service.getServiceUrl());
@@ -124,7 +124,7 @@ public void testUpdateNotes() {
124124
Note note2 = noteRepo.create(TEST_NOTE_TITLE2, testUser);
125125
List<Note> noteList1 = Arrays.asList(note1);
126126
List<Note> noteList2 = Arrays.asList(note1, note2);
127-
Service service = serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST,null);
127+
Service service = serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, null);
128128
service.setNotes(noteList1);
129129
service = refreshService(service);
130130
assertEquals("Service notes did not contain the right number of notes", 1, service.getNotes().size());
@@ -138,7 +138,7 @@ public void testUpdateNotes() {
138138
@Test
139139
public void testDelete() {
140140
long initialCount = serviceRepo.count();
141-
Service service = serviceRepo.create(TEST_SERVICE_NAME, TEST_ALTERNATIVE_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST,null);
141+
Service service = serviceRepo.create(TEST_SERVICE_NAME, TEST_ALTERNATIVE_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, null);
142142
assertEquals("The service was not created", initialCount + 1, serviceRepo.count());
143143
serviceRepo.delete(service);
144144
assertEquals("The service was not deleted", initialCount, serviceRepo.count());

0 commit comments

Comments
 (0)