Skip to content

Nd/vs/sync role #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vanitha1822 wants to merge 2 commits into
base: release-3.6.0
Choose a base branch
from
+9 −12
Open

Nd/vs/sync role #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a43e6f1
fix: add role nurse for datasync
vanitha1822 Feb 18, 2026
ab9c948
fix: datasync issue
vanitha1822 Feb 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
<sonar.jacoco.reportPath>${project.basedir}/../target/jacoco.exec</sonar.jacoco.reportPath>
<sonar.language>java</sonar.language>
<maven.test.skip>true</maven.test.skip>

</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/iemr/mmu/controller/dataSyncActivity/StartSyncActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
*/
@RestController
@RequestMapping(value = "/dataSyncActivity", headers = "Authorization", consumes = "application/json", produces = "application/json")
@PreAuthorize("hasRole('DATASYNC') || hasRole('DATA_SYNC') ")
@PreAuthorize("hasRole('DATASYNC') || hasRole('DATA_SYNC') || hasRole('NURSE') ")
public class StartSyncActivity {
private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/iemr/mmu/controller/dataSyncLayerCentral/MMUDataSyncVanToServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
*/
@RestController
@RequestMapping(value = "/dataSync", headers = "Authorization")
@PreAuthorize("hasRole('DATASYNC') || hasRole('DATA_SYNC') ")
@PreAuthorize("hasRole('DATASYNC') || hasRole('DATA_SYNC') || hasRole('NURSE') ")
public class MMUDataSyncVanToServer {
private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/iemr/mmu/service/dataSyncLayerCentral/GetDataFromVanAndSyncToDBImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ private boolean performGenericTableSync(SyncUploadDataDigester syncUploadDataDig

List<Object> currentRecordValues = new ArrayList<>();
for (String column : serverColumnsList) {
logger.info("Column="+column);
logger.debug("Column="+column);
Object value = cleanRecord.get(column.trim());
// CRITICAL FIX: Don't convert null to string
if (value == null) {
Expand Down
13 changes: 4 additions & 9 deletions src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,8 @@ logging.level.org.apache.tomcat.jdbc.pool=DEBUG

# Connection timeout - time to establish connection
spring.mvc.async.request-timeout=600000
# HTTP client timeouts for RestTemplate
rest.connection.timeout=60000
rest.read.timeout=600000
rest.socket.timeout=600000


# ============= SERVER TIMEOUT =============
# Tomcat connection timeout
server.connection-timeout=600000
server.tomcat.connection-timeout=600000
# ============= SERVER TIMEOUT (Undertow) =============
# Undertow settings (the actual server in use - WildFly/JBoss)
server.undertow.no-request-timeout=600000
server.undertow.max-http-post-size=-1
Loading