Enrolment request log json null issue fix, add responseTime Unixtimestamp in enrolment log table

pom.xml

@@ -8,8 +8,8 @@
 		<version>3.3.5</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
-	<groupId>com.example</groupId>
-	<artifactId>Public-Configuration</artifactId>
+	<groupId>io.entgra.proprietary.device.mgt</groupId>
+	<artifactId>public-config</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>Public-Configuration</name>
 	<description>Demo project for Spring Boot</description>
@@ -38,6 +38,11 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.hibernate.validator</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<version>8.0.0.Final</version>
+		</dependency>
 
 		<dependency>
 			<groupId>com.mysql</groupId>

src/main/java/com/example/Public/Configuration/PublicConfigurationApplication.java

@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2018 - 2024 Entgra (Pvt) Ltd, Inc - All Rights Reserved.
+ *
+ * Unauthorised copying/redistribution of this file, via any medium is strictly prohibited.
+ *
+ * Licensed under the Entgra Commercial License, Version 1.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://entgra.io/licenses/entgra-commercial/1.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package com.example.Public.Configuration;
 
 import org.springframework.boot.SpringApplication;
@@ -6,8 +24,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 @SpringBootApplication
 public class PublicConfigurationApplication {
 
-	public static void main(String[] args) {
-		SpringApplication.run(PublicConfigurationApplication.class, args);
-	}
+    public static void main(String[] args) {
+        SpringApplication.run(PublicConfigurationApplication.class, args);
+    }
 
 }

src/main/java/com/example/Public/Configuration/controller/DeviceConfigController.java

@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2018 - 2024 Entgra (Pvt) Ltd, Inc - All Rights Reserved.
+ *
+ * Unauthorised copying/redistribution of this file, via any medium is strictly prohibited.
+ *
+ * Licensed under the Entgra Commercial License, Version 1.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://entgra.io/licenses/entgra-commercial/1.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.example.Public.Configuration.controller;
+
+import com.example.Public.Configuration.model.DeviceConfig;
+import com.example.Public.Configuration.response.Response;
+import com.example.Public.Configuration.service.impl.DeviceConfigServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/deviceConfig")
+public class DeviceConfigController {
+
+    @Autowired  // This annotation is used to inject the DeviceService object into the DeviceController class.
+    private DeviceConfigServiceImpl deviceConfigService;  // This object is used to perform CRUD operations on the Device table in the database.
+
+    @PostMapping("/create-config")  //  add a new device to the database.
+    public ResponseEntity<?> createConfig(@RequestBody DeviceConfig deviceConfig) {
+        DeviceConfig deviceConfigCheck = deviceConfigService.getDeviceConfigById(String.valueOf(deviceConfig.getConfigId()));  // check if the device already exists in the database.// save the device object to the database.
+        if(deviceConfigCheck == null) {
+            deviceConfigService.saveConfigDetails(deviceConfig);  // save the device object to the database.
+            return new ResponseEntity<>(new Response(HttpStatus.CREATED.value(),
+                    "Device added successfully"), HttpStatus.CREATED);  // return a success message.
+
+        }
+        return new ResponseEntity<String>("Device already exists", HttpStatus.BAD_REQUEST); // return a message indicating that the device already exists.
+    }
+
+    @GetMapping("/get-allConfigs")
+    public List<DeviceConfig> getConfigsDevices() {  // get all devices from the database.
+        return deviceConfigService.getAllDeviceConfigs();  // return a list of all devices.
+
+    }
+
+    @GetMapping("/{config_id}")
+    public ResponseEntity<?> fetchConfigByConfigId(@PathVariable String config_id) {  // get a device by its id.
+        DeviceConfig deviceConfig = deviceConfigService.getDeviceConfigById(config_id);
+        if (deviceConfig == null) {
+            return new ResponseEntity<>(new Response(HttpStatus.NOT_FOUND.value(),
+                    "No Device found for Config ID: +config_id"), HttpStatus.NOT_FOUND);// return an empty device object if the device does not exist in the database.
+        }
+        return new ResponseEntity<>(deviceConfig, HttpStatus.OK);  // return the device object if it exists in the database.
+    }
+
+    @PutMapping("/updateDeviceConfig")
+    public DeviceConfig updateDeviceDetails(@RequestBody DeviceConfig deviceConfig) {  // update a device in the database.
+        return deviceConfigService.UpdateConfigDetails(deviceConfig);
+
+    }
+
+    @DeleteMapping("/delete-Config- Device/{configId}")
+    public String deleteDeviceConfigById(@PathVariable String configId) {
+        System.out.println("Deleting Device with Config ID: " + configId); // delete a device from the database.
+        return deviceConfigService.deleteConfigDevice(configId);
+    }
+}

