Skip to content

Commit d36040e

Browse files
dtheilerdtheiler
committed
LL-163
* possibility to add comments via call entityUpdate * added comments field to SSEntity * adding comments to disc entries in call discUserWithEntriesGet * removed deprecated call entityLabelSet * added call entityCommentsGet * added comments field to SSEntityDescA * providing comments for call entityDescGet * added tables comment and comments * new entity type comment
1 parent 5461c33 commit d36040e

File tree

25 files changed

+466
-225
lines changed

25 files changed

+466
-225
lines changed

‎serv/jobs/ss-dataimport/ss-dataimport-impl/src/main/java/at/kc/tugraz/ss/serv/dataimport/impl/evernote/SSDataImportEvernoteHelper.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import at.kc.tugraz.socialserver.utils.SSLogU;
2525
import at.kc.tugraz.socialserver.utils.SSStrU;
2626
import at.kc.tugraz.ss.conf.conf.SSCoreConf;
27+
import at.kc.tugraz.ss.datatypes.datatypes.SSTextComment;
2728
import at.kc.tugraz.ss.datatypes.datatypes.enums.SSEntityE;
2829
import at.kc.tugraz.ss.datatypes.datatypes.label.SSLabel;
2930
import at.kc.tugraz.ss.datatypes.datatypes.entity.SSUri;
@@ -144,6 +145,7 @@ private void addNotebook(
144145
notebookUri,
145146
notebookLabel,
146147
null,
148+
SSTextComment.asListWithoutNullAndEmpty(),
147149
false);
148150

