diff --git a/MySQL_conf_pbx/test1/mariadb_data/ib_logfile0 b/MySQL_conf_pbx/test1/mariadb_data/ib_logfile0 index 74a6ad8..e837822 100644 Binary files a/MySQL_conf_pbx/test1/mariadb_data/ib_logfile0 and b/MySQL_conf_pbx/test1/mariadb_data/ib_logfile0 differ diff --git a/MySQL_conf_pbx/test1/springCezenPBX/src/main/java/com/example/cezenPBX/DAO/BasicAsteriskOpsDAO.java b/MySQL_conf_pbx/test1/springCezenPBX/src/main/java/com/example/cezenPBX/DAO/BasicAsteriskOpsDAO.java index f1ee799..125b507 100644 --- a/MySQL_conf_pbx/test1/springCezenPBX/src/main/java/com/example/cezenPBX/DAO/BasicAsteriskOpsDAO.java +++ b/MySQL_conf_pbx/test1/springCezenPBX/src/main/java/com/example/cezenPBX/DAO/BasicAsteriskOpsDAO.java @@ -3,6 +3,7 @@ package com.example.cezenPBX.DAO; import com.example.cezenPBX.entity.PsEndPoints; import jakarta.persistence.Entity; import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; @@ -16,8 +17,10 @@ public class BasicAsteriskOpsDAO implements CezenPbxOpsDAO { // takes the required data from the service class and persists the entity to the database // returns true if operation was carried out without an exception @Override + @Transactional public boolean addNewEndPoint(PsEndPoints psEndPoints) { + // if there is an exception in the transaction try{ this.entityManager.persist(psEndPoints); }catch (Exception e){ diff --git a/MySQL_conf_pbx/test1/springCezenPBX/src/main/java/com/example/cezenPBX/controller/CezenPbxController.java b/MySQL_conf_pbx/test1/springCezenPBX/src/main/java/com/example/cezenPBX/controller/CezenPbxController.java index a4f336f..a74f66e 100644 --- a/MySQL_conf_pbx/test1/springCezenPBX/src/main/java/com/example/cezenPBX/controller/CezenPbxController.java +++ b/MySQL_conf_pbx/test1/springCezenPBX/src/main/java/com/example/cezenPBX/controller/CezenPbxController.java @@ -22,6 +22,22 @@ public class CezenPbxController { System.out.println(psEndPointsRecordDTO); - return false; + // now pass the DTO data to the service + + return this.basicPbxServiceInterface.createANewEndpointService( + psEndPointsRecordDTO.id(), + psEndPointsRecordDTO.transport(), + psEndPointsRecordDTO.aors(), + psEndPointsRecordDTO.auth(), + psEndPointsRecordDTO.context(), + psEndPointsRecordDTO.disallow(), + psEndPointsRecordDTO.allow(), + psEndPointsRecordDTO.directMedia(), + psEndPointsRecordDTO.connectedLineMethod(), + psEndPointsRecordDTO.callerid(), + psEndPointsRecordDTO.dtmfMode(), + psEndPointsRecordDTO.mohsuggest(), + psEndPointsRecordDTO.mailboxes() + ); } } diff --git a/MySQL_conf_pbx/test1/springCezenPBX/src/main/java/com/example/cezenPBX/entity/PsEndPoints.java b/MySQL_conf_pbx/test1/springCezenPBX/src/main/java/com/example/cezenPBX/entity/PsEndPoints.java index a9a38b3..af7cb57 100644 --- a/MySQL_conf_pbx/test1/springCezenPBX/src/main/java/com/example/cezenPBX/entity/PsEndPoints.java +++ b/MySQL_conf_pbx/test1/springCezenPBX/src/main/java/com/example/cezenPBX/entity/PsEndPoints.java @@ -1,9 +1,11 @@ package com.example.cezenPBX.entity; import jakarta.persistence.Column; +import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Table; +@Entity @Table(name = "ps_endpoints") public class PsEndPoints { diff --git a/MySQL_conf_pbx/test1/springCezenPBX/src/main/java/com/example/cezenPBX/service/BasicPbxService.java b/MySQL_conf_pbx/test1/springCezenPBX/src/main/java/com/example/cezenPBX/service/BasicPbxService.java index eb7ec4d..eb41ce8 100644 --- a/MySQL_conf_pbx/test1/springCezenPBX/src/main/java/com/example/cezenPBX/service/BasicPbxService.java +++ b/MySQL_conf_pbx/test1/springCezenPBX/src/main/java/com/example/cezenPBX/service/BasicPbxService.java @@ -35,6 +35,12 @@ public class BasicPbxService implements BasicPbxServiceInterface { mailboxes ); - return cezenPbxOpsDAO.addNewEndPoint(psEndPoints); + // if there is an exception in the entity or transaction + try{ + return cezenPbxOpsDAO.addNewEndPoint(psEndPoints); + }catch (Exception e) { + System.out.println(e); + return false; + } } } diff --git a/MySQL_conf_pbx/test1/springCezenPBX/src/main/resources/application.properties b/MySQL_conf_pbx/test1/springCezenPBX/src/main/resources/application.properties index 1843c44..48cb15e 100644 --- a/MySQL_conf_pbx/test1/springCezenPBX/src/main/resources/application.properties +++ b/MySQL_conf_pbx/test1/springCezenPBX/src/main/resources/application.properties @@ -2,9 +2,9 @@ spring.application.name=cezenPBX server.port=8081 #server.port=8088 -#spring.datasource.url = jdbc:mariadb://localhost:3308/asterisk_db -#spring.datasource.username = asterisk_user -#spring.datasource.password = 12345 +spring.datasource.url = jdbc:mariadb://localhost:3308/asterisk_db +spring.datasource.username = asterisk_user +spring.datasource.password = 12345 logging.level.org.hibernate.SQL=DEBUG logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE