Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
projet-industriel
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
RAGOT Jessie
projet-industriel
Commits
2c9022ed
Commit
2c9022ed
authored
3 months ago
by
Jessie Ragot
Browse files
Options
Downloads
Patches
Plain Diff
Adding an empty medical record to a patient's registration
parent
c1a02578
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/com/projet/projetIndu/services/UserService.java
+14
-9
14 additions, 9 deletions
...main/java/com/projet/projetIndu/services/UserService.java
with
14 additions
and
9 deletions
src/main/java/com/projet/projetIndu/services/UserService.java
+
14
−
9
View file @
2c9022ed
package
com.projet.projetIndu.services
;
import
com.projet.projetIndu.dto.UserRegistrationDTO
;
import
com.projet.projetIndu.entities.Doctor
;
import
com.projet.projetIndu.entities.Patient
;
import
com.projet.projetIndu.entities.Role
;
import
com.projet.projetIndu.entities.User
;
import
com.projet.projetIndu.entities.*
;
import
com.projet.projetIndu.repositories.UserRepository
;
import
jakarta.transaction.Transactional
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.security.core.userdetails.UserDetails
;
import
org.springframework.security.core.userdetails.UserDetailsService
;
...
...
@@ -22,11 +20,13 @@ import java.util.Optional;
public
class
UserService
implements
UserDetailsService
{
private
final
UserRepository
userRepository
;
private
final
BCryptPasswordEncoder
passwordEncoder
;
private
final
MedicalFileService
medicalFileService
;
@Autowired
public
UserService
(
UserRepository
userRepository
,
BCryptPasswordEncoder
passwordEncoder
)
{
public
UserService
(
UserRepository
userRepository
,
BCryptPasswordEncoder
passwordEncoder
,
MedicalFileService
medicalFileService
)
{
this
.
userRepository
=
userRepository
;
this
.
passwordEncoder
=
passwordEncoder
;
this
.
medicalFileService
=
medicalFileService
;
}
public
List
<
User
>
getAllUsers
()
{
...
...
@@ -49,6 +49,7 @@ public class UserService implements UserDetailsService {
userRepository
.
deleteById
(
id
);
}
@Transactional
public
User
registerUser
(
UserRegistrationDTO
userDTO
)
{
if
(
userRepository
.
existsByEmail
(
userDTO
.
getEmail
()))
{
throw
new
IllegalArgumentException
(
"Email already taken"
);
...
...
@@ -87,9 +88,15 @@ public class UserService implements UserDetailsService {
user
.
setPassword
(
encodedPassword
);
user
.
setRole
(
userDTO
.
getRole
());
return
userRepository
.
save
(
user
);
User
savedUser
=
userRepository
.
save
(
user
);
if
(
savedUser
instanceof
Patient
)
{
MedicalFile
medicalFile
=
new
MedicalFile
((
Patient
)
savedUser
,
""
,
""
);
medicalFileService
.
saveMedicalFiles
(
medicalFile
);
}
return
savedUser
;
}
@Override
public
UserDetails
loadUserByUsername
(
String
email
)
throws
UsernameNotFoundException
{
...
...
@@ -102,6 +109,4 @@ public class UserService implements UserDetailsService {
.
authorities
(
user
.
getClass
().
getSimpleName
())
.
build
();
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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