Update APIs with current date and time

Akeela Azhar 1 year ago
parent 36ae6324aa
commit 0eed6064a4

@ -18,12 +18,12 @@
package io.entgra.device.mgt.core.device.mgt.api.jaxrs.service.impl;
import com.google.api.services.sheets.v4.model.ValueRange;
import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
import com.google.api.client.json.jackson2.JacksonFactory;
import com.google.api.services.sheets.v4.Sheets;
import com.google.api.services.sheets.v4.SheetsScopes;
import com.google.api.services.sheets.v4.model.ValueRange;
import com.google.gson.Gson;
import io.entgra.device.mgt.core.apimgt.keymgt.extension.DCRResponse;
import io.entgra.device.mgt.core.apimgt.keymgt.extension.TokenRequest;
@ -104,6 +104,7 @@ import java.io.IOException;
import java.security.GeneralSecurityException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.*;
@Path("/devices")
@ -139,7 +140,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
}
}
private void saveResponseTimeToSpreadsheet(long startTime, long endTime, long responseTime, String message) throws IOException, GeneralSecurityException {
private void saveResponseTimeToSpreadsheet(LocalDateTime date, long startTime, long endTime, long responseTime, String message) throws IOException, GeneralSecurityException {
this.message = message;
// Load credentials from JSON file
GoogleCredential credential = GoogleCredential.fromStream(new FileInputStream("/home/entgra/MyProject/device-mgt-core/components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/test/resources/apicall-382608-48aa6a62800d.json"))
@ -153,10 +154,10 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
// Define the spreadsheet ID and range
String spreadsheetId = "1OZCS5NRwwSum9ai3ra4lABtU0UGW-9yLYgZk-aQfxpw";
String range = "Sheet1!A:D";
String range = "Sheet1!A:E";
// Prepare the values to be written
List<Object> rowValues = Arrays.asList(startTime, endTime, responseTime, message);
List<Object> rowValues = Arrays.asList(date, startTime, endTime, responseTime, message);
List<List<Object>> values = Collections.singletonList(rowValues);
// Build the value range object
@ -482,12 +483,13 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
return Response.status(Response.Status.NOT_FOUND).build();
}
boolean response = deviceManagementProviderService.disenrollDevice(deviceIdentifier);
LocalDateTime date = LocalDateTime.now();
String message = "Delete Device";
long endTime = System.currentTimeMillis(); //end measuring API call response time
long responseTime = endTime - startTime;
// save the start time, end time and response time to google sheet
saveResponseTimeToSpreadsheet(startTime, endTime, responseTime, message);
saveResponseTimeToSpreadsheet(date, startTime, endTime, responseTime, message);
return Response.status(Response.Status.OK).entity(response).build();
} catch (DeviceManagementException e) {
String msg = "Error encountered while deleting requested device of type : " + deviceType;
@ -517,7 +519,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
boolean responseOfDeviceNameChanged = deviceManagementProviderService.sendDeviceNameChangedNotification(
persistedDevice);
boolean response = responseOfmodifyEnrollment && responseOfDeviceNameChanged;
LocalDateTime date = LocalDateTime.now();
String message = "Rename Device";
// End measuring API call response time
@ -525,7 +527,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
long responseTime = endTime - startTime;
// Save the response time, start time, and end time to Google Spreadsheet
saveResponseTimeToSpreadsheet(startTime, endTime, responseTime, message);
saveResponseTimeToSpreadsheet(date, startTime, endTime, responseTime, message);
return Response.status(Response.Status.CREATED).entity(response).build();
} catch (DeviceManagementException e) {

Loading…
Cancel
Save