Skip to content

fix(user): prevent permanent import lockout on unchecked exceptions #3779

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
Priyasharma620064 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(user): prevent permanent import lockout on unchecked exceptions #3779

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 12 additions & 7 deletions backend/users/src/main/java/org/eclipse/sw360/users/db/UserDatabaseHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;

import static org.eclipse.sw360.datahandler.permissions.PermissionUtils.makePermission;
Expand All @@ -59,7 +60,7 @@ public class UserDatabaseHandler {
private static final String SUCCESS = "SUCCESS";
private static final String FAIL = "FAIL";
private static final String TITLE = "IMPORT";
private static boolean IMPORT_DEPARTMENT_STATUS = false;
private static final AtomicBoolean IMPORT_DEPARTMENT_STATUS = new AtomicBoolean(false);
private List<String> departmentDuplicate;
private List<String> emailDoNotExist;
DateFormat dateFormat = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.ENGLISH);
Expand Down Expand Up @@ -169,10 +170,9 @@ public RequestSummary importFileToDB(String pathFolder) {
DepartmentConfigDTO configDTO = readFileDepartmentConfig.readFileJson();
String pathFolderLog = configDTO.getPathFolderLog();
Map<String, List<String>> mapArrayList = new HashMap<>();
if (IMPORT_DEPARTMENT_STATUS) {
if (!IMPORT_DEPARTMENT_STATUS.compareAndSet(false, true)) {
return requestSummary.setRequestStatus(RequestStatus.PROCESSING);
}
IMPORT_DEPARTMENT_STATUS = true;
Calendar calendar = Calendar.getInstance(Locale.getDefault());
String lastRunningTime = dateFormat.format(calendar.getTime());
readFileDepartmentConfig.writeLastRunningTimeConfig(lastRunningTime);
Expand Down Expand Up @@ -207,19 +207,24 @@ public RequestSummary importFileToDB(String pathFolder) {
listFileFail.add(fileName);
}
}
IMPORT_DEPARTMENT_STATUS = false;
requestSummary.setTotalAffectedElements(listFileSuccess.size());
requestSummary.setTotalElements(listFileSuccess.size() + listFileFail.size());
requestSummary.setRequestStatus(RequestStatus.SUCCESS);
} catch (IOException e) {
IMPORT_DEPARTMENT_STATUS = false;
String msg = "Failed to import department";
requestSummary.setMessage(msg);
requestSummary.setRequestStatus(RequestStatus.FAILURE);
FileUtil.writeLogToFile(TITLE, "FILE ERROR: " + e.getMessage(), "", pathFolderLog);
} catch (Exception e) {
String msg = "Unexpected error during department import";
requestSummary.setMessage(msg);
requestSummary.setRequestStatus(RequestStatus.FAILURE);
FileUtil.writeLogToFile(TITLE, "UNEXPECTED ERROR: " + e.getMessage(), "", pathFolderLog);
} finally {
FileUtil.writeLogToFile(TITLE, "[ FILE SUCCESS: " + listFileSuccess.size() + " - " + "FILE FAIL: " + listFileFail.size() + " - " + "TOTAL FILE: " + (listFileSuccess.size() + listFileFail.size()) + " ]", "Complete The File Import", pathFolderLog);
FileUtil.writeLogToFile(TITLE, "END IMPORT DEPARTMENT", "", pathFolderLog);
IMPORT_DEPARTMENT_STATUS.set(false);
}
FileUtil.writeLogToFile(TITLE, "[ FILE SUCCESS: " + listFileSuccess.size() + " - " + "FILE FAIL: " + listFileFail.size() + " - " + "TOTAL FILE: " + (listFileSuccess.size() + listFileFail.size()) + " ]", "Complete The File Import", pathFolderLog);
FileUtil.writeLogToFile(TITLE, "END IMPORT DEPARTMENT", "", pathFolderLog);

return requestSummary;
}
Expand Down