docker-compose

hoangtien2k3 · hoangtien2k3 · commit 3d9bb1183674 · 2023-11-23T17:06:26.000+07:00
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,12 @@
+## start with a base image
 FROM maven:latest
-RUN mkdir /obo
-WORKDIR /obo
-COPY . .
-EXPOSE 8080
-CMD [ "mvn", "spring-boot:run" ]
+VOLUME /tmp
+ARG PROJECT_VERSION=0.0.1
+RUN mkdir -p /home/app
+WORKDIR /home/app
+ENV SPRING_PROFILES_ACTIVE application
+COPY ./ .
+ADD target/ticket-booking-api-0.0.1-SNAPSHOT.jar ticket-booking-api-0.0.1-SNAPSHOT.jar
+EXPOSE 8888
+ENTRYPOINT ["java", "-jar", "ticket-booking-api-0.0.1-SNAPSHOT.jar"]
+CMD ["mvn", "spring-boot:run"]
diff --git a/booking_ticket.sql b/booking_ticket.sql
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,33 @@
+version: '3'
+
+services:
+  mysql:
+    image: mysql:latest
+    environment:
+      MYSQL_ROOT_PASSWORD: 12042003
+      MYSQL_DATABASE: booking_ticket
+      MYSQL_USER: admin
+      MYSQL_PASSWORD: 12042003
+    ports:
+      - "3307:3306"
+
+  springboot-app:
+    image: ticket-booking-api:latest
+    volumes:
+      - /tmp
+      - ./booking_ticket.sql:/docker-entrypoint-initdb.d/init/sql
+    environment:
+      SPRING_PROFILES_ACTIVE: application
+      SPRING_DATASOURCE_URL: jdbc:mysql://mysql:3306/booking_ticket?useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=UTC
+      SPRING_DATASOURCE_USERNAME: admin
+      SPRING_DATASOURCE_PASSWORD: 12042003
+    working_dir: /home/app
+    ports:
+      - "8888:8888"
+    entrypoint: [ "java", "-jar", "ticket-booking-api-0.0.1-SNAPSHOT.jar" ]
+    depends_on:
+      - mysql
+    build:
+      context: .
+      args:
+        PROJECT_VERSION: 0.0.1
diff --git a/src/main/java/com/hoangtien2k3/ticketbookingapi/repository/CinemaRepository.java b/src/main/java/com/hoangtien2k3/ticketbookingapi/repository/CinemaRepository.java
@@ -13,7 +13,6 @@ public interface CinemaRepository extends JpaRepository<Cinema, Integer> {
     @Query(value = "SELECT `cinemas`.* FROM `cinemas`,`schedule`, `room` WHERE `schedule`.`room_id` = `room`.`room_id` AND `room`.`cinema_id`  = `cinemas`.`cinema_id` AND `schedule`.`schedule_id` = ?1", nativeQuery = true)
     Cinema getCinemasByIdSchedule(Integer schedule_id);
 
-
     @Query(nativeQuery = true, value = "SELECT `cinemas`.* FROM `cinemas`, `schedule`, `room` WHERE `schedule`.`room_id` = `room`.`room_id` AND `room`.`cinema_id` = `cinemas`.`cinema_id` AND `schedule`.`movie_id` = ?1 AND `schedule`.`schedule_date` = ?2")
     List<Cinema> getScheduleCinema(Integer movie_id, String schedule_date);
 
diff --git a/src/main/java/com/hoangtien2k3/ticketbookingapi/repository/UserRepository.java b/src/main/java/com/hoangtien2k3/ticketbookingapi/repository/UserRepository.java
@@ -14,11 +14,13 @@ public interface UserRepository extends JpaRepository<User, Integer> {
     // lấy thông tin user bằng id
     @Query(name = "getUserNameProfile", nativeQuery = true)
     UserNameProfile getUserById(Integer user_id);
+
     //Thêm user vào dữ liệu ;
     @Transactional
     @Modifying
     @Query(value = "INSERT INTO `users`( `username`, `password`, `user_avatar`, `user_fullname`, `user_birthday`, `user_gender`, `user_email`, `user_city`, `user_phone`, `user_point`) VALUES (?1,?2,?3,?4,?5,?6,?7,?8,?9,0)", nativeQuery = true)
     Integer registerUser(String username, String password, String user_avatar, String user_fullname, String user_birthday, Integer user_gender, String user_email, String user_city, String user_phone);
+
     //update
     @Transactional
     @Modifying
diff --git a/src/main/java/com/hoangtien2k3/ticketbookingapi/service/MovieService.java b/src/main/java/com/hoangtien2k3/ticketbookingapi/service/MovieService.java
@@ -23,7 +23,7 @@ public ResponseData<Movie> getAllMovie(){
     public ResponseData<Movie> getMoviesNow(){
         List<Movie> rs = movieRepository.getMoviesNow();
         if(CollectionUtils.isEmpty(rs)){
-            return new ResponseData(HttpStatus.NOT_FOUND, "failed", null);
+            return new ResponseData<>(HttpStatus.NOT_FOUND, "failed", null);
         }else{
             return new ResponseData(HttpStatus.OK, "successfully", rs);
         }
@@ -33,7 +33,7 @@ public ResponseData<Movie> getMoviesNow(){
     public ResponseData<Movie> getMoviesFuture(){
         List<Movie> rs = movieRepository.getMoviesFuture();
         if(CollectionUtils.isEmpty(rs)){
-            return new ResponseData(HttpStatus.NOT_FOUND, "failed", null);
+            return new ResponseData<>(HttpStatus.NOT_FOUND, "failed", null);
         }else{
             return new ResponseData(HttpStatus.OK, "successfully", rs);
         }
diff --git a/src/main/java/com/hoangtien2k3/ticketbookingapi/service/ScheduleService.java b/src/main/java/com/hoangtien2k3/ticketbookingapi/service/ScheduleService.java
@@ -23,7 +23,7 @@ public class ScheduleService {
     public ResponseData<ResponseScheduleCinema> getScheduleCinema(Integer movie_id, String schedule_date) {
         List<ResponseScheduleCinema> rs = scheduleRepository.getSchedule(movie_id, schedule_date);
         if (CollectionUtils.isEmpty(rs)) {  // CollectionUtils.isEmpty(rs): kiếm tra cả null lẫn empty
-            return new ResponseData(HttpStatus.NOT_FOUND,"Not found schedule", null);
+            return new ResponseData<>(HttpStatus.NOT_FOUND,"Not found schedule", null);
         } else {
             return new ResponseData(HttpStatus.OK,"successfully", scheduleRepository.getSchedule(movie_id, schedule_date));
         }
diff --git a/src/main/java/com/hoangtien2k3/ticketbookingapi/service/SeatService.java b/src/main/java/com/hoangtien2k3/ticketbookingapi/service/SeatService.java
@@ -14,7 +14,7 @@ public class SeatService {
 
     public ResponseData<Integer> getSeatEmpty(Integer schedule_id) {
         if (seatRepository.getSeatEmptyBySchedule(schedule_id).isEmpty()) {
-            return new ResponseData(HttpStatus.NOT_FOUND, "failed", null);
+            return new ResponseData<>(HttpStatus.NOT_FOUND, "failed", null);
         } else {
             return new ResponseData(HttpStatus.OK, "successfully", seatRepository.getSeatEmptyBySchedule(schedule_id));
         }
diff --git a/src/main/java/com/hoangtien2k3/ticketbookingapi/service/UserService.java b/src/main/java/com/hoangtien2k3/ticketbookingapi/service/UserService.java
@@ -33,13 +33,13 @@ public class UserService {
 
     public ResponseData<Integer> registerUser(@RequestBody User user) {
         if (userRepository.findByUsername(user.getUsername()) != null) {
-            return new ResponseData(HttpStatus.OK, "Register failed, user existed", 0);
+            return new ResponseData<>(HttpStatus.OK, "Register failed, user existed", 0);
         }
         if (userRepository.findByUsername(user.getUserEmail()) != null) {
-            return new ResponseData(HttpStatus.OK, "Register failed, email existed", 0);
+            return new ResponseData<>(HttpStatus.OK, "Register failed, email existed", 0);
         }
         if (userRepository.findByUsername(user.getUserPhone()) != null) {
-            return new ResponseData(HttpStatus.OK, "Register failed, phone existed", 0);
+            return new ResponseData<>(HttpStatus.OK, "Register failed, phone existed", 0);
         }
 
         String avatar;
@@ -49,15 +49,15 @@ public ResponseData<Integer> registerUser(@RequestBody User user) {
             avatar = "https://github.com/hoangtien2k3qx1/ticket-booking-api/blob/master/image/female.png";
         }
 
-        return new ResponseData(HttpStatus.OK, "success", userRepository.registerUser(user.getUsername(), passwordEncoder.encode(user.getPassword()), avatar, user.getUserFullname(), user.getUserBirthday(), user.getUserGender(), user.getUserEmail(), user.getUserCity(), user.getUserPhone()));
+        return new ResponseData<>(HttpStatus.OK, "success", userRepository.registerUser(user.getUsername(), passwordEncoder.encode(user.getPassword()), avatar, user.getUserFullname(), user.getUserBirthday(), user.getUserGender(), user.getUserEmail(), user.getUserCity(), user.getUserPhone()));
     }
 
     public ResponseData<String> loginUser(String username, String password) {
 
         Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(username, password));
         SecurityContextHolder.getContext().setAuthentication(authentication);
         String jwt = token.generateToken((UserDetails) authentication.getPrincipal());
-        return new ResponseData(HttpStatus.OK, "successfully", jwt);
+        return new ResponseData<>(HttpStatus.OK, "successfully", jwt);
 
     }
 
@@ -79,7 +79,7 @@ public ResponseData<String> updateUser(Authentication authentication, UserNamePr
     }
 
     public ResponseData<User> getInfo(Authentication authentication) {
-        return new ResponseData(HttpStatus.OK, "successfully", userRepository.findByUsername(authentication.getName()));
+        return new ResponseData<>(HttpStatus.OK, "successfully", userRepository.findByUsername(authentication.getName()));
     }
 
 }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -1,6 +1,11 @@
+## server port
 server.port=8888
 
-## Spring DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)
+## name local
+spring.application.name=ticket-booking-api
+
+## management endpoints
+management.endpoints.web.exposure.include=*
 
 ## data localhost
 spring.datasource.url=jdbc:mysql://localhost:3306/booking_ticket?useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false
@@ -9,14 +14,16 @@ spring.datasource.password=12042003
 
 ## hibernate properties
 ## the SQL dialect makes Hibernate generate better SQL for the chosen database
-spring.jpa.show-sql=true
-spring.jpa.properties.hibernate.format_sql=true
+spring.jpa.show-sql=false
+spring.jpa.properties.hibernate.format_sql=false
+spring.jpa.properties.hibernate.use_sql_comments=false
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
 logging.level.org.hibernate.SQL=DEBUG
 logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
 
 ## Hibernate ddl-auto (create, create-drop, validate, update)
 spring.jpa.hibernate.ddl-auto=update
 
+## secret key and expiration
 jwt.secret=VID2023
 
diff --git a/src/main/resources/booking_ticket.sql b/src/main/resources/booking_ticket.sql
@@ -4,16 +4,6 @@ SET AUTOCOMMIT = 0;
 START TRANSACTION;
 SET time_zone = "+00:00";
 
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8mb4 */;
-
--- Database: `data`
-
--- --------------------------------------------------------
-
 -- Table structure for table `booking`
 CREATE TABLE `booking` (
   `booking_id` int(11) NOT NULL,
@@ -24,8 +14,6 @@ CREATE TABLE `booking` (
   `seat_status` tinyint(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_vietnamese_ci;
 
--- --------------------------------------------------------
-
 -- Table structure for table `cinemas`
 CREATE TABLE `cinemas` (
   `cinema_id` int(11) NOT NULL,
@@ -3442,7 +3430,3 @@ ALTER TABLE `schedule`
 ALTER TABLE `seats`
   ADD CONSTRAINT `seats_ibfk_1` FOREIGN KEY (`room_id`) REFERENCES `room` (`room_id`);
 COMMIT;
-
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
diff --git a/src/main/resources/database.sql b/src/main/resources/database.sql

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public class ScheduleService {`
`23`	`23`	`public ResponseData<ResponseScheduleCinema> getScheduleCinema(Integer movie_id, String schedule_date) {`
`24`	`24`	`List<ResponseScheduleCinema> rs = scheduleRepository.getSchedule(movie_id, schedule_date);`
`25`	`25`	`if (CollectionUtils.isEmpty(rs)) { // CollectionUtils.isEmpty(rs): kiếm tra cả null lẫn empty`
`26`		`- return new ResponseData(HttpStatus.NOT_FOUND,"Not found schedule", null);`
	`26`	`+ return new ResponseData<>(HttpStatus.NOT_FOUND,"Not found schedule", null);`
`27`	`27`	`} else {`
`28`	`28`	`return new ResponseData(HttpStatus.OK,"successfully", scheduleRepository.getSchedule(movie_id, schedule_date));`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public class SeatService {`
`14`	`14`
`15`	`15`	`public ResponseData<Integer> getSeatEmpty(Integer schedule_id) {`
`16`	`16`	`if (seatRepository.getSeatEmptyBySchedule(schedule_id).isEmpty()) {`
`17`		`- return new ResponseData(HttpStatus.NOT_FOUND, "failed", null);`
	`17`	`+ return new ResponseData<>(HttpStatus.NOT_FOUND, "failed", null);`
`18`	`18`	`} else {`
`19`	`19`	`return new ResponseData(HttpStatus.OK, "successfully", seatRepository.getSeatEmptyBySchedule(schedule_id));`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,13 +33,13 @@ public class UserService {`
`33`	`33`
`34`	`34`	`public ResponseData<Integer> registerUser(@RequestBody User user) {`
`35`	`35`	`if (userRepository.findByUsername(user.getUsername()) != null) {`
`36`		`- return new ResponseData(HttpStatus.OK, "Register failed, user existed", 0);`
	`36`	`+ return new ResponseData<>(HttpStatus.OK, "Register failed, user existed", 0);`
`37`	`37`	`}`
`38`	`38`	`if (userRepository.findByUsername(user.getUserEmail()) != null) {`
`39`		`- return new ResponseData(HttpStatus.OK, "Register failed, email existed", 0);`
	`39`	`+ return new ResponseData<>(HttpStatus.OK, "Register failed, email existed", 0);`
`40`	`40`	`}`
`41`	`41`	`if (userRepository.findByUsername(user.getUserPhone()) != null) {`
`42`		`- return new ResponseData(HttpStatus.OK, "Register failed, phone existed", 0);`
	`42`	`+ return new ResponseData<>(HttpStatus.OK, "Register failed, phone existed", 0);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`String avatar;`
`@@ -49,15 +49,15 @@ public ResponseData<Integer> registerUser(@RequestBody User user) {`
`49`	`49`	`avatar = "https://github.com/hoangtien2k3qx1/ticket-booking-api/blob/master/image/female.png";`
`50`	`50`	`}`
`51`	`51`
`52`		`- return new ResponseData(HttpStatus.OK, "success", userRepository.registerUser(user.getUsername(), passwordEncoder.encode(user.getPassword()), avatar, user.getUserFullname(), user.getUserBirthday(), user.getUserGender(), user.getUserEmail(), user.getUserCity(), user.getUserPhone()));`
	`52`	`+ return new ResponseData<>(HttpStatus.OK, "success", userRepository.registerUser(user.getUsername(), passwordEncoder.encode(user.getPassword()), avatar, user.getUserFullname(), user.getUserBirthday(), user.getUserGender(), user.getUserEmail(), user.getUserCity(), user.getUserPhone()));`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`public ResponseData<String> loginUser(String username, String password) {`
`56`	`56`
`57`	`57`	`Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(username, password));`
`58`	`58`	`SecurityContextHolder.getContext().setAuthentication(authentication);`
`59`	`59`	`String jwt = token.generateToken((UserDetails) authentication.getPrincipal());`
`60`		`- return new ResponseData(HttpStatus.OK, "successfully", jwt);`
	`60`	`+ return new ResponseData<>(HttpStatus.OK, "successfully", jwt);`
`61`	`61`
`62`	`62`	`}`
`63`	`63`
`@@ -79,7 +79,7 @@ public ResponseData<String> updateUser(Authentication authentication, UserNamePr`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`public ResponseData<User> getInfo(Authentication authentication) {`
`82`		`- return new ResponseData(HttpStatus.OK, "successfully", userRepository.findByUsername(authentication.getName()));`
	`82`	`+ return new ResponseData<>(HttpStatus.OK, "successfully", userRepository.findByUsername(authentication.getName()));`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`}`