assertThat(picoContainer.getParent().getParent().getParent().getComponentAdapters()).hasSize(
COMPONENTS_IN_LEVEL_1_AT_CONSTRUCTION
+ 23 // level 1
- + 47 // content of DaoModule
+ + 48 // content of DaoModule
+ 3 // content of EsSearchModule
+ 57 // content of CorePropertyDefinitions
+ 1 // content of CePropertyDefinitions
import org.sonar.db.metric.MetricDao;
import org.sonar.db.notification.NotificationQueueDao;
import org.sonar.db.organization.OrganizationDao;
+import org.sonar.db.organization.OrganizationMemberDao;
import org.sonar.db.permission.AuthorizationDao;
import org.sonar.db.permission.GroupPermissionDao;
import org.sonar.db.permission.UserPermissionDao;
MetricDao.class,
NotificationQueueDao.class,
OrganizationDao.class,
+ OrganizationMemberDao.class,
PermissionTemplateCharacteristicDao.class,
PermissionTemplateDao.class,
ProjectQgateAssociationDao.class,
import org.sonar.db.metric.MetricDao;
import org.sonar.db.notification.NotificationQueueDao;
import org.sonar.db.organization.OrganizationDao;
+import org.sonar.db.organization.OrganizationMemberDao;
import org.sonar.db.permission.AuthorizationDao;
import org.sonar.db.permission.GroupPermissionDao;
import org.sonar.db.permission.UserPermissionDao;
private final SchemaMigrationDao schemaMigrationDao;
private final AuthorizationDao authorizationDao;
private final OrganizationDao organizationDao;
+ private final OrganizationMemberDao organizationMemberDao;
private final QualityProfileDao qualityProfileDao;
private final LoadedTemplateDao loadedTemplateDao;
private final PropertiesDao propertiesDao;
schemaMigrationDao = getDao(map, SchemaMigrationDao.class);
authorizationDao = getDao(map, AuthorizationDao.class);
organizationDao = getDao(map, OrganizationDao.class);
+ organizationMemberDao = getDao(map, OrganizationMemberDao.class);
qualityProfileDao = getDao(map, QualityProfileDao.class);
loadedTemplateDao = getDao(map, LoadedTemplateDao.class);
propertiesDao = getDao(map, PropertiesDao.class);
return organizationDao;
}
+ public OrganizationMemberDao organizationMemberDao() {
+ return organizationMemberDao;
+ }
+
public IssueDao issueDao() {
return issueDao;
}
import org.sonar.db.notification.NotificationQueueMapper;
import org.sonar.db.organization.OrganizationDto;
import org.sonar.db.organization.OrganizationMapper;
+import org.sonar.db.organization.OrganizationMemberDto;
+import org.sonar.db.organization.OrganizationMemberMapper;
import org.sonar.db.permission.AuthorizationMapper;
import org.sonar.db.permission.GroupPermissionDto;
import org.sonar.db.permission.GroupPermissionMapper;
confBuilder.loadAlias("Measure", MeasureDto.class);
confBuilder.loadAlias("NotificationQueue", NotificationQueueDto.class);
confBuilder.loadAlias("Organization", OrganizationDto.class);
+ confBuilder.loadAlias("OrganizationMember", OrganizationMemberDto.class);
confBuilder.loadAlias("PermissionTemplateCharacteristic", PermissionTemplateCharacteristicDto.class);
confBuilder.loadAlias("PermissionTemplateGroup", PermissionTemplateGroupDto.class);
confBuilder.loadAlias("PermissionTemplate", PermissionTemplateDto.class);
MetricMapper.class,
NotificationQueueMapper.class,
OrganizationMapper.class,
+ OrganizationMemberMapper.class,
PermissionTemplateCharacteristicMapper.class,
PermissionTemplateMapper.class,
ProjectQgateAssociationMapper.class,
--- /dev/null
+/*
+ * SonarQube
+ * Copyright (C) 2009-2017 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+package org.sonar.db.organization;
+
+import org.sonar.db.Dao;
+import org.sonar.db.DbSession;
+
+public class OrganizationMemberDao implements Dao {
+ public void insert(DbSession dbSession, OrganizationMemberDto organizationMemberDto) {
+ mapper(dbSession).insert(organizationMemberDto);
+ }
+
+ private OrganizationMemberMapper mapper(DbSession dbSession) {
+ return dbSession.getMapper(OrganizationMemberMapper.class);
+ }
+}
--- /dev/null
+/*
+ * SonarQube
+ * Copyright (C) 2009-2017 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+package org.sonar.db.organization;
+
+public class OrganizationMemberDto {
+ private String organizationUuid;
+ private Integer userId;
+
+ public String getOrganizationUuid() {
+ return organizationUuid;
+ }
+
+ public OrganizationMemberDto setOrganizationUuid(String organizationUuid) {
+ this.organizationUuid = organizationUuid;
+ return this;
+ }
+
+ public Integer getUserId() {
+ return userId;
+ }
+
+ public OrganizationMemberDto setUserId(Integer userId) {
+ this.userId = userId;
+ return this;
+ }
+}
--- /dev/null
+/*
+ * SonarQube
+ * Copyright (C) 2009-2017 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+package org.sonar.db.organization;
+
+public interface OrganizationMemberMapper {
+ void insert(OrganizationMemberDto organizationMember);
+}
--- /dev/null
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="org.sonar.db.organization.OrganizationMemberMapper">
+ <insert id="insert" parameterType="OrganizationMember" useGeneratedKeys="false">
+ insert into organization_members
+ (
+ organization_uuid,
+ user_id
+ )
+ values
+ (
+ #{organizationUuid, jdbcType=VARCHAR},
+ #{userId, jdbcType=INTEGER}
+ )
+ </insert>
+</mapper>
public void verify_count_of_added_components() {
ComponentContainer container = new ComponentContainer();
new DaoModule().configure(container);
- assertThat(container.size()).isEqualTo(2 + 45);
+ assertThat(container.size()).isEqualTo(2 + 46);
}
}
--- /dev/null
+/*
+ * SonarQube
+ * Copyright (C) 2009-2017 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+package org.sonar.db.organization;
+
+import java.util.Map;
+import org.apache.ibatis.exceptions.PersistenceException;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.sonar.db.DbClient;
+import org.sonar.db.DbSession;
+import org.sonar.db.DbTester;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.entry;
+
+public class OrganizationMemberDaoTest {
+ @Rule
+ public final DbTester db = DbTester.create().setDisableDefaultOrganization(true);
+ @Rule
+ public ExpectedException expectedException = ExpectedException.none();
+
+ private DbClient dbClient = db.getDbClient();
+ private DbSession dbSession = db.getSession();
+
+ private OrganizationMemberDao underTest = dbClient.organizationMemberDao();
+
+ @Test
+ public void insert() {
+ underTest.insert(dbSession, create("O_1", 256));
+
+ Map<String, Object> result = db.selectFirst(dbSession, "select organization_uuid as \"organizationUuid\", user_id as \"userId\" from organization_members");
+
+ assertThat(result).containsOnly(entry("organizationUuid", "O_1"), entry("userId", 256L));
+ }
+
+ @Test
+ public void fail_insert_if_no_organization_uuid() {
+ expectedException.expect(PersistenceException.class);
+
+ underTest.insert(dbSession, create(null, 256));
+ }
+
+ @Test
+ public void fail_insert_if_no_user_id() {
+ expectedException.expect(PersistenceException.class);
+
+ underTest.insert(dbSession, create("O_1", null));
+ }
+
+ @Test
+ public void fail_if_organization_member_already_exist() {
+ underTest.insert(dbSession, create("O_1", 256));
+ expectedException.expect(PersistenceException.class);
+
+ underTest.insert(dbSession, create("O_1", 256));
+ }
+
+ private OrganizationMemberDto create(String organizationUuid, Integer userId) {
+ return new OrganizationMemberDto()
+ .setOrganizationUuid(organizationUuid)
+ .setUserId(userId);
+ }
+}
projects / sonarqube.git / commitdiff