gms/src/main/resources/sql/upgrade.sql

@@ -5,3 +5,7 @@ ALTER TABLE gms_membership ADD COLUMN creation_time timestamp DEFAULT NOW();
 ALTER TABLE gms_membership ADD COLUMN created_by varchar;
 ALTER TABLE gms_permission ADD COLUMN update_time timestamp DEFAULT NOW();
 ALTER TABLE gms_permission ADD COLUMN set_by varchar;
+
+--- 2021-03-19
+ALTER TABLE audit_log ADD COLUMN action_type varchar;
+ALTER TABLE audit_log RENAME COLUMN action TO description;

gms/src/test/java/it/inaf/ia2/gms/controller/MembersControllerTest.java

@@ -12,6 +12,7 @@ import it.inaf.ia2.gms.persistence.model.GroupEntity;
 import it.inaf.ia2.gms.persistence.model.MembershipEntity;
 import it.inaf.ia2.gms.service.GroupNameService;
 import it.inaf.ia2.gms.service.GroupsService;
+import java.util.ArrayList;
 import java.util.Optional;
 import static org.hamcrest.CoreMatchers.is;
 import org.junit.Before;
@@ -28,6 +29,7 @@ import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -128,4 +130,15 @@ public class MembersControllerTest {
 
         verify(membershipManager, times(1)).removeMember(eq(inaf), eq("userId"));
     }
+
+    @Test
+    public void testGetMembers() throws Exception {
+
+        when(membershipManager.getUserGroups(any(), eq("userId"))).thenReturn(new ArrayList<>());
+
+        mockMvc.perform(get("/membership?group=LBT&user_id=userId"))
+                .andExpect(status().isOk());
+
+        verify(membershipManager, times(1)).getUserGroups(any(), eq("userId"));
+    }
 }

gms/src/test/java/it/inaf/ia2/gms/persistence/LoggingDAOTest.java

+package it.inaf.ia2.gms.persistence;
+
+import it.inaf.ia2.gms.DataSourceConfig;
+import it.inaf.ia2.gms.persistence.model.ActionType;
+import javax.servlet.http.HttpServletRequest;
+import javax.sql.DataSource;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@ContextConfiguration(classes = DataSourceConfig.class)
+public class LoggingDAOTest {
+
+    @MockBean
+    private HttpServletRequest request;
+
+    @Autowired
+    private DataSource dataSource;
+
+    private LoggingDAO dao;
+
+    @Before
+    public void setUp() {
+        dao = new LoggingDAO(dataSource);
+    }
+
+    @Test
+    public void testLogAction() {
+        dao.logAction(ActionType.GROUP_CREATED, "description");
+    }
+
+    @Test
+    public void testlogException() {
+        dao.logException(new RuntimeException("msg"));
+    }
+}

gms/src/test/java/it/inaf/ia2/gms/service/GroupNameServiceTest.java

@@ -99,4 +99,19 @@ public class GroupNameServiceTest {
     public void extractGroupNamesTestNull() {
         assertTrue(groupNameService.extractGroupNames(null).isEmpty());
     }
+
+    @Test
+    public void testGetShortGroupNameOld() {
+        assertEquals("INAF", groupNameService.getShortGroupName("LBT.INAF", Optional.of("LBT.")));
+    }
+
+    @Test
+    public void testGetShortGroupName() {
+        assertEquals("INAF", groupNameService.getShortGroupName("LBT.INAF", Optional.of("LBT")));
+    }
+
+    @Test
+    public void testGetShortGroupNameEmpty() {
+        assertEquals("LBT.INAF", groupNameService.getShortGroupName("LBT.INAF", Optional.of("")));
+    }
 }

gms/src/test/java/it/inaf/ia2/gms/service/JoinServiceTest.java

@@ -2,6 +2,7 @@ package it.inaf.ia2.gms.service;
 
 import it.inaf.ia2.gms.model.Permission;
 import it.inaf.ia2.gms.persistence.JoinDAO;
+import it.inaf.ia2.gms.persistence.LoggingDAO;
 import it.inaf.ia2.gms.persistence.MembershipsDAO;
 import it.inaf.ia2.gms.persistence.PermissionsDAO;
 import it.inaf.ia2.gms.persistence.model.GroupEntity;
@@ -37,6 +38,9 @@ public class JoinServiceTest {
     @Mock
     private JoinDAO joinDAO;
 
+    @Mock
+    private LoggingDAO loggingDAO;
+
     @InjectMocks
     private JoinService joinService;