Merge branch 'feature/58-user-entity-jpa' into 'main'

Feature/58 user entity jpa

See merge request idatt2106-v23-03/backend!27

.idea/misc.xml

@@ -8,5 +8,5 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_X" default="true" project-jdk-name="openjdk-20" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_19" project-jdk-name="openjdk-20" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file

src/main/java/ntnu/idatt2016/v233/SmartMat/config/authentiation/AuthenticationConfig.java

@@ -24,9 +24,9 @@ import org.springframework.security.provisioning.InMemoryUserDetailsManager;
 
 /**
  * Configures the authentication for the application.
- * @author Anders (young buck)
- * @version 1.0
- * @since 04.04.2023
+ * @author Anders and  birk
+ * @version 1.1
+ * @since 05.04.2023
  */
 @Configuration
 public class AuthenticationConfig {
@@ -55,18 +55,20 @@ public class AuthenticationConfig {
     }
 
     /**
-     * Configures the authentication manager.
-     *
-     * @param userDetailsService The UserDetailsService instance for managing user details.
-     * @return An AuthenticationManager instance.
+     * Configures the authentication manager for the application.
+     * @param userDetailsService the user details service
+     * @param passwordEncoder the password encoder
+     * @return the authentication manager
      */
     @Bean
-    public AuthenticationManager authManager(UserDetailsService userDetailsService) {
-        var authProvider = new DaoAuthenticationProvider();
-        authProvider.setUserDetailsService(userDetailsService);
-        return new ProviderManager(authProvider);
+    AuthenticationManager authenticationManager (UserDetailsService userDetailsService, PasswordEncoder passwordEncoder){
+        DaoAuthenticationProvider autprovider = new DaoAuthenticationProvider();
+        autprovider.setUserDetailsService(userDetailsService);
+        autprovider.setPasswordEncoder(passwordEncoder);
+        return new ProviderManager(autprovider);
     }
 
+
     /**
      * Configures the JWKSource instance for handling RSA keys.
      *

src/main/java/ntnu/idatt2016/v233/SmartMat/controller/AuthenticationController.java

 package ntnu.idatt2016.v233.SmartMat.controller;
 
-import ntnu.idatt2016.v233.SmartMat.model.request.LoginRequest;
+import ntnu.idatt2016.v233.SmartMat.entity.request.LoginRequest;
 import ntnu.idatt2016.v233.SmartMat.service.TokenService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

src/main/java/ntnu/idatt2016/v233/SmartMat/model/Allergy.java → src/main/java/ntnu/idatt2016/v233/SmartMat/entity/Allergy.java

-package ntnu.idatt2016.v233.SmartMat.model;
+package ntnu.idatt2016.v233.SmartMat.entity;
 
 /**
  * This is a record class representing an allergy

src/main/java/ntnu/idatt2016/v233/SmartMat/model/Fridge.java → src/main/java/ntnu/idatt2016/v233/SmartMat/entity/Fridge.java

-package ntnu.idatt2016.v233.SmartMat.model;
+package ntnu.idatt2016.v233.SmartMat.entity;
 
 /**
  * Fridge is a record class representing a fridge in the system.

src/main/java/ntnu/idatt2016/v233/SmartMat/model/Recipe.java → src/main/java/ntnu/idatt2016/v233/SmartMat/entity/Recipe.java

-package ntnu.idatt2016.v233.SmartMat.model;
+package ntnu.idatt2016.v233.SmartMat.entity;
 
 /**
  * Recipe is a record class representing a recipe in the system.

src/main/java/ntnu/idatt2016/v233/SmartMat/model/ShoppingList.java → src/main/java/ntnu/idatt2016/v233/SmartMat/entity/ShoppingList.java

-package ntnu.idatt2016.v233.SmartMat.model;
+package ntnu.idatt2016.v233.SmartMat.entity;
 
 
 /**

src/main/java/ntnu/idatt2016/v233/SmartMat/model/product/Product.java → src/main/java/ntnu/idatt2016/v233/SmartMat/entity/product/Product.java

-package ntnu.idatt2016.v233.SmartMat.model.product;
+package ntnu.idatt2016.v233.SmartMat.entity.product;
 
 import lombok.Builder;
 

src/main/java/ntnu/idatt2016/v233/SmartMat/model/request/LoginRequest.java → src/main/java/ntnu/idatt2016/v233/SmartMat/entity/request/LoginRequest.java

-package ntnu.idatt2016.v233.SmartMat.model.request;
+package ntnu.idatt2016.v233.SmartMat.entity.request;
 
 /**
  * LoginRequest is a record class representing a login request.

src/main/java/ntnu/idatt2016/v233/SmartMat/model/user/Authority.java → src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/Authority.java

-package ntnu.idatt2016.v233.SmartMat.model.user;
+package ntnu.idatt2016.v233.SmartMat.entity.user;
 
 /**
- * Authority is a record class representing an authority in the system.
+ * Authority is a enum representing an authority in the system.
  *
- * @author Anders
- * @version 1.0
- * @since 04.04.2023
+ * @author Birk
+ * @version 2.0
+ * @since 05.04.2023
  *
  * @param username The username of the user.
  * @param authority The authority of the user.
  */
-public record Authority(String username, String authority) {
+public enum Authority{
+    USER,
+    ADMIN
 }

src/main/java/ntnu/idatt2016/v233/SmartMat/model/user/Profile.java → src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/Profile.java

-package ntnu.idatt2016.v233.SmartMat.model.user;
+package ntnu.idatt2016.v233.SmartMat.entity.user;
 
 /**
  * Profile is a record class representing a profile in the system.

src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/User.java

+package ntnu.idatt2016.v233.SmartMat.entity.user;
+
+
+import jakarta.persistence.*;
+import lombok.Builder;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * User is a class representing a user in the system.
+ * It implements the UserDetails interface.
+ *
+ * @author Anders and Birk
+ * @version 2.0
+ * @since 05.04.2023
+ *
+ */
+@Entity(name = "users")
+@Builder
+
+public class User implements UserDetails {
+    @Id
+    @Column(name = "user_name")
+    private String username;
+    @Column(name = "password")
+    private String password;
+    @Column(name = "enabled")
+    private boolean enabled;
+
+    @Enumerated(EnumType.STRING)
+    private Authority authority;
+
+    /**
+     * used when created jwts and validating user authority
+     * @return the users authority
+     */
+    @Override
+    public Collection<? extends GrantedAuthority> getAuthorities() {
+        return List.of(new SimpleGrantedAuthority(authority.name()));
+    }
+
+    /**
+     * getter for the user password used in userdetails service
+     * @return the users password
+     */
+    @Override
+    public String getPassword() {
+        return this.password;
+    }
+
+    /**
+     * getter for the user username used in userdetails service
+     * @return the users username
+     */
+    @Override
+    public String getUsername() {
+        return this.username;
+    }
+
+    /**
+     * not used
+     * @return true if the account is not expired
+     */
+    @Override
+    public boolean isAccountNonExpired() {
+        return true;
+    }
+
+    /**
+     * not used
+     * @return true if the account is not locked
+     */
+    @Override
+    public boolean isAccountNonLocked() {
+        return true;
+    }
+
+    /**
+     * not used
+     * @return true if the credentials are not expired
+     */
+    @Override
+    public boolean isCredentialsNonExpired() {
+        return true;
+    }
+
+    /**
+     * used in authentication
+     * @return true if the user is enabled
+     */
+    @Override
+    public boolean isEnabled() {
+        return this.enabled;
+    }
+}

src/main/java/ntnu/idatt2016/v233/SmartMat/model/user/User.java

-package ntnu.idatt2016.v233.SmartMat.model.user;
-
-
-/**
- * User is a record class representing a user in the system.
- *
- * @author Anders
- * @version 1.0
- * @since 04.04.2023
- *
- * @param username The username of the user.
- * @param password The password of the user.
- * @param enabled Whether the user is enabled.
- */
-
-public record User(String username, String password,
-                   boolean enabled, Profile profile) {
-}

src/main/java/ntnu/idatt2016/v233/SmartMat/repository/AllergyRepository.java

 package ntnu.idatt2016.v233.SmartMat.repository;
 
-import ntnu.idatt2016.v233.SmartMat.model.Allergy;
+import ntnu.idatt2016.v233.SmartMat.entity.Allergy;
 
 import java.util.List;
 import java.util.Optional;

src/main/java/ntnu/idatt2016/v233/SmartMat/repository/ProductRepository.java

 package ntnu.idatt2016.v233.SmartMat.repository;
 
-import ntnu.idatt2016.v233.SmartMat.model.product.Product;
+import ntnu.idatt2016.v233.SmartMat.entity.product.Product;
 
 import java.util.List;
 import java.util.Optional;

src/main/java/ntnu/idatt2016/v233/SmartMat/repository/RecipeRepository.java

@@ -3,7 +3,7 @@ package ntnu.idatt2016.v233.SmartMat.repository;
 import java.util.List;
 import java.util.Optional;
 
-import ntnu.idatt2016.v233.SmartMat.model.Recipe;
+import ntnu.idatt2016.v233.SmartMat.entity.Recipe;
 
 /**
  * This interface defines the methods for the recipe repository

src/main/java/ntnu/idatt2016/v233/SmartMat/repository/ShoppingListRepository.java

@@ -3,7 +3,7 @@ package ntnu.idatt2016.v233.SmartMat.repository;
 import java.util.List;
 import java.util.Optional;
 
-import ntnu.idatt2016.v233.SmartMat.model.ShoppingList;
+import ntnu.idatt2016.v233.SmartMat.entity.ShoppingList;
 
 /**
  * This interface defines the methods for the shopping list repository

src/main/java/ntnu/idatt2016/v233/SmartMat/repository/UserRepository.java

+package ntnu.idatt2016.v233.SmartMat.repository;
+
+import ntnu.idatt2016.v233.SmartMat.entity.user.User;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.Optional;
+
+/**
+ * repo for user entity
+ * uses mysql from server when ran
+ * uses h2 in memory database when testing
+ * @author birk
+ * @version 1.0
+ * @since 05.04.2023
+ */
+public interface UserRepository extends JpaRepository<User, Long>{
+
+    /**
+     * gets user from username out of database
+     * @param username username of user
+     * @return user
+     */
+    Optional<User> findByUsername(String username);
+
+
+}

src/main/java/ntnu/idatt2016/v233/SmartMat/service/ProductService.java

 package ntnu.idatt2016.v233.SmartMat.service;
 
-import lombok.AllArgsConstructor;
-import ntnu.idatt2016.v233.SmartMat.model.product.Product;
+import ntnu.idatt2016.v233.SmartMat.entity.product.Product;
 import ntnu.idatt2016.v233.SmartMat.repository.ProductRepository;
 import ntnu.idatt2016.v233.SmartMat.util.ProductUtil;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.List;
 import java.util.Optional;

src/main/java/ntnu/idatt2016/v233/SmartMat/service/ShoppingListService.java

@@ -3,7 +3,7 @@ package ntnu.idatt2016.v233.SmartMat.service;
 import java.util.List;
 import java.util.Optional;
 
-import ntnu.idatt2016.v233.SmartMat.model.ShoppingList;
+import ntnu.idatt2016.v233.SmartMat.entity.ShoppingList;
 import ntnu.idatt2016.v233.SmartMat.repository.ShoppingListRepository;
 
 /**