Develop

.github/workflows/maven.yml

@@ -35,6 +35,12 @@ jobs:
           echo "server:" >> src/main/resources/application.yaml
           echo "  port: 8080" >> src/main/resources/application.yaml
           echo "" >> src/main/resources/application.yaml
+          echo "openapi:" >> src/main/resources/application.yaml
+          echo "  service: " >> src/main/resources/application.yaml
+          echo "    api-docs: api-service" >> src/main/resources/application.yaml
+          echo "    server: \"${{ secrets.SERVER_API_URL }}\"" >> src/main/resources/application.yaml
+          echo "    title: API Service" >> src/main/resources/application.yaml
+          echo "    version: 1.0.0" >> src/main/resources/application.yaml
           echo "spring:" >> src/main/resources/application.yaml
           echo "  datasource:" >> src/main/resources/application.yaml
           echo "    url: \"${{ secrets.DATABASE_URL }}\"" >> src/main/resources/application.yaml

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.3</version>
+        <version>3.3.4</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.swp</groupId>
@@ -28,7 +28,7 @@
     </scm>
     <properties>
         <java.version>21</java.version>
-        <projectlombok-lombok.version>1.18.30</projectlombok-lombok.version>
+        <projectlombok-lombok.version>1.18.34</projectlombok-lombok.version>
         <mapstruct.version>1.5.5.Final</mapstruct.version>
         <lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>
     </properties>
@@ -89,6 +89,16 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-mail</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+            <version>2.6.0</version>
+        </dependency>
+        <dependency>
+            <groupId>net.sf.biweekly</groupId>
+            <artifactId>biweekly</artifactId>
+            <version>0.6.8</version>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/com/swp/PodBookingSystem/configuration/OpenAPIConfig.java

@@ -0,0 +1,48 @@
+package com.swp.PodBookingSystem.configuration;
+
+import io.swagger.v3.oas.models.Components;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.info.License;
+import io.swagger.v3.oas.models.security.SecurityRequirement;
+import io.swagger.v3.oas.models.security.SecurityScheme;
+import io.swagger.v3.oas.models.servers.Server;
+import org.springdoc.core.models.GroupedOpenApi;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.List;
+
+@Configuration
+public class OpenAPIConfig {
+
+    @Bean
+    public GroupedOpenApi publicApi(@Value("${openapi.service.api-docs}") String apiDocs) {
+        return GroupedOpenApi.builder()
+                .group(apiDocs) // /v3/api-docs/api-service
+                .packagesToScan("com.swp.PodBookingSystem.controller")
+                .build();
+    }
+
+    @Bean
+    public OpenAPI openAPI(
+            @Value("${openapi.service.title}") String title,
+            @Value("${openapi.service.version}") String version,
+            @Value("${openapi.service.server}") String serverUrl) {
+        return new OpenAPI()
+                .servers(List.of(new Server().url(serverUrl)))
+                .info(new Info().title(title)
+                        .description("API documents")
+                        .version(version)
+                        .license(new License().name("Apache 2.0").url("https://springdoc.org")))
+                .components(
+                        new Components()
+                                .addSecuritySchemes("bearerAuth",
+                                        new SecurityScheme()
+                                                .type(SecurityScheme.Type.HTTP)
+                                                .scheme("bearer")
+                                                .bearerFormat("JWT")))
+                .security(List.of(new SecurityRequirement().addList("bearerAuth")));
+    }
+}

src/main/java/com/swp/PodBookingSystem/configuration/SecurityConfig.java