src/main/java/com/example/Public/Configuration/controller/DeviceController.java

@@ -1,8 +1,27 @@
+/*
+ * Copyright (C) 2018 - 2024 Entgra (Pvt) Ltd, Inc - All Rights Reserved.
+ *
+ * Unauthorised copying/redistribution of this file, via any medium is strictly prohibited.
+ *
+ * Licensed under the Entgra Commercial License, Version 1.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://entgra.io/licenses/entgra-commercial/1.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package com.example.Public.Configuration.controller;
 
 import com.example.Public.Configuration.model.Device;
-import com.example.Public.Configuration.response.ResponseMessage;
+import com.example.Public.Configuration.response.Response;
 import com.example.Public.Configuration.service.DeviceService;
+import com.example.Public.Configuration.service.impl.DeviceServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -14,49 +33,45 @@ import java.util.List;
 @RequestMapping("/device")
 public class DeviceController {
 
-    @Autowired
-    private DeviceService deviceService;
+    @Autowired  // This annotation is used to inject the DeviceService object into the DeviceController class.
+    private DeviceServiceImpl deviceService;  // This object is used to perform CRUD operations on the Device table in the database.
 
-
-    @PostMapping("/add")
-
-    public ResponseEntity<?> addDevice(@RequestBody Device device) {
-        Device DeviceExit = deviceService.getDeviceById(device.getDevice_id());
-
-        if (DeviceExit != null) {
-            deviceService.saveDevice(device);
-//        return new ResponseEntity<>("Device Already Exists", HttpStatus.BAD_REQUEST);
-            return new ResponseEntity<>(new ResponseMessage(HttpStatus.CREATED.value(),
-                    "Device Already Exists"), HttpStatus.CREATED);
+    @PostMapping("/create-device")  //  add a new device to the database.
+    public ResponseEntity<?> createDevice(@RequestBody Device device) {
+        Device deviceExist = deviceService.getDeviceById(device.getDevice_id());  // check if the device already exists in the database.// save the device object to the database.
+        if (deviceExist == null) {
+            deviceService.saveDetails(device);  // save the device object to the database.
+            return new ResponseEntity<>(new Response(HttpStatus.CREATED.value(),
+                    "Device added successfully"), HttpStatus.CREATED);  // return a success message.
 
         }
-        return new ResponseEntity<String>("Device Created Successfully", HttpStatus.BAD_REQUEST);
+        return new ResponseEntity<String>("Device already exists", HttpStatus.BAD_REQUEST); // return a message indicating that the device already exists.
     }
 
-    @GetMapping("/get/{id}")
-    public List<Device> getDevice() {
-        return deviceService.getAllDevices();
+    @GetMapping("/get-allDevices")
+    public List<Device> getDevices() {  // get all devices from the database.
+        return deviceService.getAllDevices();  // return a list of all devices.
 
     }
 
-    @GetMapping("/id")
-    public ResponseEntity<?> fetchDeviceById(@PathVariable Long device_id) {
-        Device device = deviceService.getDeviceById(device_id);
+    @GetMapping("/{id}")
+    public ResponseEntity<?> fetchDeviceById(@PathVariable int id) {  // get a device by its id.
+        Device device = deviceService.getDeviceById(id);
         if (device == null) {
-            return new ResponseEntity<>(new ResponseMessage(HttpStatus.NOT_FOUND.value(),
-                    "No Device Found with Id: + device_id"), HttpStatus.CREATED);
-
+            return new ResponseEntity<>(new Response(HttpStatus.NOT_FOUND.value(),
+                    "No Device found for ID: +id"), HttpStatus.NOT_FOUND);// return an empty device object if the device does not exist in the database.
         }
-        return new ResponseEntity<>(device, HttpStatus.OK);
+        return new ResponseEntity<>(device, HttpStatus.OK);  // return the device object if it exists in the database.
     }
-    @PutMapping("/update")
-    public Device updateDevice(@RequestBody Device device) {  // update a device in the database.
-        return deviceService.updateDevice(device);
+
+    @PutMapping("/updateDevice")
+    public Device updateDeviceDetails(@RequestBody Device device) {  // update a device in the database.
+        return deviceService.UpdateDetails(device);
     }
 
     @DeleteMapping("/deleteDevice/{id}")
-    public String deleteByDeviceId(@PathVariable Long device_id) {  // delete a device from the database.
-        return deviceService.deleteDevice(device_id);
+    public String deleteDeviceById(@PathVariable int id) {  // delete a device from the database.
+        return deviceService.deleteDevice(id);
 
     }
 }

src/main/java/com/example/Public/Configuration/controller/EnrolmentRequestController.java

@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2018 - 2024 Entgra (Pvt) Ltd, Inc - All Rights Reserved.
+ *
+ * Unauthorised copying/redistribution of this file, via any medium is strictly prohibited.
+ *
+ * Licensed under the Entgra Commercial License, Version 1.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://entgra.io/licenses/entgra-commercial/1.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.example.Public.Configuration.controller;
+
+import com.example.Public.Configuration.model.EnrolmentRequestLog;
+import com.example.Public.Configuration.response.Response;
+import com.example.Public.Configuration.service.impl.EnrolmentRequestServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/deviceEnrolmentRequest")
+public class EnrolmentRequestController {
+
+    @Autowired  // This annotation is used to inject the DeviceService object into the DeviceController class.
+    private EnrolmentRequestServiceImpl enrolmentRequestService; // This object is used to perform CRUD operations on the Device table in the database.
+
+    @PostMapping("/create-enrolment-request")  //  add a new device to the database.
+    public ResponseEntity<?> createEnrolmentRequest(@RequestBody EnrolmentRequestLog enrolmentRequestLog) {
+        EnrolmentRequestLog deviceEnrolmentRequest = enrolmentRequestService.getByEnrolmentRequestId(enrolmentRequestLog.getImei());  // check if the device already exists in the database.// save the device object to the database.
+        if (deviceEnrolmentRequest == null) {
+            enrolmentRequestService.saveEnrolmentRequest(enrolmentRequestLog);  // save the device object to the database.
+            return new ResponseEntity<>(new Response(HttpStatus.CREATED.value(), "Device added successfully"), HttpStatus.CREATED);  // return a success message.
+        }
+        return new ResponseEntity<String>("Device already exists", HttpStatus.BAD_REQUEST); // return a message indicating that the device already exists.
+    }
+
+    @GetMapping("/get-AllEnrolment-Requests")
+    public List<EnrolmentRequestLog> getDevices() {  // get all devices from the database.
+        return enrolmentRequestService.getAllEnrolmentRequests();  // return a list of all devices.
+
+    }
+
+    @GetMapping("/{enrolmentRequestId}")
+    public ResponseEntity<?> fetchByEnrolmentRequestId(@PathVariable String imei) {  // get a device by its id.
+        EnrolmentRequestLog enrolmentRequestLog = enrolmentRequestService.getByEnrolmentRequestId(imei);
+        if (enrolmentRequestLog == null) {
+            return new ResponseEntity<>(new Response(HttpStatus.NOT_FOUND.value(), "No Device found for Enrolment Request : +imei"), HttpStatus.NOT_FOUND);// return an empty device object if the device does not exist in the database.
+        }
+        return new ResponseEntity<>(enrolmentRequestLog, HttpStatus.OK);  // return the device object if it exists in the database.
+    }
+
+    @DeleteMapping("/delete-EnrolmentRequest/{imei}")
+    public EnrolmentRequestLog deleteByEnrolmentRequestId(@PathVariable String imei) {//delete a device from the database.
+        return enrolmentRequestService.getByEnrolmentRequestId(imei);
+    }
+}

src/main/java/com/example/Public/Configuration/dao/DeviceConfigDao.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2018 - 2024 Entgra (Pvt) Ltd, Inc - All Rights Reserved.
+ *
+ * Unauthorised copying/redistribution of this file, via any medium is strictly prohibited.
+ *
+ * Licensed under the Entgra Commercial License, Version 1.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://entgra.io/licenses/entgra-commercial/1.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.example.Public.Configuration.dao;
+
+import com.example.Public.Configuration.model.DeviceConfig;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface DeviceConfigDao extends JpaRepository<DeviceConfig, Integer> {
+
+    DeviceConfig findByConfigId(String configId);
+
+    void deleteByConfigId(String configId);
+
+}

src/main/java/com/example/Public/Configuration/dao/DeviceDao.java

@@ -1,7 +1,26 @@
+/*
+ * Copyright (C) 2018 - 2024 Entgra (Pvt) Ltd, Inc - All Rights Reserved.
+ *
+ * Unauthorised copying/redistribution of this file, via any medium is strictly prohibited.
+ *
+ * Licensed under the Entgra Commercial License, Version 1.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://entgra.io/licenses/entgra-commercial/1.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package com.example.Public.Configuration.dao;
 
 import com.example.Public.Configuration.model.Device;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface DeviceDao extends JpaRepository<Device, Long> {
+public interface DeviceDao extends JpaRepository<Device, Integer> {
+
 }

src/main/java/com/example/Public/Configuration/dao/EnrolmentRequestLogDao.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2018 - 2024 Entgra (Pvt) Ltd, Inc - All Rights Reserved.
+ *
+ * Unauthorised copying/redistribution of this file, via any medium is strictly prohibited.
+ *
+ * Licensed under the Entgra Commercial License, Version 1.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://entgra.io/licenses/entgra-commercial/1.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.example.Public.Configuration.dao;
+
+import com.example.Public.Configuration.model.EnrolmentRequestLog;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface EnrolmentRequestLogDao extends JpaRepository<EnrolmentRequestLog, Integer> {
+
+    EnrolmentRequestLog findByImei(String imei);
+
+    void deleteByImei(String imei);
+}

src/main/java/com/example/Public/Configuration/dto/EnrolmentRequestDTO.java

@@ -0,0 +1,4 @@
+package com.example.Public.Configuration.dto;
+
+public class EnrolmentRequestDTO {
+}

src/main/java/com/example/Public/Configuration/model/Device.java

@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2018 - 2024 Entgra (Pvt) Ltd, Inc - All Rights Reserved.
+ *
+ * Unauthorised copying/redistribution of this file, via any medium is strictly prohibited.
+ *
+ * Licensed under the Entgra Commercial License, Version 1.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://entgra.io/licenses/entgra-commercial/1.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package com.example.Public.Configuration.model;
 
 import jakarta.persistence.*;
@@ -15,10 +33,10 @@ import java.util.Date;
 public class Device {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
 
-    @Column(name = "Device_id")
-    private Long device_id;
+    @Column(name = "device_id")
+    private int device_id;
 
     @Column(name = "imei")
     private String imei;
@@ -29,22 +47,16 @@ public class Device {
     @Column(name = "update_time")
     private Date update_time;
 
-    @Column(name ="network")
-    private String network;
-
     @Column(name ="MFW_Version")
     private String MFW_Version;
 
-    @Column(name ="LAC")
-    private String LAC;
-
     @Column(name =" device_organiztion")
     private String device_organization;
 
    @Column(name ="MEFW_Version")
    private String MEFW_Version;
 
-   @Column(name ="RSSI")
-    private String RSSI;
-
+//    @OneToMany(targetEntity = DeviceEnrolment.class, cascade = CascadeType.ALL)
+//    @JoinColumn(name = "imei", referencedColumnName = "imei")
+//    private List<DeviceEnrolment> deviceEnrolmentList;
 }

src/main/java/com/example/Public/Configuration/model/DeviceConfig.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2018 - 2024 Entgra (Pvt) Ltd, Inc - All Rights Reserved.
+ *
+ * Unauthorised copying/redistribution of this file, via any medium is strictly prohibited.
+ *
+ * Licensed under the Entgra Commercial License, Version 1.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://entgra.io/licenses/entgra-commercial/1.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.example.Public.Configuration.model;
+
+
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Entity
+@Data
+@Table(name = "device_config")
+@NoArgsConstructor
+@AllArgsConstructor
+public class DeviceConfig {
+
+    @Id
+    @Column(name = "config_profile_id")
+    private String configId;
+
+    @Column(name = "config_profile")
+    private String configProfile;
+
+//    @Column(name = "Network Mode")
+//    private String Network_mode;
+}

src/main/java/com/example/Public/Configuration/model/EnrolmentRequestLog.java

@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2018 - 2024 Entgra (Pvt) Ltd, Inc - All Rights Reserved.
+ *
+ * Unauthorised copying/redistribution of this file, via any medium is strictly prohibited.
+ *
+ * Licensed under the Entgra Commercial License, Version 1.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://entgra.io/licenses/entgra-commercial/1.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.example.Public.Configuration.model;
+
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.Date;
+
+@Entity
+@Data
+@Table(name = "enrolment_request_log")
+@AllArgsConstructor
+public class EnrolmentRequestLog {
+
+
+    @Id
+    @Column(name = "enrolment_request")
+    private String imei;
+    private String device_model;
+    private String ipAddress;
+    private Date update_time;
+    private String network;
+    private String MFW_Version;
+    private String LAC;
+    private String smsPIN;
+    private String subTypeId;
+    private String cellId; //"cellId"
+    private String device_organization;
+    private String MEFW_Version;
+    private String RSSI;
+
+    public EnrolmentRequestLog() {
+    }
+
+    public void setImei(Long imei) {
+        this.imei = String.valueOf(imei);
+    }
+
+    public String getImei() {
+        return imei;
+    }
+}
+
+
+
+
+

src/main/java/com/example/Public/Configuration/response/Response.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2018 - 2024 Entgra (Pvt) Ltd, Inc - All Rights Reserved.
+ *
+ * Unauthorised copying/redistribution of this file, via any medium is strictly prohibited.
+ *
+ * Licensed under the Entgra Commercial License, Version 1.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://entgra.io/licenses/entgra-commercial/1.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.example.Public.Configuration.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Response {
+
+    private int code;
+    private String message;
+
+}

src/main/java/com/example/Public/Configuration/response/ResponseMessage.java

@@ -1,12 +0,0 @@
-package com.example.Public.Configuration.response;
-
-import lombok.AllArgsConstructor;
-
-@AllArgsConstructor
-
-public class ResponseMessage {
-
-    private int status;
-    private String message;
-
-}

src/main/java/com/example/Public/Configuration/service/DeviceConfigService.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2018 - 2024 Entgra (Pvt) Ltd, Inc - All Rights Reserved.
+ *
+ * Unauthorised copying/redistribution of this file, via any medium is strictly prohibited.
+ *
+ * Licensed under the Entgra Commercial License, Version 1.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://entgra.io/licenses/entgra-commercial/1.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.example.Public.Configuration.service;
+
+import com.example.Public.Configuration.model.DeviceConfig;
+
+import java.util.List;
+
+public interface DeviceConfigService {
+
+    DeviceConfig saveConfigDetails(DeviceConfig deviceConfig);
+    List<DeviceConfig> getAllDeviceConfigs();
+    DeviceConfig getDeviceConfigById(String config_id);
+    DeviceConfig UpdateConfigDetails(DeviceConfig deviceConfig);
+    String deleteConfigDevice(String configId);
+
+}

src/main/java/com/example/Public/Configuration/service/DeviceService.java

@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2018 - 2024 Entgra (Pvt) Ltd, Inc - All Rights Reserved.
+ *
+ * Unauthorised copying/redistribution of this file, via any medium is strictly prohibited.
+ *
+ * Licensed under the Entgra Commercial License, Version 1.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://entgra.io/licenses/entgra-commercial/1.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package com.example.Public.Configuration.service;
 
 import com.example.Public.Configuration.model.Device;
@@ -5,16 +23,14 @@ import com.example.Public.Configuration.model.Device;
 import java.util.List;
 
 public interface DeviceService {
-
-    Device saveDevice(Device device);
+    Device saveDetails(Device device);
 
     List<Device> getAllDevices();
 
-    Device getDeviceById(long device_id);
-
-    Device updateDevice(Device device);
+    Device getDeviceByImei(long device_id);
 
-    String deleteDevice(long device_id);
+    Device UpdateDetails(Device device);
 
+    String deleteDevice(int id);
 
 }

src/main/java/com/example/Public/Configuration/service/EnrolmentRequestService.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2018 - 2024 Entgra (Pvt) Ltd, Inc - All Rights Reserved.
+ *
+ * Unauthorised copying/redistribution of this file, via any medium is strictly prohibited.
+ *
+ * Licensed under the Entgra Commercial License, Version 1.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://entgra.io/licenses/entgra-commercial/1.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.example.Public.Configuration.service;
+
+import com.example.Public.Configuration.model.DeviceEnrolment;
+import com.example.Public.Configuration.model.EnrolmentRequestLog;
+
+import java.util.List;
+
+public interface EnrolmentRequestService {
+
+    DeviceEnrolment saveEnrolmentRequest(EnrolmentRequestLog enrolmentRequestLog);
+
+    List<DeviceEnrolment> getAllEnrolmentDevices();
+
+    DeviceEnrolment getDeviceEnrolmentById(String imei);
+
+    String deleteDeviceEnrolment(String imei);
+}
+

src/main/java/com/example/Public/Configuration/service/impl/DeviceConfigServiceImpl.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2018 - 2024 Entgra (Pvt) Ltd, Inc - All Rights Reserved.
+ *
+ * Unauthorised copying/redistribution of this file, via any medium is strictly prohibited.
+ *
+ * Licensed under the Entgra Commercial License, Version 1.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://entgra.io/licenses/entgra-commercial/1.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.example.Public.Configuration.service.impl;
+
+import com.example.Public.Configuration.dao.DeviceConfigDao;
+import com.example.Public.Configuration.model.DeviceConfig;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class DeviceConfigServiceImpl {
+
+    @Autowired
+    private DeviceConfigDao deviceConfigDao; //autowire the deviceDao object
+
+    public void saveConfigDetails(DeviceConfig deviceConfig) {  //used to save the device details in the database
+        deviceConfigDao.save(deviceConfig);
+    }
+
+    public List<DeviceConfig> getAllDeviceConfigs() {
+        return deviceConfigDao.findAll();  // use to command using the deviceDao object to get all the device details from the database
+    }
+
+    public DeviceConfig getDeviceConfigById(String config_id) {
+        return deviceConfigDao.findByConfigId(config_id);  // use to get the device details by id
+    }
+
+    public DeviceConfig UpdateConfigDetails(DeviceConfig deviceConfig) {  //used to update the device details in the database
+        DeviceConfig updatedConfig = deviceConfigDao.findByConfigId(deviceConfig.getConfigId());// get the device details by id
+        if (updatedConfig != null) { // device details are present in the database then update the device details
+            updatedConfig.setConfigProfile(deviceConfig.getConfigProfile());
+            deviceConfigDao.save(updatedConfig);
+        }
+        return updatedConfig;  // return the updated device object
+    }
+
+    public String deleteConfigDevice(String configId) {//used to delete the device details from the database
+        deviceConfigDao.deleteByConfigId(configId);//delete the device details by id
+        return "deleted" + configId;//return the message that the device is deleted
+    }
+
+}

src/main/java/com/example/Public/Configuration/service/impl/DeviceServiceImpl.java

@@ -1,73 +1,68 @@
+/*
+ * Copyright (C) 2018 - 2024 Entgra (Pvt) Ltd, Inc - All Rights Reserved.
+ *
+ * Unauthorised copying/redistribution of this file, via any medium is strictly prohibited.
+ *
+ * Licensed under the Entgra Commercial License, Version 1.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://entgra.io/licenses/entgra-commercial/1.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package com.example.Public.Configuration.service.impl;
 
 import com.example.Public.Configuration.dao.DeviceDao;
 import com.example.Public.Configuration.model.Device;
-import com.example.Public.Configuration.service.DeviceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 
-
 @Service
-public class DeviceServiceImpl implements DeviceService {
-
+public class DeviceServiceImpl {
 
     @Autowired
-    private DeviceDao deviceDao;
+    private DeviceDao deviceDao; //autowire the deviceDao object
 
-    public Device saveDevice(Device device) {
-        return deviceDao.save(device);
+    public void saveDetails(Device device) {  //used to save the device details in the database
+        deviceDao.save(device);
     }
 
     public List<Device> getAllDevices() {
-        return deviceDao.findAll();
-
-    }
-
-    @Override
-    public Device getDeviceById(long device_id) {
-        return null;
-    }
-
-    @Override
-    public Device updateDevice(Device device) {
-        return null;
+        return deviceDao.findAll();  // use to command using
     }
 
-    @Override
-    public String deleteDevice(long device_id) {
-        return "";
+    public Device getDeviceById(int id) {
+        return deviceDao.findById(id).orElse(null);  // use to get the device details by id
     }
 
-    public Device getDeviceById(Long device_id) {
-        return deviceDao.findById(device_id).orElse(null);
-    }
-    public Device UpdateDevice(Device device) {  //used to update the device details in the database
+    public Device UpdateDetails(Device device) {  //used to update the device details in the database
         Device updatedDevice = deviceDao.findById(device.getDevice_id()).orElse(null);  //This command is used to get the device details by id
 
         if (updatedDevice != null) { // device details are present in the database then update the device details
-            updatedDevice.setImei(device.getImei());
+            updatedDevice.setDevice_id(device.getDevice_id());
             updatedDevice.setDevice_model(device.getDevice_model());
             updatedDevice.setUpdate_time(device.getUpdate_time());
-            updatedDevice.setNetwork(device.getNetwork());
             updatedDevice.setMFW_Version(device.getMFW_Version());
-            updatedDevice.setLAC(device.getLAC());
             updatedDevice.setDevice_organization(device.getDevice_organization());
             updatedDevice.setMEFW_Version(device.getMEFW_Version());
-            updatedDevice.setRSSI(device.getRSSI());
             deviceDao.save(updatedDevice);
-        }
-        return updatedDevice;
-    }
-        public String deleteDevice(Long device_id) {
-            deviceDao.deleteById(device_id);
-            return "deleted " +device_id;
-        }
-
-
 
+        }
 
+        return updatedDevice;  // return the updated device object
     }
 
+    public String deleteDevice(int id) {//used to delete the device details from the database
+        deviceDao.deleteById(id);//delete the device details by id
+        return "deleted"  + id;//return the message that the device is deleted
+    }
+}
 

src/main/java/com/example/Public/Configuration/service/impl/EnrolmentRequestServiceImpl.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2018 - 2024 Entgra (Pvt) Ltd, Inc - All Rights Reserved.
+ *
+ * Unauthorised copying/redistribution of this file, via any medium is strictly prohibited.
+ *
+ * Licensed under the Entgra Commercial License, Version 1.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://entgra.io/licenses/entgra-commercial/1.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.example.Public.Configuration.service.impl;
+
+import com.example.Public.Configuration.dao.EnrolmentRequestLogDao;
+import com.example.Public.Configuration.model.EnrolmentRequestLog;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class EnrolmentRequestServiceImpl {
+
+    @Autowired
+    private EnrolmentRequestLogDao enrolmentRequestLogDao;
+
+    public void saveEnrolmentRequest(EnrolmentRequestLog enrolmentRequestLog) {
+        enrolmentRequestLogDao.save(enrolmentRequestLog);
+    }
+
+    public List<EnrolmentRequestLog> getAllEnrolmentRequests() {
+        return enrolmentRequestLogDao.findAll();
+    }
+
+    public EnrolmentRequestLog getByEnrolmentRequestId(String imei) {
+        return enrolmentRequestLogDao.findByImei(imei);
+    }
+    public String deleteByEnrolmentRequestId(String imei) {
+        enrolmentRequestLogDao.deleteByImei(imei);
+        return "deleted" +imei;
+    }
+
+}

src/main/resources/application.properties

@@ -2,8 +2,8 @@ spring.application.name=Public-Configuration
 
 #Specifiy the database URL
 spring.datasource.url=jdbc:mysql://localhost:3306/DM
-spring.datasource.username=kavishka
-spring.datasource.password=Kav@3639
+spring.datasource.username=root
+spring.datasource.password=password
 
 
 #this command will update the database schema if any changes are made to the entity classes