chore: add username && appUSer

Author: devcom33

backend/src/main/java/org/heymouad/focusapp/dtos/AuthenticationResponse.java

@@ -14,6 +14,7 @@
 @NoArgsConstructor
 public class AuthenticationResponse {
     private String token;
+    private String username;
     private String email;
     private String firstname;
     private String lastname;

backend/src/main/java/org/heymouad/focusapp/entities/AppUser.java

@@ -67,6 +67,8 @@ public String getUsername() {
         return email;
     }
 
+    public String getUsernameField(){return username;}
+
     @Override
     public boolean isAccountNonExpired() {
         //return UserDetails.super.isAccountNonExpired();

backend/src/main/java/org/heymouad/focusapp/mappers/AppUserMapper.java

@@ -4,8 +4,10 @@
 import org.heymouad.focusapp.dtos.UserInfoResponse;
 import org.heymouad.focusapp.entities.AppUser;
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
 
 @Mapper(componentModel = "spring")
 public interface AppUserMapper {
+    @Mapping(target = "username", source = "usernameField")
     UserInfoResponse toUserInfoResponse(AppUser appUser);
 }

backend/src/main/java/org/heymouad/focusapp/services/servicesImpl/AuthenticationServiceImpl.java

@@ -66,7 +66,13 @@ public AuthenticationResponse authenticate(AuthenticationRequest request)
         var user = appUserRepository.findByEmail(request.getEmail())
                 .orElseThrow(() -> new UsernameNotFoundException("User not found"));
         var jwtToken = jwtService.generateToken(user);
-        return AuthenticationResponse.builder().token(jwtToken).build();
+        return AuthenticationResponse.builder()
+                .token(jwtToken)
+                .username(user.getUsernameField())
+                .firstname(user.getFirstname())
+                .lastname(user.getLastname())
+                .email(user.getEmail())
+                .build();
     }
 
 }

backend/src/main/java/org/heymouad/focusapp/services/servicesImpl/HabitResetServiceImpl.java

@@ -46,6 +46,7 @@ public void resetDailyHabits(LocalDate date) {
                         completion.setHabit(habit);
                         completion.setCompletionDate(date);
                         completion.setCompleted(false);
+                        completion.setAppUser(habit.getAppUser());
                         newCompletions.add(completion);
                     }