Updated to provide the "active" flag for guilds.

Author: ocielliottc

server/src/test/java/com/objectcomputing/checkins/services/fixture/GuildFixture.java

@@ -12,27 +12,27 @@ public interface GuildFixture extends MemberProfileFixture, RepositoryFixture{
     String COMPASS_ADDRESS = "https://www.compass.objectcomputing.com/";
 
     default Guild createDefaultGuild() {
-        return getGuildRepository().save(new Guild(UUID.randomUUID(), "Ninja", "Warriors", COMPASS_ADDRESS+"ninja_warriors/", false));
+        return getGuildRepository().save(new Guild(UUID.randomUUID(), "Ninja", "Warriors", COMPASS_ADDRESS+"ninja_warriors/", false, true));
     }
 
     default Guild createAnotherDefaultGuild() {
-        return getGuildRepository().save(new Guild(UUID.randomUUID(), "Coding", "Warriors", COMPASS_ADDRESS+"coding_warriors/", false));
+        return getGuildRepository().save(new Guild(UUID.randomUUID(), "Coding", "Warriors", COMPASS_ADDRESS+"coding_warriors/", false, true));
     }
 
     default GuildCreateDTO createFromEntity(Guild entity) {
-        return new GuildCreateDTO(entity.getName(), entity.getDescription(), entity.getLink(), false);
+        return new GuildCreateDTO(entity.getName(), entity.getDescription(), entity.getLink(), false, true);
     }
 
     default GuildUpdateDTO updateFromEntity(Guild entity) {
-        return new GuildUpdateDTO(entity.getId(), entity.getName(), entity.getDescription(),entity.getLink(), entity.isCommunity());
+        return new GuildUpdateDTO(entity.getId(), entity.getName(), entity.getDescription(),entity.getLink(), entity.isCommunity(), entity.isActive());
     }
 
     default GuildResponseDTO responseFromEntity(Guild entity) {
-        return new GuildResponseDTO(entity.getId(), entity.getName(), entity.getDescription(),entity.getLink(), entity.isCommunity());
+        return new GuildResponseDTO(entity.getId(), entity.getName(), entity.getDescription(),entity.getLink(), entity.isCommunity(), entity.isActive());
     }
 
     default Guild entityFromDTO(GuildUpdateDTO dto) {
-        return new Guild(dto.getId(), dto.getName(), dto.getDescription(),dto.getLink(), dto.isCommunity());
+        return new Guild(dto.getId(), dto.getName(), dto.getDescription(),dto.getLink(), dto.isCommunity(), dto.isActive());
     }
 
 }

server/src/test/java/com/objectcomputing/checkins/services/guild/GuildControllerTest.java

@@ -399,7 +399,7 @@ void testUpdateGuildWithExistingMembers() {
     void testUpdateGuildNullName() {
         Guild guildEntity = createDefaultGuild();
 
-        GuildUpdateDTO requestBody = new GuildUpdateDTO(guildEntity.getId(), null, null, null, false);
+        GuildUpdateDTO requestBody = new GuildUpdateDTO(guildEntity.getId(), null, null, null, false, true);
         requestBody.setGuildMembers(new ArrayList<>());
 
         final HttpRequest<GuildUpdateDTO> request = HttpRequest.PUT("", requestBody)
@@ -434,7 +434,7 @@ void testUpdateGuildNotExist() {
         Guild guildEntity = createDefaultGuild();
         UUID requestId = UUID.randomUUID();
         GuildUpdateDTO requestBody = new GuildUpdateDTO(requestId.toString(), guildEntity.getName(),
-                guildEntity.getDescription(), guildEntity.getLink(), guildEntity.isCommunity());
+                guildEntity.getDescription(), guildEntity.getLink(), guildEntity.isCommunity(), guildEntity.isActive());
         requestBody.setGuildMembers(new ArrayList<>());
 
         MemberProfile memberProfileOfAdmin = createAnUnrelatedUser();

server/src/test/java/com/objectcomputing/checkins/services/guild/GuildTest.java

@@ -101,7 +101,7 @@ void setUp() {
     void testGuildInstantiation() {
         final String name = "name";
         final String description = "description";
-        Guild guild = new Guild(name, description, null, false);
+        Guild guild = new Guild(name, description, null, false, true);
         assertEquals(guild.getName(), name);
         assertEquals(guild.getDescription(), description);
     }
@@ -112,7 +112,7 @@ void testGuildInstantiation2() {
         final String name = "name";
         final String description = "description";
         final String link = "https://www.compass.objectcomputing.com/guilds/name";
-        Guild guild = new Guild(id, name, description, link, false);
+        Guild guild = new Guild(id, name, description, link, false, true);
         assertEquals(guild.getId(), id);
         assertEquals(guild.getName(), name);
         assertEquals(guild.getDescription(), description);
@@ -126,7 +126,7 @@ void testConstraintViolation() {
         final UUID id = UUID.randomUUID();
         final String name = "name";
         final String description = "description";
-        Guild guild = new Guild(id, name, description, null, false);
+        Guild guild = new Guild(id, name, description, null, false, true);
 
         guild.setName("");
 
@@ -143,8 +143,8 @@ void testEquals() {
         final String name = "name";
         final String description = "description";
         final String link = "https://www.compass.objectcomputing.com/guilds/name";
-        Guild g = new Guild(id, name, description, link, false);
-        Guild g2 = new Guild(id, name, description, link, false);
+        Guild g = new Guild(id, name, description, link, false, true);
+        Guild g2 = new Guild(id, name, description, link, false, true);
 
         assertEquals(g, g2);
 
@@ -160,7 +160,7 @@ void testHash() {
         final String name = "name";
         final String description = "description";
         final String link = "https://www.compass.objectcomputing.com/guilds/name";
-        Guild g = new Guild(id, name, description, link, false);
+        Guild g = new Guild(id, name, description, link, false, true);
 
         map.put(g, true);
 
@@ -174,7 +174,7 @@ void testToString() {
         final String description = "description------description";
         final String link = "https://www.compass.objectcomputing.com/guilds/name";
         final String isCommunity = "false";
-        Guild g = new Guild(id, name, description,link, false);
+        Guild g = new Guild(id, name, description,link, false, true);
 
         String s = g.toString();
         assertTrue(s.contains(name));
@@ -261,7 +261,7 @@ void testSaveGuildWithValidData() {
         MemberProfile memberProfile = new MemberProfile();
         memberProfile.setWorkEmail("[email protected]");
 
-        Guild guild = new Guild(UUID.randomUUID(), "test", "example", link, true);
+        Guild guild = new Guild(UUID.randomUUID(), "test", "example", link, true, true);
         when(guildsRepo.search(any(), any())).thenReturn(Collections.emptyList());
         when(guildsRepo.save(any())).thenReturn(guild);
         when(memberProfileServices.getById(any())).thenReturn(memberProfile);