Changeset 9868304 for src/main/java

Timestamp:

02/17/25 01:39:28 (4 months ago)

Author:

ste08 <sjovanoska@…>

Branches:

master

Children:

de83113

Parents:

a70b5a4

git-author:

ste08 <sjovanoska@…> (02/17/25 01:39:02)

git-committer:

ste08 <sjovanoska@…> (02/17/25 01:39:28)

Message:

Frontend + some backend changes

Location:

src/main/java/com/example/skychasemk

Files:

• controller/ApplicationUserController.java (modified) (3 diffs)
• dto/ApplicationUserDTO.java (modified) (1 diff)
• dto/ApplicationUserLoginDTO.java (added)
• model/ApplicationUser.java (modified) (2 diffs)
• repository/ApplicationUserRepository.java (modified) (1 diff)
• services/ApplicationUserService.java (modified) (2 diffs)

src/main/java/com/example/skychasemk/controller/ApplicationUserController.java

@@ -2 +2 @@
 
 import com.example.skychasemk.dto.ApplicationUserDTO;
+import com.example.skychasemk.dto.ApplicationUserLoginDTO;
 import com.example.skychasemk.model.ApplicationUser;
 import com.example.skychasemk.services.ApplicationUserService;
@@ -8 +9 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.Map;
 
 @RestController
@@ -22 +26 @@
         return ResponseEntity.ok("User saved successfully");
     }
-
+    @PostMapping("/login")
+    public ResponseEntity<Map<String,Long>> loginUser(@Valid @RequestBody ApplicationUserLoginDTO userDTO) {
+        ApplicationUser loginUser = userService.findByEmail(userDTO);
+        Map<String,Long> response = new HashMap<>();
+        response.put("userId",loginUser.getUserid());
+        return ResponseEntity.ok(response);
+    }
 }

src/main/java/com/example/skychasemk/dto/ApplicationUserDTO.java

@@ -22 +22 @@
     private String password;
 
-    private String phoneNumber;
+    private String phone_number;
+
+    public String getPhone_number() {
+        return phone_number;
+    }
+
+    public void setPhone_number(String phone_number) {
+        this.phone_number = phone_number;
+    }
 }

src/main/java/com/example/skychasemk/model/ApplicationUser.java

@@ -31 +31 @@
     @Column(name = "phone_number")
 
-    private String phoneNumber;
+    private String phone_number;
 
     @Column(name = "date_joined")
@@ -41 +41 @@
     }
 
+    public void setPhoneNumber(String phoneNumber) {
+        this.phone_number = phoneNumber;
+    }
 }

src/main/java/com/example/skychasemk/repository/ApplicationUserRepository.java

@@ -11 +11 @@
 @Repository
 public interface ApplicationUserRepository extends JpaRepository<ApplicationUser, Long> {
-    Optional<ApplicationUser> findByEmail(String email);
     @Query("SELECT u FROM ApplicationUser u WHERE u.userid = :id")
     Optional<ApplicationUser> getUserById(@Param("id") Long userid);
+    @Query("SELECT u FROM ApplicationUser  u WHERE u.email=:email")
+    Optional<ApplicationUser> findByEmail(@Param("email") String email);
 }

src/main/java/com/example/skychasemk/services/ApplicationUserService.java

@@ -2 +2 @@
 
 import com.example.skychasemk.dto.ApplicationUserDTO;
+import com.example.skychasemk.dto.ApplicationUserLoginDTO;
 import com.example.skychasemk.model.ApplicationUser;
 import com.example.skychasemk.repository.ApplicationUserRepository;
 import jakarta.transaction.Transactional;
+import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.time.Instant;
-import java.time.LocalDate;
+import java.util.Optional;
 //import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 
@@ -32 +33 @@
         user.setEmail(userDTO.getEmail());
         user.setPassword(userDTO.getPassword());
-        user.setPhoneNumber(userDTO.getPhoneNumber());
+        user.setPhoneNumber(userDTO.getPhone_number());
         ApplicationUser savedUser = userRepository.save(user);
         userRepository.flush();
         return savedUser;
     }
+
+    public ApplicationUser findByEmail(@Valid ApplicationUserLoginDTO userDTO) {
+        if (userRepository.findByEmail(userDTO.getEmail()).isEmpty()) {
+            throw new RuntimeException("User not registered");
+        } else {
+            Optional<ApplicationUser> userId = userRepository.findByEmail(userDTO.getEmail());
+            return userId.get();
+        }
+    }
 }