Added some tests and other minor changes (4a825e27) · Commits · IA2 / GMS

gms/src/main/java/it/inaf/ia2/gms/manager/InvitedRegistrationManager.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -160,8 +160,6 @@ public class InvitedRegistrationManager extends UserAwareComponent {
		}

		invitedRegistration.setUserId(getCurrentUserId());
		// FIXME (workaround): separated update for user and done in order to use triggers
		invitedRegistrationDAO.setRegistrationUser(invitedRegistration);
		invitedRegistrationDAO.setRegistrationDone(invitedRegistration);
		}

gms/src/main/java/it/inaf/ia2/gms/persistence/GroupsDAO.java

+16 −17

Original line number	Diff line number	Diff line
		@@ -42,15 +42,17 @@ public class GroupsDAO {
		groupsHook.beforeCreate(group);
		}

		String sql = "INSERT INTO gms_group (id, name, path, is_leaf, created_by) VALUES (?, ?, ?, ?, ?)";
		String sql = "INSERT INTO gms_group (id, name, path, is_leaf, locked, created_by) VALUES (?, ?, ?, ?, ?, ?)";

		jdbcTemplate.update(conn -> {
		int i = 0;
		PreparedStatement ps = conn.prepareStatement(sql);
		ps.setString(1, group.getId());
		ps.setString(2, group.getName());
		ps.setObject(3, group.getPath(), Types.OTHER);
		ps.setBoolean(4, group.isLeaf());
		ps.setString(5, group.getCreatedBy());
		ps.setString(++i, group.getId());
		ps.setString(++i, group.getName());
		ps.setObject(++i, group.getPath(), Types.OTHER);
		ps.setBoolean(++i, group.isLeaf());
		ps.setBoolean(++i, group.isLocked());
		ps.setString(++i, group.getCreatedBy());
		return ps;
		});

		@@ -63,14 +65,16 @@ public class GroupsDAO {
		groupsHook.beforeUpdate(group);
		}

		String sql = "UPDATE gms_group SET name = ?, path = ?, is_leaf = ? WHERE id = ?";
		String sql = "UPDATE gms_group SET name = ?, path = ?, is_leaf = ?, locked = ? WHERE id = ?";

		jdbcTemplate.update(conn -> {
		int i = 0;
		PreparedStatement ps = conn.prepareStatement(sql);
		ps.setString(1, group.getName());
		ps.setObject(2, group.getPath(), Types.OTHER);
		ps.setBoolean(3, group.isLeaf());
		ps.setString(4, group.getId());
		ps.setString(++i, group.getName());
		ps.setObject(++i, group.getPath(), Types.OTHER);
		ps.setBoolean(++i, group.isLeaf());
		ps.setBoolean(++i, group.isLocked());
		ps.setString(++i, group.getId());
		return ps;
		});

		@@ -97,12 +101,7 @@ public class GroupsDAO {
		return ps;
		}, resultSet -> {
		if (resultSet.next()) {
		GroupEntity group = new GroupEntity();
		group.setId(resultSet.getString("id"));
		group.setName(resultSet.getString("name"));
		group.setPath(resultSet.getString("path"));
		group.setLeaf(resultSet.getBoolean("is_leaf"));
		group.setLocked(resultSet.getBoolean("locked"));
		GroupEntity group = getGroupFromResultSet(resultSet);
		return Optional.of(group);
		}
		return Optional.empty();

gms/src/main/java/it/inaf/ia2/gms/persistence/InvitedRegistrationDAO.java

+2 −13

Original line number	Diff line number	Diff line
		@@ -100,9 +100,9 @@ public class InvitedRegistrationDAO {
		return Optional.ofNullable(registration);
		}

		public void setRegistrationUser(InvitedRegistration invitedRegistration) {
		public void setRegistrationDone(InvitedRegistration invitedRegistration) {

		String sql = "UPDATE invited_registration_request SET \"user\" = ? WHERE id = ?";
		String sql = "UPDATE invited_registration_request SET \"user\" = ?, done = true WHERE id = ?";

		jdbcTemplate.update(conn -> {
		PreparedStatement ps = conn.prepareStatement(sql);
		@@ -112,17 +112,6 @@ public class InvitedRegistrationDAO {
		});
		}

		public void setRegistrationDone(InvitedRegistration invitedRegistration) {

		String sql = "UPDATE invited_registration_request SET done = true WHERE id = ?";

		jdbcTemplate.update(conn -> {
		PreparedStatement ps = conn.prepareStatement(sql);
		ps.setString(1, invitedRegistration.getId());
		return ps;
		});
		}

		/**
		* Called before deleting a group.
		*/

gms/src/main/java/it/inaf/ia2/gms/service/GroupsService.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@ 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;
		import java.util.Date;
		import java.util.List;
		import java.util.Optional;
		import java.util.UUID;
		@@ -70,6 +71,7 @@ public class GroupsService {
		group.setPath(path);
		group.setLeaf(leaf);
		group.setCreatedBy(createdBy);
		group.setCreationTime(new Date());

		groupsDAO.createGroup(group);
		loggingDAO.logAction("Added group: parent_path=" + parent.getPath() + ", group_name=" + groupName);

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

+41 −5

Original line number	Diff line number	Diff line
		@@ -98,10 +98,6 @@ public class GroupsDAOTest {
		assertTrue(group.isPresent());
		assertEquals(lbtInaf, group.get());

		// Find unexisting group
		group = dao.findGroupById("not-found");
		assertFalse(group.isPresent());

		// Sub list
		List<GroupEntity> groups = dao.getDirectSubGroups(root.getPath());
		assertEquals(2, groups.size());
		@@ -146,7 +142,7 @@ public class GroupsDAOTest {
		assertTrue(childrenMap.get(lbt.getId()));
		assertFalse(childrenMap.get(tng.getId()));

		// Rename
		// Update
		String newName = "renamed";
		tng.setName(newName);
		dao.updateGroup(tng);
		@@ -196,6 +192,46 @@ public class GroupsDAOTest {
		return UUID.randomUUID().toString().replaceAll("-", "");
		}

		@Test
		public void testFields() {

		GroupEntity group = new GroupEntity();
		group.setId("group_id");
		group.setName("group_name");
		group.setPath("group_path");
		group.setLeaf(true);
		group.setLocked(true);
		group.setCreatedBy("creator_id");

		dao.createGroup(group);

		GroupEntity savedGroup = dao.findGroupById("group_id").get();

		assertEquals("group_id", savedGroup.getId());
		assertEquals("group_name", savedGroup.getName());
		assertEquals("group_path", savedGroup.getPath());
		assertTrue(savedGroup.isLeaf());
		assertTrue(savedGroup.isLocked());
		assertEquals("creator_id", savedGroup.getCreatedBy());

		group.setName("new_name");
		group.setLeaf(false);
		group.setLocked(false);

		dao.updateGroup(group);

		savedGroup = dao.findGroupById("group_id").get();

		assertEquals("new_name", savedGroup.getName());
		assertFalse(savedGroup.isLeaf());
		assertFalse(savedGroup.isLocked());
		}

		@Test
		public void testGetInexistentGroupById() {
		assertTrue(dao.findGroupById("not-found").isEmpty());
		}

		@Test
		public void testGroupCompleteNamesEmptyInput() {
		assertTrue(dao.getGroupCompleteNamesFromId(new HashSet<>()).isEmpty());