UserController, UserService & UserDTO

src/main/java/org/example/vet1177/controller/ActivityLogController.java

@@ -28,7 +28,7 @@ public List<ActivityLogResponse> getLogsByRecord(
             @PathVariable UUID recordId,
             @RequestHeader("userId") UUID userId
     ) {
-        User user = userService.getById(userId);
+        User user = userService.getUserEntityById(userId);
 
         return activityLogService.getByRecord(recordId, user)
                 .stream()

src/main/java/org/example/vet1177/controller/MedicalRecordController.java

@@ -184,7 +184,7 @@ public ResponseEntity<MedicalRecordResponse> assignVet(
             @AuthenticationPrincipal User currentUser) {
 
         MedicalRecord record = medicalRecordService.getById(id);
-        User vetToAssign = userService.getById(request.vetId());
+        User vetToAssign = userService.getUserEntityById(request.vetId());
         medicalRecordPolicy.canAssignVet(currentUser, record, vetToAssign);
 
         return ResponseEntity.ok(

src/main/java/org/example/vet1177/controller/UserController.java

@@ -0,0 +1,60 @@
+package org.example.vet1177.controller;
+
+import jakarta.validation.Valid;
+import org.example.vet1177.dto.request.user.UserRequest;
+import org.example.vet1177.dto.response.user.UserResponse;
+import org.example.vet1177.services.UserService;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.example.vet1177.dto.request.user.UserUpdateRequest;
+
+import java.util.List;
+import java.util.UUID;
+
+@RestController
+@RequestMapping("/api/users")
+public class UserController {
+
+    private final UserService userService;
+
+    public UserController(UserService userService) {
+        this.userService = userService;
+    }
+
+    //GET /users- Hämta alla användare
+    @GetMapping
+    public ResponseEntity<List<UserResponse>> getAllUsers() {
+        List<UserResponse> users = userService.getAllUsers();
+        return ResponseEntity.ok(users);
+    }
+
+    // GET /users/{id}- Hämta 1 användare
+    @GetMapping("/{id}")
+    public ResponseEntity<UserResponse> getUserById(@PathVariable UUID id) {
+        UserResponse user = userService.getById(id);
+        return ResponseEntity.ok(user);
+    }
+
+    //POST /users - skapa ny användare
+    @PostMapping
+    public ResponseEntity<UserResponse> createUser(@Valid @RequestBody UserRequest request) {
+        UserResponse user = userService.createUser(request);
+        return ResponseEntity.status(HttpStatus.CREATED).body(user);
+    }
+
+    //PUT /users/{id} - uppdatera användare
+    @PutMapping("/{id}")
+    public ResponseEntity<UserResponse> updateUser(@PathVariable UUID id,
+                                                   @Valid @RequestBody UserUpdateRequest request) {
+        UserResponse user = userService.updateUser(id, request);
+        return ResponseEntity.ok(user);
+    }
+
+    //DELETE /users/{id} - Tar bort användare
+    @DeleteMapping("/{id}")
+    public ResponseEntity<Void> deleteUser(@PathVariable UUID id) {
+        userService.deleteUser(id);
+        return ResponseEntity.noContent().build();
+    }
+}

src/main/java/org/example/vet1177/dto/request/user/UserRequest.java

@@ -0,0 +1,72 @@
+package org.example.vet1177.dto.request.user;
+
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import org.example.vet1177.entities.Role;
+
+import java.util.UUID;
+
+public class UserRequest {
+
+    @NotBlank
+    @Size(min = 2, max = 100)
+    private String name;
+
+    @NotBlank
+    @Email
+    private String email;
+
+    @NotBlank
+    @Size(min = 8, max = 100)
+    private String password;
+
+    @NotNull
+    private Role role;
+
+    private UUID clinicId;
+
+    public  UserRequest(){
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public Role getRole() {
+        return role;
+    }
+
+    public void setRole(Role role) {
+        this.role = role;
+    }
+
+    public UUID getClinicId() {
+        return clinicId;
+    }
+
+    public void setClinicId(UUID clinicId) {
+        this.clinicId = clinicId;
+    }
+}

src/main/java/org/example/vet1177/dto/request/user/UserUpdateRequest.java

@@ -0,0 +1,41 @@
+package org.example.vet1177.dto.request.user;
+
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.Size;
+
+import java.util.UUID;
+
+public class UserUpdateRequest {
+
+    @Size(min = 2, max = 100)
+    private String name;
+
+    @Email
+    private String email;
+
+    private UUID clinicId;
+
+    public UUID getClinicId() {
+        return clinicId;
+    }
+
+    public void setClinicId(UUID clinicId) {
+        this.clinicId = clinicId;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

src/main/java/org/example/vet1177/dto/response/user/UserResponse.java

@@ -0,0 +1,86 @@
+package org.example.vet1177.dto.response.user;
+
+import org.example.vet1177.entities.Role;
+
+import java.time.Instant;
+import java.util.UUID;
+
+public class UserResponse {
+
+    private UUID id;
+    private String name;
+    private String email;
+    private Role role;
+    private UUID clinicId;
+    private Instant createdAt;
+    private Instant updatedAt;
+
+    public UserResponse() {
+    }
+
+    public UserResponse(UUID id, String name, String email, Role role, UUID clinicId, Instant createdAt, Instant updatedAt) {
+        this.id =id;
+        this.name =name;
+        this.email = email;
+        this.role = role;
+        this.clinicId = clinicId;
+        this.createdAt = createdAt;
+        this.updatedAt =updatedAt;
+    }
+
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public Role getRole() {
+        return role;
+    }
+
+    public void setRole(Role role) {
+        this.role = role;
+    }
+
+    public UUID getClinicId() {
+        return clinicId;
+    }
+
+    public void setClinicId(UUID clinicId) {
+        this.clinicId = clinicId;
+    }
+
+    public Instant getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Instant createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Instant getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Instant updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+}

src/main/java/org/example/vet1177/repository/MedicalRecordRepository.java

@@ -33,4 +33,8 @@ public interface MedicalRecordRepository extends JpaRepository<MedicalRecord, UU
     List<MedicalRecord> findByAssignedVetId(UUID vetId);
     List<MedicalRecord> findByStatus(RecordStatus status);
     boolean existsByPetIdAndClinicId(UUID petId, UUID clinicId);
+    boolean existsByOwnerId(UUID ownerId);
+    boolean existsByAssignedVetId(UUID vetId);
+    boolean existsByCreatedById(UUID userId);
+    boolean existsByUpdatedById(UUID userId);
 }

src/main/java/org/example/vet1177/repository/PetRepository.java

@@ -15,4 +15,6 @@ public interface PetRepository extends JpaRepository<Pet, UUID> {
 
     //hämta ett specifikt pet för en specifik owner
     Optional<Pet> findByIdAndOwnerId(UUID petId, UUID ownerId);
+
+    boolean existsByOwner_Id(UUID ownerId);
 }

src/main/java/org/example/vet1177/repository/UserRepository.java

@@ -9,4 +9,6 @@
 public interface UserRepository extends JpaRepository <User, UUID> {
 
     Optional<User> findByEmail(String email);
+    boolean existsByEmail(String email);
+    boolean existsByEmailAndIdNot(String email, UUID id);
 }