Skip to content

Commit 26f59b6

Browse files
eisbilireisbilir
committed
fix roles list
1 parent 1aa3c91 commit 26f59b6

File tree

17 files changed

+20
-19
lines changed

17 files changed

+20
-19
lines changed

‎online-review-ajax-support/src/test/java/com/cronos/onlinereview/ajax/accuracytests/MockResourceManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public Resource getResource(long id) {
3838

3939
}
4040

41-
public Resource[] getResourcesByProjects(Long[] projectIds) throws ResourcePersistenceException {
41+
public Resource[] getResourcesByProjects(Long[] projectIds, long userId) throws ResourcePersistenceException {
4242
return null;
4343
}
4444

‎online-review-ajax-support/src/test/java/com/cronos/onlinereview/ajax/failuretests/mock/MockResourceManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ public ResourceRole[] getAllResourceRoles() {
228228
*
229229
* @throws ResourcePersistenceException If there is an error reading the persistence store
230230
*/
231-
public Resource[] getResourcesByProjects(Long[] projectIds) throws ResourcePersistenceException {
231+
public Resource[] getResourcesByProjects(Long[] projectIds, long userId) throws ResourcePersistenceException {
232232
return null;
233233
}
234234

‎online-review-ajax-support/src/test/java/com/topcoder/management/resource/MockResourceManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public Resource getResource(long id) throws ResourcePersistenceException {
127127
*
128128
* @throws ResourcePersistenceException If there is an error reading the persistence store
129129
*/
130-
public Resource[] getResourcesByProjects(Long[] projectIds) throws ResourcePersistenceException {
130+
public Resource[] getResourcesByProjects(Long[] projectIds, long userId) throws ResourcePersistenceException {
131131
return null;
132132
}
133133

‎online-review-phases/src/test/java/com/cronos/onlinereview/phases/failuretests/mock/MockResourceManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ public void removeResource(Resource resource0, String string0) throws ResourcePe
205205
*
206206
* @throws ResourcePersistenceException If there is an error reading the persistence store
207207
*/
208-
public Resource[] getResourcesByProjects(Long[] projectIds) throws ResourcePersistenceException {
208+
public Resource[] getResourcesByProjects(Long[] projectIds, long userId) throws ResourcePersistenceException {
209209
return null;
210210
}
211211

‎online-review-phases/src/test/java/com/cronos/onlinereview/phases/failuretests/mock/MockResourcePersistence.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ public Resource loadResource(long long0) throws ResourcePersistenceException {
240240
*
241241
* @throws ResourcePersistenceException If there is an error reading the persistence store
242242
*/
243-
public Resource[] getResourcesByProjects(Long[] projectIds, Map<Long, ResourceRole> roles) throws ResourcePersistenceException {
243+
public Resource[] getResourcesByProjects(Long[] projectIds, long userId, Map<Long, ResourceRole> roles) throws ResourcePersistenceException {
244244
return null;
245245
}
246246

‎online-review-upload-services/src/test/java/com/cronos/onlinereview/services/uploads/accuracytests/MockResourceManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public Resource getResource(long id) {
6161
*
6262
* @throws ResourcePersistenceException If there is an error reading the persistence store
6363
*/
64-
public Resource[] getResourcesByProjects(Long[] projectIds) throws ResourcePersistenceException {
64+
public Resource[] getResourcesByProjects(Long[] projectIds, long userId) throws ResourcePersistenceException {
6565
return null;
6666
}
6767

‎online-review-upload-services/src/test/java/com/cronos/onlinereview/services/uploads/failuretests/MockResourceManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public Resource[] searchResources(Filter filter) {
7373
*
7474
* @throws ResourcePersistenceException If there is an error reading the persistence store
7575
*/
76-
public Resource[] getResourcesByProjects(Long[] projectIds) throws ResourcePersistenceException {
76+
public Resource[] getResourcesByProjects(Long[] projectIds, long userId) throws ResourcePersistenceException {
7777
return null;
7878
}
7979

‎online-review-upload-services/src/test/java/com/cronos/onlinereview/services/uploads/impl/MockResourceManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public Resource[] searchResources(Filter filter) {
8888
*
8989
* @throws ResourcePersistenceException If there is an error reading the persistence store
9090
*/
91-
public Resource[] getResourcesByProjects(Long[] projectIds) throws ResourcePersistenceException {
91+
public Resource[] getResourcesByProjects(Long[] projectIds, long userId) throws ResourcePersistenceException {
9292
return null;
9393
}
9494

‎resource-management-persistence/src/main/java/com/topcoder/management/resource/persistence/sql/AbstractResourcePersistence.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public abstract class AbstractResourcePersistence implements ResourcePersistence
148148
"SELECT r.resource_id, r.project_id, r.project_phase_id, r.resource_role_id"
149149
+ " FROM resource r"
150150
+ " LEFT JOIN project p ON r.project_id = p.project_id"
151-
+ " WHERE p.project_id IN (";
151+
+ " WHERE r.user_id = ? AND p.project_id IN (";
152152

153153
/**
154154
* <p>
@@ -904,7 +904,7 @@ public void updateResource(Resource resource) throws ResourcePersistenceExceptio
904904
*
905905
* @throws ResourcePersistenceException If there is an error reading the persistence store
906906
*/
907-
public Resource[] getResourcesByProjects(Long[] projectIds, Map<Long, ResourceRole> roles) throws ResourcePersistenceException {
907+
public Resource[] getResourcesByProjects(Long[] projectIds, long userId, Map<Long, ResourceRole> roles) throws ResourcePersistenceException {
908908
LOGGER.log(Level.DEBUG, "Getting resources by project Ids");
909909
Connection connection = openConnection();
910910

@@ -919,6 +919,7 @@ public Resource[] getResourcesByProjects(Long[] projectIds, Map<Long, ResourceRo
919919
query.append(String.join(",", Arrays.stream(projectIds).map(x -> x.toString()).collect(Collectors.toList())));
920920
query.append(")");
921921
statement = connection.prepareStatement(query.toString());
922+
statement.setLong(1, userId);
922923
rs = statement.executeQuery();
923924
while (rs.next()) {
924925
long resourceId = rs.getLong(1);

‎resource-management-persistence/src/test/java/com/topcoder/management/resource/persistence/sql/ResourceBean.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ public Resource loadResource(long resourceId) throws ResourcePersistenceExceptio
267267
*
268268
* @throws ResourcePersistenceException If there is an error reading the persistence store
269269
*/
270-
public Resource[] getResourcesByProjects(Long[] projectIds, Map<Long, ResourceRole> roles) throws ResourcePersistenceException {
270+
public Resource[] getResourcesByProjects(Long[] projectIds, long userId, Map<Long, ResourceRole> roles) throws ResourcePersistenceException {
271271
return null;
272272
}
273273

‎resource-management/src/main/java/com/topcoder/management/resource/ResourceManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public Resource[] searchResources(Filter filter)
144144
*
145145
* @throws ResourcePersistenceException If there is an error reading the persistence store
146146
*/
147-
public Resource[] getResourcesByProjects(Long[] projectIds) throws ResourcePersistenceException;
147+
public Resource[] getResourcesByProjects(Long[] projectIds, long userId) throws ResourcePersistenceException;
148148

149149
/**
150150
* <p>

‎resource-management/src/main/java/com/topcoder/management/resource/persistence/PersistenceResourceManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -813,7 +813,7 @@ public Resource[] searchResources(Filter filter) throws ResourcePersistenceExcep
813813
*
814814
* @throws ResourcePersistenceException If there is an error reading the persistence store
815815
*/
816-
public Resource[] getResourcesByProjects(Long[] projectIds) throws ResourcePersistenceException {
816+
public Resource[] getResourcesByProjects(Long[] projectIds, long userId) throws ResourcePersistenceException {
817817

818818
Helper.checkNull(projectIds, "projectIds");
819819

@@ -824,7 +824,7 @@ public Resource[] getResourcesByProjects(Long[] projectIds) throws ResourcePersi
824824
cachedRoles.put(role.getId(), role);
825825
}
826826

827-
return persistence.getResourcesByProjects(projectIds, cachedRoles);
827+
return persistence.getResourcesByProjects(projectIds, userId, cachedRoles);
828828
}
829829

830830
/**

‎resource-management/src/main/java/com/topcoder/management/resource/persistence/ResourcePersistence.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public interface ResourcePersistence {
118118
*
119119
* @throws ResourcePersistenceException If there is an error reading the persistence store
120120
*/
121-
public Resource[] getResourcesByProjects(Long[] projectIds, Map<Long, ResourceRole> roles) throws ResourcePersistenceException;
121+
public Resource[] getResourcesByProjects(Long[] projectIds, long userId, Map<Long, ResourceRole> roles) throws ResourcePersistenceException;
122122

123123
/**
124124
* <p>

‎resource-management/src/test/java/com/topcoder/management/resource/accuracytests/MockSqlResourcePersistence.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public void addResource(Resource resource) {
133133
*
134134
* @throws ResourcePersistenceException If there is an error reading the persistence store
135135
*/
136-
public Resource[] getResourcesByProjects(Long[] projectIds, Map<Long, ResourceRole> roles) throws ResourcePersistenceException {
136+
public Resource[] getResourcesByProjects(Long[] projectIds, long userId, Map<Long, ResourceRole> roles) throws ResourcePersistenceException {
137137
return null;
138138
}
139139

‎resource-management/src/test/java/com/topcoder/management/resource/failuretests/persistence/FailureResourcePersistence.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void addResource(Resource resource) throws ResourcePersistenceException {
5353
*
5454
* @throws ResourcePersistenceException If there is an error reading the persistence store
5555
*/
56-
public Resource[] getResourcesByProjects(Long[] projectIds, Map<Long, ResourceRole> roles) throws ResourcePersistenceException {
56+
public Resource[] getResourcesByProjects(Long[] projectIds, long userId, Map<Long, ResourceRole> roles) throws ResourcePersistenceException {
5757
return null;
5858
}
5959

‎resource-management/src/test/java/com/topcoder/management/resource/persistence/MockResourcePersistenceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public Resource loadResource(long resourceId) {
146146
*
147147
* @throws ResourcePersistenceException If there is an error reading the persistence store
148148
*/
149-
public Resource[] getResourcesByProjects(Long[] projectIds, Map<Long, ResourceRole> roles) throws ResourcePersistenceException {
149+
public Resource[] getResourcesByProjects(Long[] projectIds, long userId, Map<Long, ResourceRole> roles) throws ResourcePersistenceException {
150150
return null;
151151
}
152152

‎resource-management/src/test/java/com/topcoder/management/resource/stresstests/MockResourcePersistence.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public Resource loadResource(long resourceId) throws ResourcePersistenceExceptio
110110
*
111111
* @throws ResourcePersistenceException If there is an error reading the persistence store
112112
*/
113-
public Resource[] getResourcesByProjects(Long[] projectIds, Map<Long, ResourceRole> roles) throws ResourcePersistenceException {
113+
public Resource[] getResourcesByProjects(Long[] projectIds, long userId, Map<Long, ResourceRole> roles) throws ResourcePersistenceException {
114114
return null;
115115
}
116116

0 commit comments

Comments
 (0)