From 3512475d7d4f437403b482f43bbf4790b8736cca Mon Sep 17 00:00:00 2001
From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Mon, 15 Sep 2014 13:47:56 +0200
Subject: SONAR-5614 Create project permissions and synchronize project issues

---
 .../src/main/java/org/sonar/core/issue/db/IssueMapper.java     |  2 +-
 .../main/java/org/sonar/core/permission/PermissionFacade.java  |  4 ++--
 .../src/main/resources/org/sonar/core/issue/db/IssueMapper.xml | 10 +++++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'sonar-core')

diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueMapper.java b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueMapper.java
index d89868867c7..e09a68c1669 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueMapper.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueMapper.java
@@ -59,5 +59,5 @@ public interface IssueMapper {
 
   int updateIfBeforeSelectedDate(IssueDto issue);
 
-  List<IssueDto> selectAfterDate(Timestamp timestamp);
+  List<IssueDto> selectAfterDate(@Param("date") Timestamp timestamp, @Nullable @Param("project") String project);
 }
diff --git a/sonar-core/src/main/java/org/sonar/core/permission/PermissionFacade.java b/sonar-core/src/main/java/org/sonar/core/permission/PermissionFacade.java
index b2552d5043e..6bf273c5176 100644
--- a/sonar-core/src/main/java/org/sonar/core/permission/PermissionFacade.java
+++ b/sonar-core/src/main/java/org/sonar/core/permission/PermissionFacade.java
@@ -183,11 +183,11 @@ public class PermissionFacade implements TaskComponent, ServerComponent {
     roleDao.deleteUserRolesByResourceId(resourceId, session);
   }
 
-  public List<String> selectGroupPermissions(DbSession session, String group, Long componentId) {
+  public List<String> selectGroupPermissions(DbSession session, String group, @Nullable Long componentId) {
     return roleDao.selectGroupPermissions(session, group, componentId);
   }
 
-  public List<String> selectUserPermissions(DbSession session, String user, Long componentId) {
+  public List<String> selectUserPermissions(DbSession session, String user, @Nullable Long componentId) {
     return roleDao.selectUserPermissions(session, user, componentId);
   }
 
diff --git a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml b/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml
index 9d22edf886e..76fb97eaadf 100644
--- a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml
@@ -139,13 +139,17 @@
           fetchSize="2000"
           statementType="PREPARED"
           resultSetType="FORWARD_ONLY">
-  select
-    <include refid="issueColumns"/>
+    select <include refid="issueColumns"/>
     from issues i
     inner join rules r on r.id=i.rule_id
     inner join projects p on p.id=i.component_id
     inner join projects root on root.id=i.root_component_id
-    where i.updated_at IS NULL or i.updated_at &gt;= #{date}
+    <where>
+    i.updated_at IS NULL or i.updated_at &gt;= #{date}
+    <if test="project != null">
+      and root.kee = #{project}
+    </if>
+    </where>
   </select>
 
   <select id="selectNonClosedIssuesByModule" parameterType="int" resultType="Issue">
-- 
cgit v1.2.3