micord/ervu-lkrp-ul
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'hotfix/1.9.5' into develop

Browse source
This commit is contained in:
gulnaz 2025-01-15 17:42:22 +03:00
commit 5169b5802d
2 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
backend/src/main/java/ervu/controller/EmployeeInfoFileUploadController.java
View file

@ -11,8 +11,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import ru.micord.ervu.security.webbpm.jwt.UserIdsPair;
import ru.micord.ervu.security.webbpm.jwt.util.SecurityUtil;
/**
* @author Alexandr Shalaginov
@ -30,15 +28,12 @@ public class EmployeeInfoFileUploadController {
@RequestParam("file") MultipartFile multipartFile,
@RequestHeader("X-Employee-Info-File-Form-Type") String formType,
@RequestHeader("Client-Time-Zone") String clientTimeZone) {
UserIdsPair userIdsPair = SecurityUtil.getUserIdsPair();
if (userIdsPair != null) {
String offset = ZonedDateTime.now(TimeZone.getTimeZone(clientTimeZone).toZoneId())
.getOffset().getId();
String offset = ZonedDateTime.now(TimeZone.getTimeZone(clientTimeZone).toZoneId())
.getOffset().getId();
if (this.fileUploadService.saveEmployeeInformationFile(multipartFile, formType, offset, userIdsPair)) {
return ResponseEntity.ok("File successfully uploaded.");
}
if (this.fileUploadService.saveEmployeeInformationFile(multipartFile, formType, offset)) {
return ResponseEntity.ok("File successfully uploaded.");
}
return ResponseEntity.internalServerError().body("An error occurred while uploading file.");

4
backend/src/main/java/ervu/service/fileupload/EmployeeInfoFileUploadService.java
View file

@ -37,6 +37,7 @@ import ru.micord.ervu.security.esia.model.PersonModel;
import ru.micord.ervu.security.esia.service.UlDataService;
import ru.micord.ervu.security.esia.token.EsiaTokensStore;
import ru.micord.ervu.security.webbpm.jwt.UserIdsPair;
import ru.micord.ervu.security.webbpm.jwt.util.SecurityUtil;
import ru.micord.ervu.service.InteractionService;
import static ervu.enums.FileStatusCode.FILE_CLEAN;
@ -76,7 +77,7 @@ public class EmployeeInfoFileUploadService {
}
public boolean saveEmployeeInformationFile(MultipartFile multipartFile, String formType,
String offset, UserIdsPair userIdsPair) {
String offset) {
if (!isValid(multipartFile)) {
return false;
@ -84,6 +85,7 @@ public class EmployeeInfoFileUploadService {
String fileId = UUID.randomUUID().toString();
String fileName = multipartFile.getOriginalFilename();
EmployeeInfoFileFormType employeeInfoFileFormType = EmployeeInfoFileFormType.valueOf(formType);
UserIdsPair userIdsPair = SecurityUtil.getUserIdsPair();
String esiaUserId = userIdsPair.getEsiaUserId();
String ervuId = userIdsPair.getErvuId();
String accessToken = EsiaTokensStore.getAccessToken(esiaUserId);