Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
UPSMF
Grievance
Commits
327eedd9
Commit
327eedd9
authored
1 year ago
by
shishir suman
Browse files
Options
Download
Patches
Plain Diff
bug fixes
parent
581eb395
main
Escalate_ticket_send_mail_to_raiser
UAT
UPHRH_7903_mobile_otp
UPHRH_quartz_scheduler
admin_config_changes
github/fork/vky25/patch-1
rahu_test
shishir_dynamic_schedular
shishir_ticket_statistics_by_user
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/org/upsmf/grievance/service/impl/IntegrationServiceImpl.java
+6
-52
.../upsmf/grievance/service/impl/IntegrationServiceImpl.java
with
6 additions
and
52 deletions
+6
-52
src/main/java/org/upsmf/grievance/service/impl/IntegrationServiceImpl.java
+
6
−
52
View file @
327eedd9
...
...
@@ -84,56 +84,6 @@ public class IntegrationServiceImpl implements IntegrationService {
return
userRepository
.
save
(
user
);
}
/*@Override
public ResponseEntity<User> createUser(CreateUserDto user) throws Exception {
List<Department> departmentList = new ArrayList<>();
getCreateUserRequest(user, departmentList);
// set headers
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
// create request
ObjectMapper mapper = new ObjectMapper();
JsonNode jsonNodeObject = mapper.convertValue(user, JsonNode.class);
JsonNode root = mapper.createObjectNode();
((ObjectNode) root).put("request", jsonNodeObject);
log.info("Create user Request - {}", root);
// make API call
ResponseEntity response = restTemplate.exchange(createUserUrl, HttpMethod.POST,
new HttpEntity<>(root, headers), String.class);
log.info("Create user Response - {}", response);
// validate response
if (response.getStatusCode() == HttpStatus.OK) {
ResponseEntity<String> getUsersResponse = getUserDetailsFromKeycloak(response, mapper);
if (getUsersResponse.getStatusCode() == HttpStatus.OK) {
String getUsersResponseBody = getUsersResponse.getBody();
JsonNode getUsersJsonNode = mapper.readTree(getUsersResponseBody);
if(getUsersJsonNode.size() > 0) {
JsonNode userContentData = getUsersJsonNode;
User newUser = createUserWithApiResponse(userContentData);
User savedUser = userRepository.save(newUser);
// create user role mapping
createUserRoleMapping(user, savedUser);
// create user department mapping
if(savedUser != null && savedUser.getId() > 0 && departmentList != null && !departmentList.isEmpty()) {
org.upsmf.grievance.model.Department departmentMap = org.upsmf.grievance.model.Department.builder().departmentName(departmentList.get(0).name()).userId(savedUser.getId()).build();
org.upsmf.grievance.model.Department userDepartment = departmentRepository.save(departmentMap);
List<org.upsmf.grievance.model.Department> departments = new ArrayList<>();
departments.add(userDepartment);
savedUser.setDepartment(departments);
}
return new ResponseEntity<>(savedUser, HttpStatus.OK);
}
return ResponseEntity.internalServerError().build();
} else {
// Handle error cases here
return ResponseEntity.internalServerError().build();
}
}else{
response.getBody();
return ResponseEntity.internalServerError().build();
}
}*/
@Override
public
ResponseEntity
<
User
>
createUser
(
CreateUserDto
user
)
throws
Exception
{
// check for department
...
...
@@ -164,8 +114,12 @@ public class IntegrationServiceImpl implements IntegrationService {
log
.
info
(
"Create user Response - {}"
,
response
);
if
(
response
.
getStatusCode
()
==
HttpStatus
.
OK
)
{
String
userContent
=
response
.
getBody
().
toString
();
JsonNode
responseNode
=
mapper
.
readTree
(
userContent
);
if
(
responseNode
!=
null
){
if
(
responseNode
.
has
(
"errorMessage"
))
{
throw
new
RuntimeException
(
responseNode
.
get
(
"errorMessage"
).
textValue
());
}
}
ObjectNode
requestNode
=
mapper
.
createObjectNode
();
requestNode
.
put
(
"userName"
,
userContent
);
JsonNode
payload
=
requestNode
;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets