Skip to content

Commit c74cf54

Browse files
dtheilerdtheiler
committed
LL-780
1 parent dc8618d commit c74cf54

File tree

16 files changed

+2164
-1823
lines changed

16 files changed

+2164
-1823
lines changed

‎serv/ss-datatypes/appstacklayout/appstacklayout.datatypes/src/main/java/at/kc/tugraz/sss/appstacklayout/datatypes/SSAppTile.java‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
public class SSAppTile extends SSEntity{
3131

32-
public SSUri appLink = null;
32+
public SSUri app = null;
3333

3434
public static SSAppTile get(
3535
final SSAppTile appTile,
@@ -44,25 +44,25 @@ protected SSAppTile(
4444

4545
super(entity);
4646

47-
this.appLink = appTile.appLink;
47+
this.app = appTile.app;
4848
}
4949

5050
public static SSAppTile get(
5151
final SSUri id,
52-
final SSUri appLink) throws Exception{
52+
final SSUri app) throws Exception{
5353

5454
return new SSAppTile(
5555
id,
56-
appLink);
56+
app);
5757
}
5858

5959
protected SSAppTile(
6060
final SSUri id,
61-
final SSUri appLink) throws Exception{
61+
final SSUri app) throws Exception{
6262

6363
super(id, SSEntityE.appTile);
6464

65-
this.appLink = appLink;
65+
this.app = app;
6666

6767
}
6868

@@ -71,13 +71,14 @@ public Object jsonLDDesc(){
7171

7272
final Map<String, Object> ld = (Map<String, Object>) super.jsonLDDesc();
7373

74-
ld.put(SSVarU.appLink, SSVarU.sss + SSStrU.colon + SSUri.class.getName());
74+
ld.put(SSVarU.app, SSVarU.sss + SSStrU.colon + SSUri.class.getName());
7575

7676
return ld;
7777
}
7878

7979
/* json getters */
80-
public String getAppLink(){
81-
return SSStrU.removeTrailingSlash(appLink);
80+
81+
public String getApp(){
82+
return SSStrU.removeTrailingSlash(app);
8283
}
8384
}

‎serv/ss-datatypes/appstacklayout/appstacklayout.datatypes/src/main/java/at/kc/tugraz/sss/appstacklayout/datatypes/par/SSAppStackLayoutCreatePar.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,10 @@ public SSAppStackLayoutCreatePar(SSServPar par) throws Exception{
101101
}
102102

103103
/* json getters */
104+
public String getApp(){
105+
return SSStrU.removeTrailingSlash(app);
106+
}
107+
104108
public String getLabel(){
105109
return SSStrU.toStr(label);
106110
}

‎serv/ss-datatypes/appstacklayout/appstacklayout.datatypes/src/main/java/at/kc/tugraz/sss/appstacklayout/datatypes/par/SSAppStackLayoutTileAddPar.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
public class SSAppStackLayoutTileAddPar extends SSServPar{
3737

3838
@ApiModelProperty(
39-
required = false,
40-
value = "stack")
39+
required = true,
40+
value = "stack to add this tile")
4141
public SSUri stack = null;
4242

4343
@XmlElement
@@ -48,11 +48,11 @@ public void setStack(final String stack) throws Exception{
4848
@ApiModelProperty(
4949
required = false,
5050
value = "link to the app the tile conains")
51-
public SSUri appLink = null;
51+
public SSUri app = null;
5252

5353
@XmlElement
54-
public void setAppLink(final String appLink) throws Exception{
55-
this.appLink = SSUri.get(appLink);
54+
public void setApp(final String app) throws Exception{
55+
this.app = SSUri.get(app);
5656
}
5757

5858
@ApiModelProperty(
@@ -75,7 +75,7 @@ public SSAppStackLayoutTileAddPar(SSServPar par) throws Exception{
7575

7676
if(pars != null){
7777
stack = (SSUri) pars.get(SSVarU.stack);
78-
appLink = (SSUri) pars.get(SSVarU.appLink);
78+
app = (SSUri) pars.get(SSVarU.app);
7979
label = (SSLabel) pars.get(SSVarU.label);
8080
}
8181

@@ -84,7 +84,7 @@ public SSAppStackLayoutTileAddPar(SSServPar par) throws Exception{
8484
stack = SSUri.get(par.clientJSONObj.get(SSVarU.stack).getTextValue());
8585

8686
try{
87-
appLink = SSUri.get(par.clientJSONObj.get(SSVarU.appLink).getTextValue());
87+
app = SSUri.get(par.clientJSONObj.get(SSVarU.app).getTextValue());
8888
}catch(Exception error){}
8989

9090
try{
@@ -102,8 +102,8 @@ public String getStack(){
102102
return SSStrU.removeTrailingSlash(stack);
103103
}
104104

105-
public String getAppLink(){
106-
return SSStrU.removeTrailingSlash(appLink);
105+
public String getApp(){
106+
return SSStrU.removeTrailingSlash(app);
107107
}
108108

109109
public String getLabel(){

‎serv/ss-datatypes/appstacklayout/appstacklayout.impl/src/main/java/at/kc/tugraz/sss/appstacklayout/impl/SSAppStackLayoutImpl.java‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,19 @@ public SSUri appStackLayoutTileAdd(final SSServPar parA) throws Exception{
170170
null,
171171
false);
172172

173-
// sqlFct.addTile();
173+
if(par.app != null){
174+
175+
SSServCaller.entityEntityToPubCircleAdd(
176+
par.user,
177+
par.app,
178+
SSEntityE.entity,
179+
null,
180+
null,
181+
null,
182+
false);
183+
}
184+
185+
sqlFct.addTile(tileUri, par.stack, par.app);
174186

175187
dbSQL.commit(par.shouldCommit);
176188

‎serv/ss-datatypes/appstacklayout/appstacklayout.impl/src/main/java/at/kc/tugraz/sss/appstacklayout/impl/fct/sql/SSAppStackLayoutSQLFct.java‎

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
import at.kc.tugraz.socialserver.utils.SSSQLVarU;
2424
import at.kc.tugraz.socialserver.utils.SSStrU;
25-
import at.kc.tugraz.ss.datatypes.datatypes.SSTextComment;
2625
import at.kc.tugraz.ss.datatypes.datatypes.entity.SSUri;
2726
import at.kc.tugraz.ss.serv.db.api.SSDBSQLFct;
2827
import at.kc.tugraz.ss.serv.db.api.SSDBSQLI;
@@ -53,7 +52,7 @@ public List<SSAppStackLayout> getAppStackLayouts() throws Exception{
5352

5453
appStackLayouts.add(
5554
SSAppStackLayout.get(
56-
bindingStrToUri (resultSet, SSSQLVarU.appStackLayoutId),
55+
bindingStrToUri (resultSet, SSSQLVarU.stackId),
5756
bindingStrToUri (resultSet, SSSQLVarU.app),
5857
new ArrayList<>()));
5958
}
@@ -68,22 +67,51 @@ public List<SSAppStackLayout> getAppStackLayouts() throws Exception{
6867
}
6968

7069
public void createAppStackLayout(
71-
final SSUri appStackLayout,
70+
final SSUri stack,
7271
final SSUri app) throws Exception{
7372

7473
try{
7574
final Map<String, String> inserts = new HashMap<>();
76-
final Map<String, String> uniqueKeys = new HashMap<>();
7775

7876
if(app == null){
7977
insert (inserts, SSSQLVarU.app, SSStrU.empty);
8078
}else{
8179
insert (inserts, SSSQLVarU.app, app);
8280
}
8381

84-
insert (inserts, SSSQLVarU.appStackLayoutId, appStackLayout);
82+
insert (inserts, SSSQLVarU.stackId, stack);
83+
84+
dbSQL.insert(appStackLayoutTable, inserts);
85+
}catch(Exception error){
86+
SSServErrReg.regErrThrow(error);
87+
}
88+
}
89+
90+
public void addTile(
91+
final SSUri tile,
92+
final SSUri stack,
93+
final SSUri app) throws Exception{
94+
95+
try{
96+
final Map<String, String> inserts = new HashMap<>();
97+
98+
if(app == null){
99+
insert (inserts, SSSQLVarU.app, SSStrU.empty);
100+
}else{
101+
insert (inserts, SSSQLVarU.app, app);
102+
}
103+
104+
insert (inserts, SSSQLVarU.tileId, tile);
105+
106+
dbSQL.insert(appStackLayoutTileTable, inserts);
107+
108+
inserts.clear();
109+
110+
insert (inserts, SSSQLVarU.stackId, stack);
111+
insert (inserts, SSSQLVarU.tileId, tile);
112+
113+
dbSQL.insert(appStackLayoutTilesTable, inserts);
85114

86-
dbSQL.insertIfNotExists(appStackLayoutTable, inserts, uniqueKeys);
87115
}catch(Exception error){
88116
SSServErrReg.regErrThrow(error);
89117
}

‎serv/ss-db/ss-db-api/src/main/java/at/kc/tugraz/ss/serv/db/api/SSDBSQLFct.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,11 @@ public class SSDBSQLFct extends SSDBFct{
9191
protected static final String screenShotsTable = "screenshots";
9292
protected static final String downloadsTable = "downloads";
9393
protected static final String videosTable = "videos";
94-
protected static final String imagesTable = "imagesTable";
94+
protected static final String imagesTable = "images";
9595
protected static final String friendsTable = "friends";
96-
protected static final String appStackLayoutTable = "appStackLayout";
96+
protected static final String appStackLayoutTable = "appstacklayout";
97+
protected static final String appStackLayoutTileTable = "appstacklayouttile";
98+
protected static final String appStackLayoutTilesTable = "appstacklayouttiles";
9799

98100
public SSDBSQLFct(final SSDBSQLI dbSQL) throws Exception{
99101
super();

‎ss-adapter/ss-adapter-rest/src/main/java/at/kc/tugraz/ss/adapter/rest/SSAdapterRest.java‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,10 @@
161161
import at.kc.tugraz.sss.app.datatypes.ret.SSAppAddRet;
162162
import at.kc.tugraz.sss.app.datatypes.ret.SSAppsGetRet;
163163
import at.kc.tugraz.sss.appstacklayout.datatypes.par.SSAppStackLayoutCreatePar;
164+
import at.kc.tugraz.sss.appstacklayout.datatypes.par.SSAppStackLayoutTileAddPar;
164165
import at.kc.tugraz.sss.appstacklayout.datatypes.par.SSAppStackLayoutsGetPar;
165166
import at.kc.tugraz.sss.appstacklayout.datatypes.ret.SSAppStackLayoutCreateRet;
167+
import at.kc.tugraz.sss.appstacklayout.datatypes.ret.SSAppStackLayoutTileAddRet;
166168
import at.kc.tugraz.sss.appstacklayout.datatypes.ret.SSAppStackLayoutsGetRet;
167169
import at.kc.tugraz.sss.flag.datatypes.par.SSFlagsUserGetPar;
168170
import at.kc.tugraz.sss.flag.datatypes.par.SSFlagsUserSetPar;
@@ -1088,12 +1090,23 @@ public String appsGet(final SSAppsGetPar input){
10881090
@Produces(MediaType.APPLICATION_JSON)
10891091
@Path (SSStrU.slash + "appStackLayoutCreate")
10901092
@ApiOperation(
1091-
value = "add an appStackLayout",
1093+
value = "create an arrangement of tiles within an app",
10921094
response = SSAppStackLayoutCreateRet.class)
10931095
public String appStackLayoutCreate(final SSAppStackLayoutCreatePar input){
10941096
return SSRestMain.handleStandardJSONRESTCall(input, SSMethU.appStackLayoutCreate);
10951097
}
10961098

1099+
@POST
1100+
@Consumes(MediaType.APPLICATION_JSON)
1101+
@Produces(MediaType.APPLICATION_JSON)
1102+
@Path (SSStrU.slash + "appStackLayoutTileAdd")
1103+
@ApiOperation(
1104+
value = "add a tile to stack",
1105+
response = SSAppStackLayoutTileAddRet.class)
1106+
public String appStackLayoutTileAdd(final SSAppStackLayoutTileAddPar input){
1107+
return SSRestMain.handleStandardJSONRESTCall(input, SSMethU.appStackLayoutTileAdd);
1108+
}
1109+
10971110
@POST
10981111
@Consumes(MediaType.APPLICATION_JSON)
10991112
@Produces(MediaType.APPLICATION_JSON)

0 commit comments

Comments
 (0)