Skip to content

Commit

Permalink
[SERVER] fix bug on updateBookingStatus
Browse files Browse the repository at this point in the history
  • Loading branch information
Huynh Thanh Binh committed Aug 7, 2020
1 parent 62bc532 commit 3b36761
Show file tree
Hide file tree
Showing 16 changed files with 33 additions and 32 deletions.
16 changes: 8 additions & 8 deletions .env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ SERVICE_DISCOVERY_HOST=service-discovery
SERVICE_DISCOVERY_PORT=8500

# version control
MESSAGE_QUEUE_VERSION=v2.4.0
SERVICE_DISCOVERY_VERSION=v2.4.0
MESSAGE_QUEUE_VERSION=v2.4
SERVICE_DISCOVERY_VERSION=v2.4

MAIL_SERVICE_VERSION=v2.4.0
AUTH_SERVICE_VERSION=v2.4.0
USER_SERVICE_VERSION=v2.4.0
PARKING_LOT_SERVICE_VERSION=v2.4.0
CONTACT_SERVICE_VERSION=v2.4.0
BOOKING_SERVICE_VERSION=v2.4.0
MAIL_SERVICE_VERSION=v2.4
AUTH_SERVICE_VERSION=v2.4
USER_SERVICE_VERSION=v2.4
PARKING_LOT_SERVICE_VERSION=v2.4
CONTACT_SERVICE_VERSION=v2.4
BOOKING_SERVICE_VERSION=v2.4

