Skip to content

Commit

Permalink
Fixing a bug with JsonArrays in API
Browse files Browse the repository at this point in the history 
rh-pre-commit.version: 2.0.3
rh-pre-commit.check-secrets: ENABLED
  • Loading branch information
@computate
computate committed Jan 5, 2024
1 parent c1000fb commit 22ce044
Show file tree
Hide file tree
Showing 5 changed files with 98 additions and 94 deletions.
3 changes: 2 additions & 1 deletion src/main/java/org/computate/smartvillage/enus/model/htm/SiteHtmEnUSGenApiServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -962,7 +962,8 @@ public void putimportSiteHtmFuture(JsonObject body, ServiceRequest serviceReques
Object bodyVal = body.getValue(f);
if(bodyVal instanceof JsonArray) {
JsonArray bodyVals = (JsonArray)bodyVal;
Collection<?> vals = bodyVals.getList();
Object valsObj = o.obtainForClass(f);
Collection<?> vals = valsObj instanceof JsonArray ? ((JsonArray)valsObj).getList() : (Collection<?>)valsObj;
if(bodyVals.size() == vals.size()) {
Boolean match = true;
for(Object val : vals) {
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/computate/smartvillage/enus/model/page/SitePageEnUSGenApiServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -902,7 +902,8 @@ public void putimportSitePageFuture(JsonObject body, ServiceRequest serviceReque
Object bodyVal = body.getValue(f);
if(bodyVal instanceof JsonArray) {
JsonArray bodyVals = (JsonArray)bodyVal;
Collection<?> vals = bodyVals.getList();
Object valsObj = o.obtainForClass(f);
Collection<?> vals = valsObj instanceof JsonArray ? ((JsonArray)valsObj).getList() : (Collection<?>)valsObj;
if(bodyVals.size() == vals.size()) {
Boolean match = true;
for(Object val : vals) {
Expand Down
3 changes: 2 additions & 1 deletion .../org/computate/smartvillage/enus/model/system/event/SystemEventEnUSGenApiServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -962,7 +962,8 @@ public void putimportSystemEventFuture(JsonObject body, ServiceRequest serviceRe
Object bodyVal = body.getValue(f);
if(bodyVal instanceof JsonArray) {
JsonArray bodyVals = (JsonArray)bodyVal;
Collection<?> vals = bodyVals.getList();
Object valsObj = o.obtainForClass(f);
Collection<?> vals = valsObj instanceof JsonArray ? ((JsonArray)valsObj).getList() : (Collection<?>)valsObj;
if(bodyVals.size() == vals.size()) {
Boolean match = true;
for(Object val : vals) {
Expand Down
53 changes: 27 additions & 26 deletions src/main/java/org/computate/smartvillage/enus/model/user/SiteUserEnUSGenApiServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -524,14 +524,6 @@ public Future<SiteUser> sqlPATCHSiteUser(SiteUser o, Boolean inheritPk) {
num++;
bParams.add(o2.sqlArchived());
break;
case "setDeleted":
o2.setDeleted(jsonObject.getBoolean(entityVar));
if(bParams.size() > 0)
bSql.append(", ");
bSql.append(SiteUser.VAR_deleted + "=$" + num);
num++;
bParams.add(o2.sqlDeleted());
break;
case "setSessionId":
o2.setSessionId(jsonObject.getString(entityVar));
if(bParams.size() > 0)
Expand All @@ -548,13 +540,13 @@ public Future<SiteUser> sqlPATCHSiteUser(SiteUser o, Boolean inheritPk) {
num++;
bParams.add(o2.sqlUserKey());
break;
case "setSeeDeleted":
o2.setSeeDeleted(jsonObject.getBoolean(entityVar));
case "setDeleted":
o2.setDeleted(jsonObject.getBoolean(entityVar));
if(bParams.size() > 0)
bSql.append(", ");
bSql.append(SiteUser.VAR_seeDeleted + "=$" + num);
bSql.append(SiteUser.VAR_deleted + "=$" + num);
num++;
bParams.add(o2.sqlSeeDeleted());
bParams.add(o2.sqlDeleted());
break;
case "setUserId":
o2.setUserId(jsonObject.getString(entityVar));
Expand Down Expand Up @@ -612,6 +604,14 @@ public Future<SiteUser> sqlPATCHSiteUser(SiteUser o, Boolean inheritPk) {
num++;
bParams.add(o2.sqlSeeArchived());
break;
case "setSeeDeleted":
o2.setSeeDeleted(jsonObject.getBoolean(entityVar));
if(bParams.size() > 0)
bSql.append(", ");
bSql.append(SiteUser.VAR_seeDeleted + "=$" + num);
num++;
bParams.add(o2.sqlSeeDeleted());
break;
}
}
bSql.append(" WHERE pk=$" + num);
Expand Down Expand Up @@ -924,15 +924,6 @@ public Future<Void> sqlPOSTSiteUser(SiteUser o, Boolean inheritPk) {
num++;
bParams.add(o2.sqlArchived());
break;
case SiteUser.VAR_deleted:
o2.setDeleted(jsonObject.getBoolean(entityVar));
if(bParams.size() > 0) {
bSql.append(", ");
}
bSql.append(SiteUser.VAR_deleted + "=$" + num);
num++;
bParams.add(o2.sqlDeleted());
break;
case SiteUser.VAR_sessionId:
o2.setSessionId(jsonObject.getString(entityVar));
if(bParams.size() > 0) {
Expand All @@ -951,14 +942,14 @@ public Future<Void> sqlPOSTSiteUser(SiteUser o, Boolean inheritPk) {
num++;
bParams.add(o2.sqlUserKey());
break;
case SiteUser.VAR_seeDeleted:
o2.setSeeDeleted(jsonObject.getBoolean(entityVar));
case SiteUser.VAR_deleted:
o2.setDeleted(jsonObject.getBoolean(entityVar));
if(bParams.size() > 0) {
bSql.append(", ");
}
bSql.append(SiteUser.VAR_seeDeleted + "=$" + num);
bSql.append(SiteUser.VAR_deleted + "=$" + num);
num++;
bParams.add(o2.sqlSeeDeleted());
bParams.add(o2.sqlDeleted());
break;
case SiteUser.VAR_userId:
o2.setUserId(jsonObject.getString(entityVar));
Expand Down Expand Up @@ -1023,6 +1014,15 @@ public Future<Void> sqlPOSTSiteUser(SiteUser o, Boolean inheritPk) {
num++;
bParams.add(o2.sqlSeeArchived());
break;
case SiteUser.VAR_seeDeleted:
o2.setSeeDeleted(jsonObject.getBoolean(entityVar));
if(bParams.size() > 0) {
bSql.append(", ");
}
bSql.append(SiteUser.VAR_seeDeleted + "=$" + num);
num++;
bParams.add(o2.sqlSeeDeleted());
break;
}
}
}
Expand Down Expand Up @@ -1219,7 +1219,8 @@ public void putimportSiteUserFuture(JsonObject body, ServiceRequest serviceReque
Object bodyVal = body.getValue(f);
if(bodyVal instanceof JsonArray) {
JsonArray bodyVals = (JsonArray)bodyVal;
Collection<?> vals = bodyVals.getList();
Object valsObj = o.obtainForClass(f);
Collection<?> vals = valsObj instanceof JsonArray ? ((JsonArray)valsObj).getList() : (Collection<?>)valsObj;
if(bodyVals.size() == vals.size()) {
Boolean match = true;
for(Object val : vals) {
Expand Down
130 changes: 65 additions & 65 deletions src/main/resources/templates/enUS/MapResultGenPage.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -525,15 +525,6 @@
<!-- BooleanUtils.isFalse(entiteHtmLigneVerticale) -->
<div class="w3-cell-row HtmRow">
{{#ifContainsAnyRoles roles roleForWrite}}
{{> "htmTime" roleForWriteBool="true" roleForReadBool="true"}}
{{else}}
{{#ifContainsAnyRoles roles roleForRead}}
{{> "htmTime" roleForWriteBool="false" roleForReadBool="true"}}
{{else}}
{{> "htmTime" roleForWriteBool="false" roleForReadBool="false"}}
{{/ifContainsAnyRoles}}
{{/ifContainsAnyRoles}}
{{#ifContainsAnyRoles roles roleForWrite}}
{{> "htmDateTime" roleForWriteBool="true" roleForReadBool="true"}}
{{else}}
{{#ifContainsAnyRoles roles roleForRead}}
Expand All @@ -552,6 +543,15 @@
{{/ifContainsAnyRoles}}
{{/ifContainsAnyRoles}}
{{#ifContainsAnyRoles roles roleForWrite}}
{{> "htmTime" roleForWriteBool="true" roleForReadBool="true"}}
{{else}}
{{#ifContainsAnyRoles roles roleForRead}}
{{> "htmTime" roleForWriteBool="false" roleForReadBool="true"}}
{{else}}
{{> "htmTime" roleForWriteBool="false" roleForReadBool="false"}}
{{/ifContainsAnyRoles}}
{{/ifContainsAnyRoles}}
{{#ifContainsAnyRoles roles roleForWrite}}
{{> "htmLocation" roleForWriteBool="true" roleForReadBool="true"}}
{{else}}
{{#ifContainsAnyRoles roles roleForRead}}
Expand Down Expand Up @@ -1073,62 +1073,6 @@
{{/eq}}
{{/inline}}
{{#*inline "htmTime"}}
<!-- #*inline "htmTime" -->
<div class="w3-cell w3-cell-top w3-center w3-mobile ">
<div class="w3-padding ">
<div id="suggest{{classApiMethodMethod}}MapResultTime">
<div class="w3-card ">
<div class="w3-cell-row w3-2017-shaded-spruce">
<label for="{{classApiMethodMethod}}_time">Time in seconds</label>
</div>
<div class="w3-cell-row w3-padding ">
<div class="w3-cell ">
{{> "inputTime" roleForWrite=roleForWrite roleForRead=roleForRead}}
</div>
</div>
</div>
</div>
</div>
</div>
{{/inline}}
{{#*inline "inputTime"}}
{{#eq roleForWriteBool "true"}}
<input
type="text"
placeholder="Time in seconds"
title="The time in seconds. " id="{{classApiMethodMethod}}_time"
{{#eq "Page" classApiMethodMethod}}
class="{{classApiMethodMethod}}_time setTime classMapResult inputMapResult{{id}}Time w3-input w3-border "
name="setTime"
{{else}}
{{#eq "PATCH" classApiMethodMethod}}
class="{{classApiMethodMethod}}_time setTime classMapResult inputMapResult{{id}}Time w3-input w3-border "
name="setTime"
{{else}}
{{classApiMethodMethod}}_time" class="valueTime w3-input w3-border classMapResult inputMapResult{{id}}Time w3-input w3-border "
name="time"
{{/eq}}
{{/eq}}
{{#eq "Page" classApiMethodMethod}}
onclick="removeGlow($(this)); "
onchange="patch{{classSimpleName}}Val([{ name: 'softCommit', value: 'true' }, { name: 'fq', value: 'id:{{id}}' }], 'setTime', $(this).val(), function() { addGlow($('#{{classApiMethodMethod}}_time')); }, function() { addError($('#{{classApiMethodMethod}}_time')); }); "
{{/eq}}
{{#eq "Page" classApiMethodMethod}}
value="{{mapResult_.time}}"
{{/eq}}
/>

{{else}}
{{#ifContainsKeys userKeys}}
<span class="varMapResult{{id}}Time varMapResultTime ">{{mapResult_.time}}</span>
{{/ifContainsKeys}}
{{else}}
<span class="varMapResult{{id}}Time varMapResultTime ">{{mapResult_.time}}</span>
{{/eq}}
{{/inline}}

{{#*inline "htmDateTime"}}
<!-- #*inline "htmDateTime" -->
<div class="w3-cell w3-cell-top w3-center w3-mobile ">
Expand Down Expand Up @@ -1241,6 +1185,62 @@
{{/eq}}
{{/inline}}
{{#*inline "htmTime"}}
<!-- #*inline "htmTime" -->
<div class="w3-cell w3-cell-top w3-center w3-mobile ">
<div class="w3-padding ">
<div id="suggest{{classApiMethodMethod}}MapResultTime">
<div class="w3-card ">
<div class="w3-cell-row w3-2017-shaded-spruce">
<label for="{{classApiMethodMethod}}_time">Time in seconds</label>
</div>
<div class="w3-cell-row w3-padding ">
<div class="w3-cell ">
{{> "inputTime" roleForWrite=roleForWrite roleForRead=roleForRead}}
</div>
</div>
</div>
</div>
</div>
</div>
{{/inline}}
{{#*inline "inputTime"}}
{{#eq roleForWriteBool "true"}}
<input
type="text"
placeholder="Time in seconds"
title="The time in seconds. " id="{{classApiMethodMethod}}_time"
{{#eq "Page" classApiMethodMethod}}
class="{{classApiMethodMethod}}_time setTime classMapResult inputMapResult{{id}}Time w3-input w3-border "
name="setTime"
{{else}}
{{#eq "PATCH" classApiMethodMethod}}
class="{{classApiMethodMethod}}_time setTime classMapResult inputMapResult{{id}}Time w3-input w3-border "
name="setTime"
{{else}}
{{classApiMethodMethod}}_time" class="valueTime w3-input w3-border classMapResult inputMapResult{{id}}Time w3-input w3-border "
name="time"
{{/eq}}
{{/eq}}
{{#eq "Page" classApiMethodMethod}}
onclick="removeGlow($(this)); "
onchange="patch{{classSimpleName}}Val([{ name: 'softCommit', value: 'true' }, { name: 'fq', value: 'id:{{id}}' }], 'setTime', $(this).val(), function() { addGlow($('#{{classApiMethodMethod}}_time')); }, function() { addError($('#{{classApiMethodMethod}}_time')); }); "
{{/eq}}
{{#eq "Page" classApiMethodMethod}}
value="{{mapResult_.time}}"
{{/eq}}
/>

{{else}}
{{#ifContainsKeys userKeys}}
<span class="varMapResult{{id}}Time varMapResultTime ">{{mapResult_.time}}</span>
{{/ifContainsKeys}}
{{else}}
<span class="varMapResult{{id}}Time varMapResultTime ">{{mapResult_.time}}</span>
{{/eq}}
{{/inline}}

{{#*inline "htmLocation"}}
<!-- #*inline "htmLocation" -->
<div class="w3-cell w3-cell-top w3-center w3-mobile ">
Expand Down

0 comments on commit 22ce044

Please sign in to comment.