merge main& solve conflict

src/main/java/org/cmh/backend/authentication/controller/UserController.java

@@ -0,0 +1,57 @@
+package org.cmh.backend.authentication.controller;
+
+import org.cmh.backend.authentication.model.User;
+import org.cmh.backend.authentication.service.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+import static org.springframework.http.ResponseEntity.ok;
+
+@RestController
+@RequestMapping("/users")
+public class UserController {
+    @Autowired
+    private UserService userService;
+
+
+    @PostMapping("/tmdshabi")
+    public ResponseEntity<User> login(@RequestBody Map<String, String> credentials) {
+        String username = credentials.get("username");
+        String password = credentials.get("password");
+        System.out.println(username);
+        System.out.println(password);
+        System.out.println("hahaha");
+        return ResponseEntity.notFound().build();
+    }
+    @PostMapping("/hahaha")
+    public ResponseEntity<User> hahaha(@RequestBody Map<String, String> credentials){
+        String username = credentials.get("username");
+        String password = credentials.get("password");
+        System.out.println(username);
+        System.out.println(password);
+        System.out.println("hahaha");
+        System.out.println("hahaha");
+        User user = new User();
+        user.setUsername(username);
+        user.setPassword(password);
+        return ResponseEntity.ok(user);
+    }
+
+    @PostMapping("/register")
+    public ResponseEntity<User> register(@RequestBody Map<String, String> credentials) {
+        String username = credentials.get("username");
+        String password = credentials.get("password");
+        String name = credentials.get("name");
+        String organization = credentials.get("organization");
+        String gender = credentials.get("gender");
+        String email = credentials.get("email");
+        String phone = credentials.get("phone");
+        String pname = credentials.get("pname");;
+        User user = new User(username, password, name, organization, gender, email,phone,pname);
+        if(userService.RegisterUser(user) != null);
+        return null;
+    }
+}

src/main/java/org/cmh/backend/authentication/model/User.java

@@ -4,36 +4,53 @@ import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
+
 
 @Entity
 public class User {
+    @Setter
+    @Getter
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
+    @Setter
+    @Getter
     private String username;
+    @Setter
+    @Getter
     private String password;
+    @Setter
+    @Getter
+    private String name;
+    @Getter
+    @Setter
+    private String organization;
+    private String gender;
+    @Setter
+    @Getter
+    private String email;
+    @Getter
+    @Setter
+    private String phone;
+    @Getter
+    @Setter
+    private String pname;
+
+    public User() {
 
-    public Long getId() {
-        return id;
     }
 
-    public void setId(Long id) {
+    public User(String username, String password, String name, String organization, String gender, String email, String phone, String pname) {
-        this.id = id;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
         this.username = username;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
         this.password = password;
+        this.name = name;
+        this.organization = organization;
+        this.gender = gender;
+        this.email = email;
+        this.phone = phone;
+        this.pname = pname;
     }
+
 }

src/main/java/org/cmh/backend/authentication/repository/UserRepository.java

@@ -5,4 +5,9 @@ import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface UserRepository extends JpaRepository<User, Long> {
     User findByUsername(String username);
+    User findByIdAndUsername(long id, String username);
+    User findByName(String name);
+    User findByUsernameAndPassword(String username, String password);
+    User findByGender(String gender);
+    User save(User user);
 }

src/main/java/org/cmh/backend/authentication/service/UserService.java

@@ -13,4 +13,12 @@ public class UserService {
     public User getUserByUsername(String username) {
         return userRepository.findByUsername(username);
     }
+    public User getUserByUsernameAndPassword(String username, String password) {
+        return userRepository.findByUsernameAndPassword(username, password);
+    }
+
+    public User RegisterUser(User user) {
+        User savedUser = userRepository.save(user);
+        return savedUser;
+    }
 }