DEAR-112

build.gradle

@@ -32,9 +32,11 @@ dependencies {
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.1.0'
     implementation 'io.jsonwebtoken:jjwt:0.9.1'
     implementation 'javax.xml.bind:jaxb-api:2.3.1'
+    implementation 'org.mapstruct:mapstruct:1.5.5.Final'
     runtimeOnly 'org.postgresql:postgresql'
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
+    annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.5.Final'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.mockito:mockito-core:4.0.0'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'

src/main/java/ch/fhnw/deardevbackend/controller/UserController.java

@@ -1,13 +1,12 @@
 package ch.fhnw.deardevbackend.controller;
 
+import ch.fhnw.deardevbackend.dto.UserAndProviderDTO;
+import ch.fhnw.deardevbackend.dto.UserDTO;
 import ch.fhnw.deardevbackend.entities.User;
 import ch.fhnw.deardevbackend.services.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -27,4 +26,14 @@ public ResponseEntity<List<User>> getAllUsers() {
     public ResponseEntity<User> getUserById(@PathVariable Integer id) {
         return ResponseEntity.ok().body(userService.getUserById(id));
     }
+
+    @GetMapping("/user-with-provider/{id}")
+    public ResponseEntity<UserAndProviderDTO> getUserByProviderById(@PathVariable Integer id) {
+        return ResponseEntity.ok().body(userService.getUserWithProviderById(id));
+    }
+
+    @PutMapping("user/update")
+    public void updateUser(@RequestBody UserDTO request) {
+        userService.updateUser(request.getId(), request.getUsername());
+    }
 }

src/main/java/ch/fhnw/deardevbackend/dto/UserAndProviderDTO.java

@@ -0,0 +1,12 @@
+package ch.fhnw.deardevbackend.dto;
+
+import lombok.Data;
+
+@Data
+public class UserAndProviderDTO {
+    private int id;
+    private String name;
+    private String email;
+    private String provider;
+    private String username;
+}

src/main/java/ch/fhnw/deardevbackend/dto/UserDTO.java

@@ -0,0 +1,9 @@
+package ch.fhnw.deardevbackend.dto;
+
+import lombok.Data;
+
+@Data
+public class UserDTO {
+    private int id;
+    private String username;
+}

src/main/java/ch/fhnw/deardevbackend/entities/Account.java

@@ -0,0 +1,49 @@
+package ch.fhnw.deardevbackend.entities;
+
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Entity
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(name = "accounts")
+@Builder
+@Data
+public class Account {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private int id;
+
+    @Column(name = "userId")
+    private Integer userId;
+
+    private String type;
+    private String provider;
+
+    @Column(name = "providerAccountId")
+    private String providerAccountId;
+
+
+    @Column(name = "refresh_token")
+    private String refreshToken;
+
+    @Column(name = "access_token")
+    private String accessToken;
+
+    @Column(name = "expires_at")
+    private Long expiresAt;
+
+    @Column(name = "id_token")
+    private String idToken;
+
+    private String scope;
+
+    @Column(name = "session_state")
+    private String sessionState;
+
+    @Column(name = "token_type")
+    private String tokenType;
+}

src/main/java/ch/fhnw/deardevbackend/entities/User.java

@@ -17,6 +17,7 @@ public class User {
     @Id
     private int id;
     private String name;
+    private String username;
     private String email;
     private String image;
 }

src/main/java/ch/fhnw/deardevbackend/mapper/UserProviderMapper.java

@@ -0,0 +1,20 @@
+package ch.fhnw.deardevbackend.mapper;
+
+import ch.fhnw.deardevbackend.dto.UserAndProviderDTO;
+import ch.fhnw.deardevbackend.entities.User;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.ReportingPolicy;
+import org.mapstruct.factory.Mappers;
+
+@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
+public interface UserProviderMapper {
+    UserProviderMapper INSTANCE = Mappers.getMapper(UserProviderMapper.class);
+
+    @Mapping(source = "user.id", target = "id")
+    @Mapping(source = "user.name", target = "name")
+    @Mapping(source = "user.email", target = "email")
+    @Mapping(source = "user.username", target = "username")
+    @Mapping(source = "provider", target = "provider")
+    UserAndProviderDTO toDto(User user, String provider);
+}

src/main/java/ch/fhnw/deardevbackend/repositories/AccountRepository.java

@@ -0,0 +1,15 @@
+package ch.fhnw.deardevbackend.repositories;
+
+import ch.fhnw.deardevbackend.entities.Account;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface AccountRepository extends JpaRepository<Account, Integer> {
+    @Query(
+            value = "select provider from accounts where \"userId\" = :userId",
+            nativeQuery = true)
+    String findProviderByUserId(@Param("userId") Integer userId);
+}

src/main/java/ch/fhnw/deardevbackend/services/UserService.java

@@ -1,10 +1,15 @@
 package ch.fhnw.deardevbackend.services;
 
+import ch.fhnw.deardevbackend.dto.UserAndProviderDTO;
 import ch.fhnw.deardevbackend.entities.User;
+import ch.fhnw.deardevbackend.mapper.UserProviderMapper;
+import ch.fhnw.deardevbackend.repositories.AccountRepository;
 import ch.fhnw.deardevbackend.repositories.UserRepository;
 import lombok.RequiredArgsConstructor;
+import org.springdoc.api.OpenApiResourceNotFoundException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Optional;
@@ -14,6 +19,10 @@
 public class UserService {
     @Autowired
     private final UserRepository userRepository;
+    @Autowired
+    private AccountRepository accountRepository;
+    @Autowired
+    private UserProviderMapper userMapper;
 
     public List<User> getAllUsers() {
         return userRepository.findAll();
@@ -23,6 +32,23 @@ public User getUserById(Integer id) {
         return userRepository.findById(id).orElse(null);
     }
 
+    public UserAndProviderDTO getUserWithProviderById(Integer id) {
+        User user = userRepository.findById(id).orElseThrow(() -> new OpenApiResourceNotFoundException("User not found"));
+        String provider = accountRepository.findProviderByUserId(id);
+        return userMapper.toDto(user, provider);
+    }
+
+    @Transactional
+    public void updateUser(int id, String username) {
+        User user = userRepository.findById(id).orElseThrow(() -> new OpenApiResourceNotFoundException("User not found"));
+        if (user != null) {
+            user.setUsername(username);
+            userRepository.save(user);
+        } else {
+            throw new IllegalArgumentException("User not found");
+        }
+    }
+
     // used for JWT filter
     public Optional<User> findUserByEmail(String email) {
         return userRepository.findByEmail(email);

src/main/resources/application.properties

@@ -5,8 +5,7 @@ spring.datasource.username=yappi_db_admin
 spring.datasource.password=${DATABASE_PASSWORD}
 spring.datasource.driver-class-name=org.postgresql.Driver
 ## Hibernate Configuration
-spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect
-spring.jpa.hibernate.ddl-auto=none
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 spring.jpa.show-sql=true
 spring.jpa.properties.hibernate.format_sql=true
 spring.jpa.properties.hibernate.temp.use_jdbc_metadata_defaults=false