# port config: local port != docker port
MESSAGE_QUEUE_MANAGEMENT_PORT=15672
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/maven.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-16.04
continue-on-error: false
env:
SAIGONPARKING_VERSION: v2.4.0
SAIGONPARKING_VERSION: v2.4
steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/\__/ /| (_| || || (_| || (_) || | | | | | | (_| || | | < | || | | || (_| | |_/ \_________/ \___|
\____/ \__,_||_| \__, | \___/ |_| |_| \_| \__,_||_| |_|\_\|_||_| |_| \__, | ____\_/_________\_/_____
__/ | __/ |
|___/ |___/ v2.4.0 - ©Copyright 2020
|___/ |___/ v2.4 - ©Copyright 2020
</pre>

[![saigonparking-master action-status](https://github.com/huynhthanhbinh/saigonparking/workflows/saigonparking-master/badge.svg)](https://github.com/huynhthanhbinh/saigonparking/actions)
Expand Down
20 changes: 10 additions & 10 deletions dev/.env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@ SERVICE_DISCOVERY_HOST=service-discovery
SERVICE_DISCOVERY_PORT=8500

# Version control
PROXY_VERSION=v2.4.0
GATEWAY_VERSION=v2.4.0
MESSAGE_QUEUE_VERSION=v2.4.0
SERVICE_DISCOVERY_VERSION=v2.4.0
MAIL_SERVICE_VERSION=v2.4.0
AUTH_SERVICE_VERSION=v2.4.0
USER_SERVICE_VERSION=v2.4.0
PARKING_LOT_SERVICE_VERSION=v2.4.0
CONTACT_SERVICE_VERSION=v2.4.0
BOOKING_SERVICE_VERSION=v2.4.0
PROXY_VERSION=v2.4
GATEWAY_VERSION=v2.4
MESSAGE_QUEUE_VERSION=v2.4
SERVICE_DISCOVERY_VERSION=v2.4
MAIL_SERVICE_VERSION=v2.4
AUTH_SERVICE_VERSION=v2.4
USER_SERVICE_VERSION=v2.4
PARKING_LOT_SERVICE_VERSION=v2.4
CONTACT_SERVICE_VERSION=v2.4
BOOKING_SERVICE_VERSION=v2.4

# port config
PROXY_ADMIN_PORT=9901
Expand Down
2 changes: 1 addition & 1 deletion discovery/.env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
TIMEZONE=Asia/Bangkok
DOCKER_HUB_ID=saigonparkingmap

SERVICE_DISCOVERY_VERSION=v2.4.0
SERVICE_DISCOVERY_VERSION=v2.4

SERVICE_DISCOVERY_DNS_PORT=8600
SERVICE_DISCOVERY_HTTP_PORT=8500
Expand Down
2 changes: 1 addition & 1 deletion emulator/src/main/resources/banner.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
/\__/ /| (_| || || (_| || (_) || | | | | | | (_| || | | < | || | | || (_| | |_/ \_________/ \___|
\____/ \__,_||_| \__, | \___/ |_| |_| \_| \__,_||_| |_|\_\|_||_| |_| \__, | ____\_/_________\_/_____
__/ | __/ |
|___/ |___/ v2.4.0 - ©Copyright 2020
|___/ |___/ v2.4 - ©Copyright 2020
4 changes: 2 additions & 2 deletions gateway/.env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ TIMEZONE=Asia/Bangkok
DOCKER_HUB_ID=saigonparkingmap

# Version control
PROXY_VERSION=v2.4.0
GATEWAY_VERSION=v2.4.0
PROXY_VERSION=v2.4
GATEWAY_VERSION=v2.4
WEB_SERVER_VERSION=v1.0.3

# port config
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
</developers>

<properties>
<revision>v2.4.0</revision> <!-- version of project -->
<revision>v2.4</revision> <!-- version of project -->
<java.version>1.8</java.version> <!-- version of java (jdk) -->

<project.docker.hub-id>saigonparkingmap</project.docker.hub-id>
Expand Down
2 changes: 1 addition & 1 deletion queue/.env
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Global environment
TIMEZONE=Asia/Bangkok
DOCKER_HUB_ID=saigonparkingmap
MESSAGE_QUEUE_VERSION=v2.4.0
MESSAGE_QUEUE_VERSION=v2.4

RABBITMQ_CONFIG_FILE=/etc/rabbitmq/rabbitmq.conf
RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS=-rabbit log[{console,[{level,debug}]}]
Expand Down
2 changes: 1 addition & 1 deletion service/auth-service/src/main/resources/banner.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
/\__/ /| (_| || || (_| || (_) || | | | | | | (_| || | | < | || | | || (_| | |_/ \_________/ \___|
\____/ \__,_||_| \__, | \___/ |_| |_| \_| \__,_||_| |_|\_\|_||_| |_| \__, | ____\_/_________\_/_____
__/ | __/ |
|___/ |___/ v2.4.0 - ©Copyright 2020
|___/ |___/ v2.4 - ©Copyright 2020
1 change: 1 addition & 0 deletions ...main/java/com/bht/saigonparking/service/booking/service/main/impl/BookingServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ private void saveNewBookingHistory(@NotNull BookingHistoryEntity bookingHistoryE
if (bookingEntity.getIsFinished().equals(Boolean.FALSE)) {
bookingHistoryEntity.setBookingEntity(bookingEntity);
bookingHistoryRepository.saveAndFlush(bookingHistoryEntity);
return;
}
throw new BookingAlreadyFinishedException();
}
Expand Down
2 changes: 1 addition & 1 deletion service/booking-service/src/main/resources/banner.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
/\__/ /| (_| || || (_| || (_) || | | | | | | (_| || | | < | || | | || (_| | |_/ \_________/ \___|
\____/ \__,_||_| \__, | \___/ |_| |_| \_| \__,_||_| |_|\_\|_||_| |_| \__, | ____\_/_________\_/_____
__/ | __/ |
|___/ |___/ v2.4.0 - ©Copyright 2020
|___/ |___/ v2.4 - ©Copyright 2020
2 changes: 1 addition & 1 deletion service/contact-service/src/main/resources/banner.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
/\__/ /| (_| || || (_| || (_) || | | | | | | (_| || | | < | || | | || (_| | |_/ \_________/ \___|
\____/ \__,_||_| \__, | \___/ |_| |_| \_| \__,_||_| |_|\_\|_||_| |_| \__, | ____\_/_________\_/_____
__/ | __/ |
|___/ |___/ v2.4.0 - ©Copyright 2020
|___/ |___/ v2.4 - ©Copyright 2020
2 changes: 1 addition & 1 deletion service/mail-service/src/main/resources/banner.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
/\__/ /| (_| || || (_| || (_) || | | | | | | (_| || | | < | || | | || (_| | |_/ \_________/ \___|
\____/ \__,_||_| \__, | \___/ |_| |_| \_| \__,_||_| |_|\_\|_||_| |_| \__, | ____\_/_________\_/_____
__/ | __/ |
|___/ |___/ v2.4.0 - ©Copyright 2020
|___/ |___/ v2.4 - ©Copyright 2020
2 changes: 1 addition & 1 deletion service/parkinglot-service/src/main/resources/banner.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
/\__/ /| (_| || || (_| || (_) || | | | | | | (_| || | | < | || | | || (_| | |_/ \_________/ \___|
\____/ \__,_||_| \__, | \___/ |_| |_| \_| \__,_||_| |_|\_\|_||_| |_| \__, | ____\_/_________\_/_____
__/ | __/ |
|___/ |___/ v2.4.0 - ©Copyright 2020
|___/ |___/ v2.4 - ©Copyright 2020
2 changes: 1 addition & 1 deletion service/user-service/src/main/resources/banner.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
/\__/ /| (_| || || (_| || (_) || | | | | | | (_| || | | < | || | | || (_| | |_/ \_________/ \___|
\____/ \__,_||_| \__, | \___/ |_| |_| \_| \__,_||_| |_|\_\|_||_| |_| \__, | ____\_/_________\_/_____
__/ | __/ |
|___/ |___/ v2.4.0 - ©Copyright 2020
|___/ |___/ v2.4 - ©Copyright 2020

0 comments on commit 3b36761

Please sign in to comment.