Skip to content

Commit 46eef5e

Browse files
moustaphahennawibenjaminperez
authored andcommitted
chore(directory): INTEG-1018 add INE in class/:classId/users
1 parent 30f6575 commit 46eef5e

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

directory/src/main/java/org/entcore/directory/controllers/ClassController.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ public void findUsers(final HttpServerRequest request) {
153153
final String classId = request.params().get("classId");
154154
JsonArray types = new JsonArray(request.params().getAll("type"));
155155
boolean collectRelative = "true".equals(request.params().get("collectRelative"));
156+
boolean ine = "true".equals(request.params().get("ine"));
156157
Handler<Either<String, JsonArray>> handler;
157158
if ("csv".equals(request.params().get("format"))) {
158159
handler = new Handler<Either<String, JsonArray>>() {
@@ -191,7 +192,7 @@ public void handle(Either<String, JsonObject> c) {
191192
} else {
192193
handler = arrayResponseHandler(request);
193194
}
194-
classService.findUsers(classId, types, collectRelative, handler);
195+
classService.findUsers(classId, types, collectRelative, ine, handler);
195196
}
196197

197198
@Put("/class/add-self")

directory/src/main/java/org/entcore/directory/services/ClassService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public interface ClassService {
3434

3535
void remove(String classId, Handler<Either<String, JsonObject>> result);
3636

37-
void findUsers(String classId, JsonArray expectedTypes, boolean collectRelative, Handler<Either<String, JsonArray>> results);
37+
void findUsers(String classId, JsonArray expectedTypes, boolean collectRelative, boolean ine, Handler<Either<String, JsonArray>> results);
3838

3939
void get(String classId, Handler<Either<String, JsonObject>> result);
4040

directory/src/main/java/org/entcore/directory/services/impl/DefaultClassService.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ public void remove(String classId, Handler<Either<String, JsonObject>> result) {
7777
}
7878

7979
@Override
80-
public void findUsers(String classId, JsonArray expectedTypes, boolean collectRelative,
81-
Handler<Either<String, JsonArray>> results) {
80+
public void findUsers(String classId, JsonArray expectedTypes, boolean collectRelative,
81+
boolean ine, Handler<Either<String, JsonArray>> results) {
8282
JsonObject params = new JsonObject().put("classId", classId);
8383
//=== Filter by type
8484
String filterPart = "";
@@ -100,6 +100,9 @@ public void findUsers(String classId, JsonArray expectedTypes, boolean collectRe
100100
"RETURN distinct m.lastName as lastName, m.firstName as firstName, m.id as id, " +
101101
"(LENGTH(m.email)>0 AND EXISTS(m.email)) as hasEmail, " +
102102
"CASE WHEN m.loginAlias IS NOT NULL THEN m.loginAlias ELSE m.login END as login, m.login as originalLogin, m.activationCode as activationCode, m.displayName as displayName, m.birthDate as birthDate, m.lastLogin as lastLogin, " +
103+
(ine
104+
? "m.ine as ine, "
105+
: "") +
103106
"p.name as type, m.blocked as blocked, m.source as source, relativeList " +
104107
"ORDER BY type, lastName ";
105108
neo.execute(query, params, validResultHandler(results));

0 commit comments

Comments
 (0)