diff options
| author | Simon Rettberg | 2018-12-07 16:12:05 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2018-12-07 16:12:05 +0100 |
| commit | f0f2b96a906a2eb20c40f4ac1109cf848a59bc52 (patch) | |
| tree | 159f3522b68cbd5444da41f6ada28c18fc1a47d6 | |
| parent | [server] Use designated method to ensure user is logged in (diff) | |
| download | tutor-module-f0f2b96a906a2eb20c40f4ac1109cf848a59bc52.tar.gz tutor-module-f0f2b96a906a2eb20c40f4ac1109cf848a59bc52.tar.xz tutor-module-f0f2b96a906a2eb20c40f4ac1109cf848a59bc52.zip | |
[server] ImageSummary: Fill fileSizeSum and versionCount
| -rw-r--r-- | dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java index 0a948249..3ee4f5d3 100644 --- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java +++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java @@ -63,9 +63,11 @@ public class DbImage { + " i.caneditdefault, i.canadmindefault," + " lat.expiretime, lat.filesize, lat.isrestricted, lat.isvalid," + " lat.uploaderid, lat.isprocessed, lat.createtime AS uploadtime," - + " perm.canlink, perm.candownload, perm.canedit, perm.canadmin" + + " perm.canlink, perm.candownload, perm.canedit, perm.canadmin," + + " Sum(allv.filesize) AS filesizesum, Count(allv.*) AS versioncount" + " FROM imagebase i" + " LEFT JOIN imageversion lat ON (lat.imageversionid = i.latestversionid)" + + " LEFT JOIN imageversion allv ON (allv.imagebaseid = i.imagebaseid)" + " LEFT JOIN imagepermission perm ON (i.imagebaseid = perm.imagebaseid AND perm.userid = :userid)" + Paginator.limitStatement(page)); stmt.setString("userid", user.userId); @@ -192,6 +194,12 @@ public class DbImage { rs.getByte("isrestricted") != 0, rs.getByte("isvalid") != 0, rs.getByte("isprocessed") != 0, rs.getByte("istemplate") != 0, defaultPermissions); entry.userPermissions = DbImagePermissions.fromResultSetUser(rs); + try { + entry.setFileSizeSum(rs.getLong("filesizesum")); + entry.setVersionCount(rs.getInt("versioncount")); + } catch (SQLException e) { + // Ignore, not set + } User.setCombinedUserPermissions(entry, user); return entry; } |