149151
SSServCaller.entityEntitiesToCircleAdd(
@@ -444,6 +446,7 @@ private void addNote(
444446
noteUri,
445447
noteLabel,
446448
null,
449+
SSTextComment.asListWithoutNullAndEmpty(),
447450
false);
448451

449452
SSServCaller.entityEntitiesToCircleAdd(
@@ -536,6 +539,7 @@ private void addResource(
536539
resourceUri,
537540
resourceLabel,
538541
null,
542+
SSTextComment.asListWithoutNullAndEmpty(),
539543
false);
540544

541545
SSServCaller.entityEntitiesToCircleAdd(

‎serv/serv-serv/serv-caller/src/main/java/at/kc/tugraz/ss/serv/serv/caller/SSServCaller.java‎

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,8 +1003,20 @@ public static Integer ratingUserGet(
10031003

10041004
/* entity */
10051005

1006+
public static List<SSTextComment> entityCommentsGet(
1007+
final SSUri user,
1008+
final SSUri entity) throws Exception{
1009+
1010+
final Map<String, Object> opPars = new HashMap<>();
1011+
1012+
opPars.put(SSVarU.user, user);
1013+
opPars.put(SSVarU.entity, entity);
1014+
1015+
return (List<SSTextComment>) SSServA.callServViaServer(new SSServPar(SSMethU.entityCommentsGet, opPars));
1016+
}
1017+
10061018
public static List<SSEntity> entityEntitiesAttachedGet(
1007-
final SSUri user,
1019+
final SSUri user,
10081020
final SSUri entity) throws Exception{
10091021

10101022
final Map<String, Object> opPars = new HashMap<>();
@@ -1088,35 +1100,39 @@ public static void entityThumbAdd(
10881100
}
10891101

10901102
public static void entityUserUpdate(
1091-
final SSUri entity,
1092-
final SSLabel label,
1093-
final SSTextComment description,
1094-
final Boolean shouldCommit) throws Exception{
1103+
final SSUri entity,
1104+
final SSLabel label,
1105+
final SSTextComment description,
1106+
final List<SSTextComment> comments,
1107+
final Boolean shouldCommit) throws Exception{
10951108

10961109
final Map<String, Object> opPars = new HashMap<>();
10971110

10981111
opPars.put(SSVarU.entity, entity);
10991112
opPars.put(SSVarU.label, label);
11001113
opPars.put(SSVarU.description, description);
1114+
opPars.put(SSVarU.comments, comments);
11011115
opPars.put(SSVarU.shouldCommit, shouldCommit);
11021116

11031117
SSServA.callServViaServer(new SSServPar(SSMethU.entityUserUpdate, opPars));
11041118
}
11051119

1106-
public static void entityUpdate(
1107-
final SSUri entity,
1108-
final SSLabel label,
1109-
final SSTextComment description,
1110-
final Boolean shouldCommit) throws Exception{
1120+
public static SSUri entityUpdate(
1121+
final SSUri entity,
1122+
final SSLabel label,
1123+
final SSTextComment description,
1124+
final List<SSTextComment> comments,
1125+
final Boolean shouldCommit) throws Exception{
11111126

11121127
final Map<String, Object> opPars = new HashMap<>();
11131128

11141129
opPars.put(SSVarU.entity, entity);
11151130
opPars.put(SSVarU.label, label);
11161131
opPars.put(SSVarU.description, description);
1132+
opPars.put(SSVarU.comments, comments);
11171133
opPars.put(SSVarU.shouldCommit, shouldCommit);
11181134

1119-
SSServA.callServViaServer(new SSServPar(SSMethU.entityUpdate, opPars));
1135+
return (SSUri) SSServA.callServViaServer(new SSServPar(SSMethU.entityUpdate, opPars));
11201136
}
11211137

11221138
public static Boolean entityUserCopy(

‎serv/ss-datatypes/ss-coll/ss-coll-datatypes/src/main/java/at/kc/tugraz/ss/service/coll/datatypes/SSColl.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
*/
2121
package at.kc.tugraz.ss.service.coll.datatypes;
2222

23+
import at.kc.tugraz.ss.datatypes.datatypes.SSTextComment;
2324
import at.kc.tugraz.ss.datatypes.datatypes.entity.SSUri;
2425
import at.kc.tugraz.ss.datatypes.datatypes.enums.SSEntityE;
2526
import at.kc.tugraz.ss.datatypes.datatypes.label.SSLabel;
@@ -35,9 +36,10 @@ public static SSColl get(
3536
final SSUri author,
3637
final SSLabel label,
3738
final List<SSCircleE> circleTypes,
38-
final List<SSEntity> attachedEntities) throws Exception{
39+
final List<SSEntity> attachedEntities,
40+
final List<SSTextComment> comments) throws Exception{
3941

40-
return new SSColl(id, entries, author, label, circleTypes, attachedEntities);
42+
return new SSColl(id, entries, author, label, circleTypes, attachedEntities, comments);
4143
}
4244

4345
private SSColl(
@@ -46,7 +48,8 @@ private SSColl(
4648
final SSUri author,
4749
final SSLabel label,
4850
final List<SSCircleE> circleTypes,
49-
final List<SSEntity> attachedEntities) throws Exception{
51+
final List<SSEntity> attachedEntities,
52+
final List<SSTextComment> comments) throws Exception{
5053

5154
super(
5255
id,
@@ -57,7 +60,8 @@ private SSColl(
5760
null,
5861
circleTypes,
5962
entries,
60-
attachedEntities);
63+
attachedEntities,
64+
comments);
6165
}
6266

6367
public static SSColl[] toCollArray(Collection<SSColl> toConvert) {

‎serv/ss-datatypes/ss-coll/ss-coll-impl/src/main/java/at/kc/tugraz/ss/service/coll/impl/SSCollImpl.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -722,6 +722,7 @@ public List<SSColl> collUserHierarchyGet(final SSServPar parA) throws Exception{
722722
null,
723723
SSServCaller.entityGet(collUri).label,
724724
null,
725+
null,
725726
null));
726727
}
727728

‎serv/ss-datatypes/ss-coll/ss-coll-impl/src/main/java/at/kc/tugraz/ss/service/coll/impl/fct/sql/SSCollSQLFct.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,7 @@ public List<SSColl> getCollsPublic() throws Exception{
286286
bindingStrToUri (resultSet, SSSQLVarU.author),
287287
bindingStrToLabel (resultSet, SSSQLVarU.label),
288288
null,
289+
null,
289290
null));
290291
}
291292

@@ -612,6 +613,7 @@ private SSColl getColl(
612613
bindingStrToUri (resultSet, SSSQLVarU.author),
613614
bindingStrToLabel (resultSet, SSSQLVarU.label),
614615
circleTypes,
616+
null,
615617
null);
616618

617619
}catch(Exception error){

‎serv/ss-datatypes/ss-disc/ss-disc-datatypes/src/main/java/at/kc/tugraz/ss/service/disc/datatypes/SSDisc.java‎

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -32,34 +32,36 @@
3232

3333
public class SSDisc extends SSEntity {
3434

35-
public SSUri entity = null;
35+
public SSUri entity = null;
3636

3737
public static SSDisc get(
38-
final SSUri id,
39-
final SSLabel label,
40-
final SSUri author,
41-
final SSUri entity,
42-
final SSEntityE type,
43-
final List<SSDiscEntry> entries,
44-
final SSTextComment explanation,
45-
final Long creationTime,
46-
final List<SSCircleE> circleTypes,
47-
final List<SSEntity> attachedEntities) throws Exception{
38+
final SSUri id,
39+
final SSLabel label,
40+
final SSUri author,
41+
final SSUri entity,
42+
final SSEntityE type,
43+
final List<SSDiscEntry> entries,
44+
final SSTextComment explanation,
45+
final Long creationTime,
46+
final List<SSCircleE> circleTypes,
47+
final List<SSEntity> attachedEntities,
48+
final List<SSTextComment> comments) throws Exception{
4849

49-
return new SSDisc(id, label, author, entity, type, entries, explanation, creationTime, circleTypes, attachedEntities);
50+
return new SSDisc(id, label, author, entity, type, entries, explanation, creationTime, circleTypes, attachedEntities, comments);
5051
}
5152

5253
private SSDisc(
53-
final SSUri id,
54-
final SSLabel label,
55-
final SSUri author,
56-
final SSUri entity,
57-
final SSEntityE type,
58-
final List<SSDiscEntry> entries,
59-
final SSTextComment description,
60-
final Long creationTime,
61-
final List<SSCircleE> circleTypes,
62-
final List<SSEntity> attachedEntities) throws Exception{
54+
final SSUri id,
55+
final SSLabel label,
56+
final SSUri author,
57+
final SSUri entity,
58+
final SSEntityE type,
59+
final List<SSDiscEntry> entries,
60+
final SSTextComment description,
61+
final Long creationTime,
62+
final List<SSCircleE> circleTypes,
63+
final List<SSEntity> attachedEntities,
64+
final List<SSTextComment> comments) throws Exception{
6365

6466
super(
6567
id,
@@ -70,7 +72,8 @@ private SSDisc(
7072
description,
7173
circleTypes,
7274
entries,
73-
attachedEntities);
75+
attachedEntities,
76+
comments);
7477

7578
this.entity = entity;
7679
}

‎serv/ss-datatypes/ss-disc/ss-disc-datatypes/src/main/java/at/kc/tugraz/ss/service/disc/datatypes/SSDiscEntry.java‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,10 @@ public static SSDiscEntry get(
4242
final SSTextComment content,
4343
final Long creationTime,
4444
final List<SSEntity> attachedEntities,
45-
final SSUri author) throws Exception{
45+
final SSUri author,
46+
final List<SSTextComment> comments) throws Exception{
4647

47-
return new SSDiscEntry(id, type, pos, content, creationTime, attachedEntities, author);
48+
return new SSDiscEntry(id, type, pos, content, creationTime, attachedEntities, author, comments);
4849
}
4950

5051
private SSDiscEntry(
@@ -54,7 +55,8 @@ private SSDiscEntry(
5455
final SSTextComment content,
5556
final Long creationTime,
5657
final List<SSEntity> attachedEntities,
57-
final SSUri author) throws Exception{
58+
final SSUri author,
59+
final List<SSTextComment> comments) throws Exception{
5860

5961
super(
6062
id,
@@ -65,7 +67,8 @@ private SSDiscEntry(
6567
null,
6668
null,
6769
null,
68-
attachedEntities);
70+
attachedEntities,
71+
comments);
6972

7073
this.pos = pos;
7174
this.content = content;

‎serv/ss-datatypes/ss-disc/ss-disc-impl/src/main/java/at/kc/tugraz/ss/service/disc/impl/SSDiscImpl.java‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,8 @@ public SSDisc discUserWithEntriesGet(final SSServPar parA) throws Exception{
388388

389389
try{
390390
final SSDiscUserWithEntriesGetPar par = new SSDiscUserWithEntriesGetPar(parA);
391+
SSDiscEntry discEntry;
392+
391393

392394
if(!SSServCaller.entityUserCanRead(par.user, par.disc)){
393395
throw new Exception("user cannot access disc");
@@ -397,15 +399,22 @@ public SSDisc discUserWithEntriesGet(final SSServPar parA) throws Exception{
397399

398400
disc.attachedEntities.addAll(
399401
SSServCaller.entityEntitiesAttachedGet(
400-
par.user,
402+
par.user,
401403
disc.id));
402404

403405
for(Object entry : disc.entries){
404406

405-
((SSDiscEntry) entry).attachedEntities.addAll(
407+
discEntry = (SSDiscEntry) entry;
408+
409+
discEntry.attachedEntities.addAll(
406410
SSServCaller.entityEntitiesAttachedGet(
407411
par.user,
408-
((SSDiscEntry) entry).id));
412+
discEntry.id));
413+
414+
discEntry.comments.addAll(
415+
SSServCaller.entityCommentsGet(
416+
par.user,
417+
discEntry.id));
409418
}
410419

411420
return disc;

‎serv/ss-datatypes/ss-disc/ss-disc-impl/src/main/java/at/kc/tugraz/ss/service/disc/impl/fct/sql/SSDiscSQLFct.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,7 @@ public SSDisc getDiscWithoutEntries(
355355
SSTextComment.get(bindingStr(resultSet, SSSQLVarU.description)),
356356
bindingStrToLong(resultSet, SSSQLVarU.creationTime),
357357
null,
358+
null,
358359
null);
359360

360361
}catch(Exception error){
@@ -461,7 +462,8 @@ public SSDisc getDiscWithEntries(
461462
SSTextComment.get (bindingStr(resultSet, SSSQLVarU.discEntryContent)),
462463
bindingStrToLong (resultSet, SSSQLVarU.creationTime),
463464
null,
464-
bindingStrToUri (resultSet, SSSQLVarU.author)));
465+
bindingStrToUri (resultSet, SSSQLVarU.author),
466+
null));
465467
}
466468

467469
disc.entries.addAll(discEntries);

‎serv/ss-datatypes/ss-entity/ss-entity-api/src/main/java/at/kc/tugraz/ss/serv/datatypes/entity/api/SSEntityServerI.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
*/
2121
package at.kc.tugraz.ss.serv.datatypes.entity.api;
2222

23+
import at.kc.tugraz.ss.datatypes.datatypes.SSTextComment;
2324
import at.kc.tugraz.ss.datatypes.datatypes.entity.SSEntityDescA;
2425
import at.kc.tugraz.ss.serv.datatypes.SSServPar;
2526
import at.kc.tugraz.ss.datatypes.datatypes.entity.SSUri;
@@ -32,7 +33,6 @@ public interface SSEntityServerI {
3233

3334
public SSEntity entityUserGet (final SSServPar parA) throws Exception;
3435
public SSEntityDescA entityDescGet (final SSServPar parA) throws Exception;
35-
public SSUri entityLabelSet (final SSServPar parA) throws Exception;
3636
public SSUri entityUserCircleCreate (final SSServPar parA) throws Exception;
3737
public SSUri entityUserUsersToCircleAdd (final SSServPar parA) throws Exception;
3838
public SSUri entityUserEntitiesToCircleAdd (final SSServPar parA) throws Exception;
@@ -52,6 +52,7 @@ public interface SSEntityServerI {
5252

5353
public List<SSEntity> entityEntitiesAttachedGet (final SSServPar parA) throws Exception;
5454
public SSUri entityFileAdd (final SSServPar parA) throws Exception;
55+
public List<SSTextComment> entityCommentsGet (final SSServPar parA) throws Exception;
5556
public List<SSUri> entityFilesGet (final SSServPar parA) throws Exception;
5657
public SSUri entityThumbAdd (final SSServPar parA) throws Exception;
5758
public List<SSUri> entityThumbsGet (final SSServPar parA) throws Exception;

0 commit comments

Comments
 (0)