@@ -27,7 +27,7 @@
 @EnableWebSecurity
 @EnableMethodSecurity
 public class SecurityConfig {
-    private final String[] PUBLIC_ENDPOINTS = {"/accounts",
+    private final String[] PUBLIC_ENDPOINTS = {"/accounts", "/accounts/me",
             "/auth/login", "/auth/introspect", "/auth/refresh-token", "/auth/logout", "/auth/login/google"
     };
 
@@ -45,8 +45,8 @@ public class SecurityConfig {
     public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception {
         httpSecurity.
                 authorizeHttpRequests(request ->
-                        request.requestMatchers(HttpMethod.POST, PUBLIC_ENDPOINTS).permitAll()
-                                .anyRequest().authenticated())
+                        request.requestMatchers(PUBLIC_ENDPOINTS).permitAll()
+                                .anyRequest().permitAll())
                 .oauth2Login(oauth2login -> oauth2login.loginPage("http://localhost:3000/login")
                         .successHandler(((request, response, authentication) ->
                                 response.sendRedirect("/auth/login/google"))))
@@ -104,4 +104,4 @@ JwtDecoder jwtDecoder() {
                 .macAlgorithm(MacAlgorithm.HS512)
                 .build();
     }
-}
+}

src/main/java/com/swp/PodBookingSystem/controller/AccountController.java

@@ -1,18 +1,28 @@
 package com.swp.PodBookingSystem.controller;
 
 import com.swp.PodBookingSystem.dto.request.Account.AccountCreationRequest;
+import com.swp.PodBookingSystem.dto.request.Account.AccountResponseClient;
+import com.swp.PodBookingSystem.dto.request.Account.GetMeRequest;
+import com.swp.PodBookingSystem.dto.request.CalendarRequest;
 import com.swp.PodBookingSystem.dto.respone.ApiResponse;
 import com.swp.PodBookingSystem.dto.respone.AccountResponse;
 import com.swp.PodBookingSystem.entity.Account;
+import com.swp.PodBookingSystem.mapper.AccountMapper;
 import com.swp.PodBookingSystem.service.AccountService;
+import com.swp.PodBookingSystem.service.SendEmailService;
+import jakarta.mail.MessagingException;
 import jakarta.validation.Valid;
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
 import lombok.experimental.FieldDefaults;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.oauth2.jwt.Jwt;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @RestController
@@ -22,6 +32,8 @@
 @Slf4j
 public class AccountController {
     AccountService accountService;
+    AccountMapper accountMapper;
+    SendEmailService sendEmailService;
 
     @PostMapping
     ApiResponse<AccountResponse> createAccount(@RequestBody @Valid AccountCreationRequest request) {
@@ -33,10 +45,39 @@ ApiResponse<AccountResponse> createAccount(@RequestBody @Valid AccountCreationRe
     @GetMapping
     ApiResponse<List<Account>> getAccounts() {
         var authentication = SecurityContextHolder.getContext().getAuthentication();
-        log.info("Username: {}", authentication.getName());
         authentication.getAuthorities().forEach(grantedAuthority -> log.info(grantedAuthority.getAuthority()));
         return ApiResponse.<List<Account>>builder()
                 .data(accountService.getAccounts())
                 .build();
     }
+
+    @GetMapping("/{id}")
+    ApiResponse<AccountResponseClient> getAccountById(@PathVariable("id") String id) {
+        return ApiResponse.<AccountResponseClient>builder()
+                .data(accountMapper.toAccountResponseClient(accountService.getAccountById(id)))
+                .message("Thành cong ")
+                .build();
+    }
+
+    @GetMapping("/me")
+    ApiResponse<AccountResponseClient> getMe(@AuthenticationPrincipal Jwt jwt) {
+        var result = accountService.getAccountById("d6b9469e-978f-4f84-b2bb-5910c6240deb");
+        return ApiResponse.<AccountResponseClient>builder()
+                .data(accountMapper.toAccountResponseClient(result))
+                .message("Lấy thông tin cá nhân thành công")
+                .code(200)
+                .build();
+    }
+
+//    @GetMapping("/send-email")
+//    public String sendEmail() throws MessagingException, IOException {
+//        sendEmailService.sendCalenderInvite(
+//                CalendarRequest.builder()
+//                        .subject("test")
+//                        .description("test")
+//                        .summary("test")
+//                        .to("[email protected]")
+//                        .eventDateTime(LocalDateTime.now()).build());
+//        return "Send email successfully";
+//    }
 }

src/main/java/com/swp/PodBookingSystem/controller/AuthenticationController.java

@@ -12,7 +12,8 @@
 
 import com.swp.PodBookingSystem.dto.respone.RefreshTokenResponse;
 import com.swp.PodBookingSystem.service.AuthenticationService;
-import jakarta.servlet.http.HttpServletResponse;
+import com.swp.PodBookingSystem.service.SendEmailService;
+import jakarta.mail.MessagingException;
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
 import lombok.experimental.FieldDefaults;
@@ -22,7 +23,7 @@
 import org.springframework.web.servlet.view.RedirectView;
 
 import java.text.ParseException;
-import java.util.Map;
+
 
 @RestController
 @RequestMapping("/auth")
@@ -31,6 +32,7 @@
 @Slf4j
 public class AuthenticationController {
     AuthenticationService authenticationService;
+    SendEmailService sendEmailService;
 
     @GetMapping("/login/google")
     public RedirectView loginGoogle(OAuth2AuthenticationToken token) throws ParseException {
@@ -77,7 +79,8 @@ ApiResponse logout(@RequestBody LogoutRequest request)
     }
 
     @PostMapping("/forgot-password")
-    ApiResponse forgotPassword(@RequestBody ForgotPasswordRequest request) {
+    ApiResponse forgotPassword(@RequestBody ForgotPasswordRequest request) throws MessagingException {
+        authenticationService.forgotPassword(request);
         return ApiResponse.builder()
                 .message("Gửi mail xác nhận thành công")
                 .build();

src/main/java/com/swp/PodBookingSystem/controller/PaymentController.java

@@ -1,6 +1,5 @@
 package com.swp.PodBookingSystem.controller;
 
-import com.swp.PodBookingSystem.dto.request.Payment.PaymentReqDTO;
 import com.swp.PodBookingSystem.dto.respone.Payment.PaymentResDTO;
 import com.swp.PodBookingSystem.dto.respone.Payment.TransactionStatusDTO;
 import com.swp.PodBookingSystem.service.PaymentService;
@@ -20,9 +19,10 @@ public class PaymentController {
     private PaymentService paymentService;
 
     @GetMapping("/url")
-    public ResponseEntity<?> generatePaymentUrl(@Valid @RequestBody PaymentReqDTO paymentRequestDTO, HttpServletRequest request) {
+    public ResponseEntity<?> generatePaymentUrl( @RequestParam("amount") long amount,
+                                                 @RequestParam("orderId") String orderId, HttpServletRequest request) {
         String clientIp = request.getRemoteAddr();
-        PaymentResDTO paymentResDTO = paymentService.generatePaymentUrl(paymentRequestDTO.getAmount(), paymentRequestDTO.getOrderId(), clientIp);
+        PaymentResDTO paymentResDTO = paymentService.generatePaymentUrl(amount, orderId, clientIp);
         return ResponseEntity.status(HttpStatus.OK).body(paymentResDTO);
     }
 

src/main/java/com/swp/PodBookingSystem/controller/RoomController.java

@@ -1,11 +1,15 @@
 package com.swp.PodBookingSystem.controller;
 
+import com.swp.PodBookingSystem.dto.request.Room.RoomAvailabilityDTO;
+import com.swp.PodBookingSystem.dto.request.Slot.SlotCreationRequest;
 import com.swp.PodBookingSystem.dto.respone.ApiResponse;
 import com.swp.PodBookingSystem.dto.request.Room.RoomCreationRequest;
 import com.swp.PodBookingSystem.dto.request.Room.RoomPaginationDTO;
+import com.swp.PodBookingSystem.dto.respone.Calendar.DateResponse;
 import com.swp.PodBookingSystem.dto.respone.PaginationResponse;
 import com.swp.PodBookingSystem.dto.respone.Room.RoomResponse;
 import com.swp.PodBookingSystem.entity.Room;
+import com.swp.PodBookingSystem.service.OrderDetailService;
 import com.swp.PodBookingSystem.service.RoomService;
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
@@ -14,7 +18,9 @@
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
@@ -64,6 +70,46 @@ PaginationResponse<List<Room>> getFilteredRoom(@RequestParam(required = false) S
                 .build();
     }
 
+    @GetMapping("/available-rooms")
+    ApiResponse<List<Room>> getAvailableRoomsByRoomTypeId(@RequestParam  Integer typeId,
+                                                          @RequestParam(required = false)  List<String> slots) {
+        List<SlotCreationRequest> slotList = new ArrayList<>();
+        if(slots!=null) {
+            for(String slot: slots) {
+                String[] parts = slot.split("_");
+                LocalDateTime startTime = LocalDateTime.parse(parts[0]);
+                LocalDateTime endTime = LocalDateTime.parse(parts[1]);
+                slotList.add(new SlotCreationRequest(startTime,endTime));
+            }
+        }
+        return ApiResponse.<List<Room>>builder()
+                .data(roomService.getRoomByTypeAndSlot(typeId,slotList))
+                .message("Get rooms by typeId and slots successfully")
+                .build();
+    }
+
+    @GetMapping("/calendar")
+    ApiResponse<List<DateResponse>> getCalendar(@RequestParam List<Integer> roomIds,
+                                                @RequestParam(required = false) Integer servicePackageId,
+                                                @RequestParam LocalDate selectedDate,
+                                                @RequestParam List<String> slots
+                                        ) {
+        return ApiResponse.<List<DateResponse>>builder()
+                .data(roomService.getCalendar(roomIds,servicePackageId,selectedDate,slots))
+                .message("Get calendar successfully")
+                .build();
+    }
+
+    @GetMapping("/unavailable")
+    ApiResponse<List<RoomAvailabilityDTO>> getUnavailableRooms(@RequestParam LocalDateTime startTime,
+                                                                @RequestParam LocalDateTime endTime
+                                                               ) {
+        return ApiResponse.<List<RoomAvailabilityDTO>>builder()
+                .data(roomService.getUnavailableRooms(startTime,endTime))
+                .message("Get unavailable rooms successfully")
+                .build();
+    }
+
     @GetMapping("/{roomId}")
     ApiResponse<Optional<RoomResponse>> getRoomById(@PathVariable("roomId") int roomId) {
         return ApiResponse.<Optional<RoomResponse>>builder().data(roomService.getRoomById(roomId)).build();

src/main/java/com/swp/PodBookingSystem/controller/RoomTypeController.java

@@ -22,7 +22,6 @@
 @FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
 public class RoomTypeController {
     RoomTypeService roomTypeService;
-
     @PostMapping
     ApiResponse<RoomTypeResponse> createRoomType(@RequestBody RoomTypeCreationRequest request) {
         return ApiResponse.<RoomTypeResponse>builder()

src/main/java/com/swp/PodBookingSystem/controller/ServicePackageController.java

@@ -0,0 +1,33 @@
+package com.swp.PodBookingSystem.controller;
+
+import com.swp.PodBookingSystem.dto.respone.ApiResponse;
+import com.swp.PodBookingSystem.dto.respone.ServicePackage.ServicePackageResponse;
+import com.swp.PodBookingSystem.entity.Account;
+import com.swp.PodBookingSystem.entity.ServicePackage;
+import com.swp.PodBookingSystem.service.ServicePackageService;
+import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.FieldDefaults;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/service-package")
+@RequiredArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
+public class ServicePackageController {
+    @Autowired
+    ServicePackageService servicePackageService;
+
+    @GetMapping
+    ApiResponse<List<ServicePackage>> getServicePackages(){
+        return ApiResponse.<List<ServicePackage>>builder()
+                .data(servicePackageService.findAll())
+                .build();
+    }
+
+}

src/main/java/com/swp/PodBookingSystem/dto/request/Account/GetMeRequest.java

@@ -0,0 +1,13 @@
+package com.swp.PodBookingSystem.dto.request.Account;
+
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class GetMeRequest {
+    String id;
+}