return sysdef if no entries

main
Said Gedik 2023-10-09 11:29:11 +02:00
parent cbab417ada
commit 00b0000791
2 changed files with 20 additions and 9 deletions

View File

@ -5,6 +5,7 @@ import java.util.ArrayList;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.checkerframework.common.util.report.qual.ReportCall; import org.checkerframework.common.util.report.qual.ReportCall;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.CrossOrigin;
@ -34,10 +35,8 @@ import com.nttdata.calender.packageType.PackageType;
import com.nttdata.calender.planTimes.CalendarWeek; import com.nttdata.calender.planTimes.CalendarWeek;
import com.nttdata.calender.planTimes.PlanTimes; import com.nttdata.calender.planTimes.PlanTimes;
import com.nttdata.calender.planTimes.PlanTimesRequest; import com.nttdata.calender.planTimes.PlanTimesRequest;
import com.nttdata.calender.presets.Preset;
import com.nttdata.calender.presets.Presets; import com.nttdata.calender.presets.Presets;
import com.nttdata.calender.presets.PresetsGetResponse; import com.nttdata.calender.presets.PresetsGetResponse;
import com.nttdata.calender.presets.UserPreferences;
import com.nttdata.calender.states.State; import com.nttdata.calender.states.State;
import com.nttdata.calender.states.StateChange; import com.nttdata.calender.states.StateChange;
import com.nttdata.calender.states.StateChangeRequest; import com.nttdata.calender.states.StateChangeRequest;
@ -301,7 +300,7 @@ public class KalenderRestController {
@CrossOrigin("*") @CrossOrigin("*")
@GetMapping("api/initPresets") @GetMapping("api/initPresets")
@ResponseBody @ResponseBody
public PresetsGetResponse initPresets() throws ARException, NotFoundError { public Object initPresets() throws ARException, NotFoundError {
Presets presets = new Presets(javaAPI); Presets presets = new Presets(javaAPI);
return presets.initPresets(); return presets.initPresets();
} }

View File

@ -5,6 +5,7 @@ import java.util.List;
import com.bmc.arsys.api.ARException; import com.bmc.arsys.api.ARException;
import com.bmc.arsys.api.Entry; import com.bmc.arsys.api.Entry;
import com.bmc.thirdparty.org.springframework.beans.factory.annotation.Autowired;
import com.nttdata.calender.api.Query; import com.nttdata.calender.api.Query;
import com.nttdata.calender.api.RemedyJavaAPI; import com.nttdata.calender.api.RemedyJavaAPI;
import com.nttdata.calender.errorhandling.ErrorTypes.NotFoundError; import com.nttdata.calender.errorhandling.ErrorTypes.NotFoundError;
@ -17,6 +18,7 @@ public class Presets {
private RemedyJavaAPI api; private RemedyJavaAPI api;
private List<Preset> presets; private List<Preset> presets;
@Autowired
public Presets(RemedyJavaAPI api) throws ARException, NotFoundError { public Presets(RemedyJavaAPI api) throws ARException, NotFoundError {
this.api = api; this.api = api;
@ -42,21 +44,31 @@ public class Presets {
.build(); .build();
this.presets = new ArrayList<>(); this.presets = new ArrayList<>();
allPresets(); // allPresets();
} }
public PresetsGetResponse initPresets() throws ARException { public Object initPresets() throws ARException, NotFoundError {
List<Entry> entries = api.queryFieldsById("\'2\'==\"" + api.getUser() + "\"", query.getFieldIds(), formName, null, List<Entry> entries = api.queryFieldsById("\'2\'==\"" + api.getUser() + "\"", query.getFieldIds(), formName,
null,
0, 0); 0, 0);
PresetsGetResponse response = new PresetsGetResponse(); PresetsGetResponse response = new PresetsGetResponse();
if (entries.isEmpty() || entries == null) { if (entries.isEmpty() || entries == null) {
var sysdef = api.queryFieldsById("\'364000001\'==\"Systemdefault\"", defQuery.getFieldIds(), var sysdef = api.queryFieldsById("\'364000001\'==\"Systemdefault\"", defQuery.getFieldIds(),
formDefault, null, 0, 0); formDefault, null, 0, 0).get(0);
return new Preset(sysdef.get(defQuery.getFieldId("InstanceId")).toString(),
sysdef.get(defQuery.getFieldId("Name")).toString(),
sysdef.get(defQuery.getFieldId("Definition")).toString(), "Admin");
} else { } else {
System.out.println(entries); allPresets();
response.setPresets(presets);
response.setSelectedPreset(presets.get(0));
response.setUserPreferences(new UserPreferences(entries.get(0).get(query.getFieldId("Details")).toString(),
entries.get(0).get(query.getFieldId("View")).toString(),
entries.get(0).get(query.getFieldId("Language")).toString()));
} }
return response; return response;
} }
public void allPresets() throws ARException, NotFoundError { public void allPresets() throws ARException, NotFoundError {