Skip to content
Snippets Groups Projects
Commit 4eb0fd44 authored by Henrik Teksle Sandok's avatar Henrik Teksle Sandok
Browse files

Merge branch 'feat/add-banner-in-user-update' into 'master'

feat: add banner image to user update

See merge request !88
parents 39cdcb48 e06938bd
No related branches found
No related tags found
1 merge request!88feat: add banner image to user update
Pipeline #284495 passed
...@@ -126,6 +126,9 @@ public class UserController { ...@@ -126,6 +126,9 @@ public class UserController {
if (updateDTO.getProfileImage() != null) { if (updateDTO.getProfileImage() != null) {
user.setProfileImage(updateDTO.getProfileImage()); user.setProfileImage(updateDTO.getProfileImage());
} }
if(updateDTO.getBannerImage() != null) {
user.setBannerImage(updateDTO.getBannerImage());
}
if (updateDTO.getConfiguration() != null) { if (updateDTO.getConfiguration() != null) {
if (updateDTO.getConfiguration().getCommitment() != null) { if (updateDTO.getConfiguration().getCommitment() != null) {
user.getConfiguration().setCommitment(Commitment.valueOf(updateDTO.getConfiguration().getCommitment())); user.getConfiguration().setCommitment(Commitment.valueOf(updateDTO.getConfiguration().getCommitment()));
......
...@@ -2,11 +2,9 @@ package no.ntnu.idi.stud.savingsapp.dto.user; ...@@ -2,11 +2,9 @@ package no.ntnu.idi.stud.savingsapp.dto.user;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import jakarta.validation.constraints.Email; import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
import no.ntnu.idi.stud.savingsapp.dto.configuration.ConfigurationDTO; import no.ntnu.idi.stud.savingsapp.dto.configuration.ConfigurationDTO;
import no.ntnu.idi.stud.savingsapp.validation.Name; import no.ntnu.idi.stud.savingsapp.validation.Name;
import no.ntnu.idi.stud.savingsapp.validation.Password;
@Data @Data
public final class UserUpdateDTO { public final class UserUpdateDTO {
...@@ -22,6 +20,8 @@ public final class UserUpdateDTO { ...@@ -22,6 +20,8 @@ public final class UserUpdateDTO {
private Long profileImage; private Long profileImage;
private Long bannerImage;
@Valid @Valid
private ConfigurationDTO configuration; private ConfigurationDTO configuration;
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment