community
/
device-mgt-core
12
0
Fork 47
Code Issues Pull Requests 26 Packages Projects Releases Wiki Activity

Assign device to user when enrolling a device

Browse Source
merge-requests/899/head
Rushdi Mohamed 3 years ago
parent 2ebc24985a
commit 74adeda997
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File

32
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/api/service/addons/TraccarClientImpl.java
Unescape View File

@ -160,8 +160,11 @@ public class TraccarClientImpl implements TraccarClient {
log.info("============================="); log.info("=============================");
log.info(new Gson().toJson(traccarUser)); log.info(new Gson().toJson(traccarUser));
log.info("============================="); log.info("=============================");
//device is available
//device is not available
//user is available
//user is not available
fetchAllUsers(TraccarHandlerConstants.Types.USER_CREATE_WITH_INSERT_DEVICE, traccarUser, traccarId); fetchAllUsers(TraccarHandlerConstants.Types.USER_CREATE_WITH_INSERT_DEVICE, traccarUser, traccarId);
} }
}else if(type==TraccarHandlerConstants.Types.GROUP){ }else if(type==TraccarHandlerConstants.Types.GROUP){
trackerDAO.addTrackerGroup(traccarId, groupId, tenantId); trackerDAO.addTrackerGroup(traccarId, groupId, tenantId);
@ -193,13 +196,13 @@ public class TraccarClientImpl implements TraccarClient {
TrackerManagementDAOFactory.rollbackTransaction(); TrackerManagementDAOFactory.rollbackTransaction();
String msg = null; String msg = null;
if(type==TraccarHandlerConstants.Types.DEVICE){ if(type==TraccarHandlerConstants.Types.DEVICE){
msg = "Error occurred while mapping with deviceId ."; msg = "Already device with deviceId " + deviceId + " exists" ;
}else if(type==TraccarHandlerConstants.Types.GROUP){ }else if(type==TraccarHandlerConstants.Types.GROUP){
msg = "Error occurred while mapping with groupId ."; msg = "Already the group with groupId - " + groupId + " exists!";
}else if(type==TraccarHandlerConstants.Types.USER){ }else if(type==TraccarHandlerConstants.Types.USER){
msg = "Error occurred while fetching users ."; msg = "Error occurred while fetching users.";
}else if(type==TraccarHandlerConstants.Types.PERMISSION){ }else if(type==TraccarHandlerConstants.Types.PERMISSION){
msg = "Error occurred while assigning the device to the user ."; msg = "Error occurred while assigning the device to the user." + traccarId + deviceId;
} }
log.error(msg, e); log.error(msg, e);
} finally { } finally {
@ -218,6 +221,7 @@ public class TraccarClientImpl implements TraccarClient {
JSONArray fetchAllUsers = new JSONArray(result); JSONArray fetchAllUsers = new JSONArray(result);
int userAvailability = 0; int userAvailability = 0;
int userId = 0;
for(int i=0; i<fetchAllUsers.length();i++){ for(int i=0; i<fetchAllUsers.length();i++){
if(fetchAllUsers.getJSONObject(i).getString("login").equals(username)){ if(fetchAllUsers.getJSONObject(i).getString("login").equals(username)){
@ -226,25 +230,29 @@ public class TraccarClientImpl implements TraccarClient {
userAvailability=1; userAvailability=1;
log.info(fetchAllUsers.getJSONObject(i)); log.info(fetchAllUsers.getJSONObject(i));
log.info(new Gson().toJson(fetchAllUsers.getJSONObject(i))); log.info(new Gson().toJson(fetchAllUsers.getJSONObject(i)));
log.info("Username "+ fetchAllUsers.getJSONObject(i).getString("login")+"___"+username);
log.info("Token: "+fetchAllUsers.getJSONObject(i).getString("token")); log.info("Token: "+fetchAllUsers.getJSONObject(i).getString("token"));
userId = fetchAllUsers.getJSONObject(i).getInt("id");
break; break;
} }
} }
if(type==TraccarHandlerConstants.Types.USER_CREATE_WITH_INSERT_DEVICE){ if(type==TraccarHandlerConstants.Types.USER_CREATE_WITH_INSERT_DEVICE){
if(userAvailability==0){ if(userAvailability==0){
log.info("Creating User");
log.info("============");
log.info(payload);
log.info("============"); log.info("============");
log.info("Creating User");
TraccarUser traccarUser = (TraccarUser) payload.get("data"); TraccarUser traccarUser = (TraccarUser) payload.get("data");
log.info("============");
log.info(traccarUser); log.info(traccarUser);
log.info("============"); log.info("============");
createUser(traccarUser, type, deviceId); createUser(traccarUser, type, deviceId);
log.info("Creating User"); }else{
if(userId!=0){
log.info("=============");
log.info("User inserted and setting to create session");
log.info("=============");
setPermission(userId, deviceId);
}else{
log.info("UserId is null");
}
} }
}else if(type==TraccarHandlerConstants.Types.USER_CREATE){ }else if(type==TraccarHandlerConstants.Types.USER_CREATE){
/*if(userAvailability==1){ /*if(userAvailability==1){

Write Preview
Loading…
Cancel
Save