diff --git a/Microservice/EventService/src/main/java/meetu/eventservice/model/UserEventTicket.java b/Microservice/EventService/src/main/java/meetu/eventservice/model/UserEventTicket.java index 6e52f52..5f48d61 100644 --- a/Microservice/EventService/src/main/java/meetu/eventservice/model/UserEventTicket.java +++ b/Microservice/EventService/src/main/java/meetu/eventservice/model/UserEventTicket.java @@ -9,6 +9,7 @@ import java.util.Date; import java.util.List; import org.springframework.data.annotation.Id; +import org.springframework.data.mongodb.core.index.Indexed; import org.springframework.data.mongodb.core.mapping.Document; /** @@ -20,6 +21,9 @@ public class UserEventTicket { @Id private String id; + + @Indexed + private String ticketId; private String uid; @@ -33,6 +37,14 @@ public class UserEventTicket { private Date participateDate; + public String getTicketId() { + return ticketId; + } + + public void setTicketId(String ticketId) { + this.ticketId = ticketId; + } + public List getEventTags() { if (eventTags == null) { eventTags = new ArrayList<>(); diff --git a/Microservice/EventService/src/main/java/meetu/eventservice/repository/UserEventTicketRepository.java b/Microservice/EventService/src/main/java/meetu/eventservice/repository/UserEventTicketRepository.java index e2cf846..7b18af6 100644 --- a/Microservice/EventService/src/main/java/meetu/eventservice/repository/UserEventTicketRepository.java +++ b/Microservice/EventService/src/main/java/meetu/eventservice/repository/UserEventTicketRepository.java @@ -15,6 +15,7 @@ */ public interface UserEventTicketRepository extends MongoRepository { + public UserEventTicket findByTicketId(String ticketId); } diff --git a/Microservice/EventService/src/main/java/meetu/eventservice/service/EventService.java b/Microservice/EventService/src/main/java/meetu/eventservice/service/EventService.java index b366347..799498a 100644 --- a/Microservice/EventService/src/main/java/meetu/eventservice/service/EventService.java +++ b/Microservice/EventService/src/main/java/meetu/eventservice/service/EventService.java @@ -434,7 +434,7 @@ public ResponseEntity findEventByElasticId(String elasticEventId) { public ResponseEntity userJoinEvent(UserEventTicket userJoinEvent) { HashMap responseBody = new HashMap<>(); System.out.println("------ Rest Template ------"); - UserEventTicket userEventTicketInDatabase = userEventTicketRespository.findById(userJoinEvent.getId()).get(); + UserEventTicket userEventTicketInDatabase = userEventTicketRespository.findByTicketId(userJoinEvent.getTicketId()); if (userEventTicketInDatabase != null) { System.out.println("!! userEventTicket !!"); System.out.println(userEventTicketInDatabase); @@ -451,7 +451,7 @@ public ResponseEntity userJoinEvent(UserEventTicket userJoinEvent) { } } responseBody.put("response", "This ticket is wrong perhaps not our ticket !!!"); - return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(responseBody); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(responseBody); } public ResponseEntity userReserveTicket(UserEventTicket userReserveTicket) { @@ -463,6 +463,7 @@ public ResponseEntity userReserveTicket(UserEventTicket userReserveTicket) { byte[] array = new byte[8]; // length is bounded by 7 new Random().nextBytes(array); String generateTicketKey = new String(array, Charset.forName("UTF-8")); + userReserveTicket.setTicketId(System.currentTimeMillis()+""); // userReserveTicket.setTicketKey(UUID.randomUUID().toString()); userReserveTicket.setEventTags(eventInDatabase.getEventTags()); userReserveTicket.setTicketKey(RandomStringUtils.randomAlphanumeric(8)); diff --git a/nuxt-firebase-auth-master/components/userProfileForm.vue b/nuxt-firebase-auth-master/components/userProfileForm.vue index aed9ed8..b567249 100644 --- a/nuxt-firebase-auth-master/components/userProfileForm.vue +++ b/nuxt-firebase-auth-master/components/userProfileForm.vue @@ -29,10 +29,20 @@

Information

-

Edit Preference: {{userForm.interest}} : {{userForm.interest.length}}/{{limitedSelectNumber}}

+

+ Edit + Preference: {{userForm.interest}} : {{userForm.interest.length}}/{{limitedSelectNumber}} +

+ Open camera +
+ + + +
+
{ + console.log(scanResponse) + this.$swal({ + type: "success", + title: "Success to scan QR Code!!!", + text: "Success to scan QR Code !!!" + }); + }) + .catch(err=>{ + his.$swal({ + type: "error", + title: "Error to scan QR Code !!!", + text: "Error to scan QR Code" + }); + }); + }, initUserProfile: function() { axios .get(`${process.env.USER_SERVICE}/user/${this.getUser.uid}`) diff --git a/nuxt-firebase-auth-master/pages/admin/items.vue b/nuxt-firebase-auth-master/pages/admin/items.vue index affa2af..5853584 100644 --- a/nuxt-firebase-auth-master/pages/admin/items.vue +++ b/nuxt-firebase-auth-master/pages/admin/items.vue @@ -1,71 +1,15 @@ - - diff --git a/nuxt-firebase-auth-master/pages/event/history.vue b/nuxt-firebase-auth-master/pages/event/history.vue index 555727e..8ad4cf8 100644 --- a/nuxt-firebase-auth-master/pages/event/history.vue +++ b/nuxt-firebase-auth-master/pages/event/history.vue @@ -3,12 +3,11 @@

Ticket(s)


- + @@ -24,6 +23,7 @@
View Detail +
Used: {{eventTicket.isParticipate}}
diff --git a/nuxt-firebase-auth-master/pages/ticket/_ticketId.vue b/nuxt-firebase-auth-master/pages/ticket/_ticketId.vue index aae47be..ea82708 100644 --- a/nuxt-firebase-auth-master/pages/ticket/_ticketId.vue +++ b/nuxt-firebase-auth-master/pages/ticket/_ticketId.vue @@ -79,6 +79,7 @@ export default { }, data() { return { + isCameraOpen: false, ticketEvent: { ticketDetail: [{ eventName: "E-Ticket" }] }, @@ -103,10 +104,14 @@ export default { .then(ticketResponse => { this.ticketEvent = ticketResponse.data[0]; let ticketEvent = ticketResponse.data[0]; - console.log(ticketResponse.data); + let test = ticketEvent.ticketId + + console.log(ticketEvent); this.qrCodeSrc = JSON.stringify({ + ticketId: ticketEvent.ticketId, elasticEventId: ticketEvent.elasticEventId, - ticketKey: ticketEvent.ticketKey + ticketKey: ticketEvent.ticketKey, + uid: this.getUser.uid }); }); },