From 61828143a324edc3e0f3cbe0bd516631b8ef8d3e Mon Sep 17 00:00:00 2001 From: srivatsa Date: Sat, 24 Nov 2018 21:11:31 -0800 Subject: [PATCH 01/34] Modal V2 --- .../Maven__com_h2database_h2_1_4_197.xml | 13 + .../Maven__com_zaxxer_HikariCP_3_2_0.xml | 13 + ..._activation_javax_activation_api_1_2_0.xml | 13 + ..._persistence_javax_persistence_api_2_2.xml | 13 + ..._transaction_javax_transaction_api_1_2.xml | 13 + .../Maven__javax_xml_bind_jaxb_api_2_3_0.xml | 13 - ...nimo_specs_geronimo_jta_1_1_spec_1_1_1.xml | 13 - .../Maven__org_aspectj_aspectjrt_1_9_2.xml | 13 + ...Maven__org_aspectj_aspectjweaver_1_9_2.xml | 13 + ...rnate_commons_annotations_5_0_4_Final.xml} | 8 +- ..._hibernate_hibernate_core_5_3_6_Final.xml} | 8 +- ...te_hibernate_entitymanager_5_2_3_Final.xml | 13 - ...ence_hibernate_jpa_2_0_api_1_0_1_Final.xml | 13 - ...ence_hibernate_jpa_2_1_api_1_0_0_Final.xml | 13 - ...en__org_javassist_javassist_3_23_1_GA.xml} | 8 +- .../Maven__org_jboss_jandex_2_0_5_Final.xml | 13 + ..._transaction_api_1_2_spec_1_1_1_Final.xml} | 8 +- ...oot_spring_boot_devtools_2_1_0_RELEASE.xml | 13 + ..._spring_boot_starter_aop_2_0_0_RELEASE.xml | 13 + ...spring_boot_starter_jdbc_2_0_0_RELEASE.xml | 13 + ...k_boot_spring_boot_starter_jpa_unknown.xml | 13 + ...data_spring_data_commons_2_1_2_RELEASE.xml | 13 + ...ork_data_spring_data_jpa_2_0_1_RELEASE.xml | 13 + ...framework_spring_aspects_5_0_1_RELEASE.xml | 13 + ...ingframework_spring_jdbc_5_1_2_RELEASE.xml | 13 + ...ringframework_spring_orm_5_1_2_RELEASE.xml | 13 + ...pringframework_spring_tx_5_1_2_RELEASE.xml | 13 + .idea/workspace.xml | 374 ++++++++++++++---- EntertainmentBox.iml | 55 ++- pom.xml | 58 ++- .../entertainmentbox/dao/UserRepository.java | 10 + .../sjsu/entertainmentbox/model/Actor.java | 60 +++ .../sjsu/entertainmentbox/model/Customer.java | 3 +- .../model/CustomerSubscription.java | 3 +- .../sjsu/entertainmentbox/model/Movie.java | 175 ++++++++ .../entertainmentbox/model/MoviePlayLog.java | 3 +- .../sjsu/entertainmentbox/model/Rating.java | 72 ++++ .../entertainmentbox/model/Subscription.java | 2 + .../entertainmentbox/model/Transaction.java | 3 +- src/main/resources/application.properties | 5 +- target/classes/application.properties | 5 +- .../entertainmentbox/dao/UserRepository.class | Bin 0 -> 346 bytes .../sjsu/entertainmentbox/model/Actor.class | Bin 0 -> 2234 bytes .../entertainmentbox/model/Customer.class | Bin 2278 -> 2221 bytes .../model/CustomerSubscription.class | Bin 3296 -> 3257 bytes .../sjsu/entertainmentbox/model/Movie.class | Bin 0 -> 5347 bytes .../entertainmentbox/model/MoviePlayLog.class | Bin 2554 -> 2515 bytes .../sjsu/entertainmentbox/model/Rating.class | Bin 0 -> 2140 bytes .../entertainmentbox/model/Subscription.class | Bin 1348 -> 1377 bytes .../entertainmentbox/model/Transaction.class | Bin 2919 -> 2880 bytes .../sjsu/entertainmentbox/model/User.class | Bin 0 -> 1934 bytes .../sjsu/entertainmentbox/model/Users.class | Bin 1908 -> 0 bytes 52 files changed, 965 insertions(+), 194 deletions(-) create mode 100644 .idea/libraries/Maven__com_h2database_h2_1_4_197.xml create mode 100644 .idea/libraries/Maven__com_zaxxer_HikariCP_3_2_0.xml create mode 100644 .idea/libraries/Maven__javax_activation_javax_activation_api_1_2_0.xml create mode 100644 .idea/libraries/Maven__javax_persistence_javax_persistence_api_2_2.xml create mode 100644 .idea/libraries/Maven__javax_transaction_javax_transaction_api_1_2.xml delete mode 100644 .idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_geronimo_specs_geronimo_jta_1_1_spec_1_1_1.xml create mode 100644 .idea/libraries/Maven__org_aspectj_aspectjrt_1_9_2.xml create mode 100644 .idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_2.xml rename .idea/libraries/{Maven__org_hibernate_common_hibernate_commons_annotations_4_0_1_Final.xml => Maven__org_hibernate_common_hibernate_commons_annotations_5_0_4_Final.xml} (54%) rename .idea/libraries/{Maven__org_hibernate_hibernate_core_4_1_4_Final.xml => Maven__org_hibernate_hibernate_core_5_3_6_Final.xml} (56%) delete mode 100644 .idea/libraries/Maven__org_hibernate_hibernate_entitymanager_5_2_3_Final.xml delete mode 100644 .idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_0_api_1_0_1_Final.xml delete mode 100644 .idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml rename .idea/libraries/{Maven__org_javassist_javassist_3_15_0_GA.xml => Maven__org_javassist_javassist_3_23_1_GA.xml} (61%) create mode 100644 .idea/libraries/Maven__org_jboss_jandex_2_0_5_Final.xml rename .idea/libraries/{Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_1_spec_1_0_0_Final.xml => Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_1_1_Final.xml} (50%) create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_1_0_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_0_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_0_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jpa_unknown.xml create mode 100644 .idea/libraries/Maven__org_springframework_data_spring_data_commons_2_1_2_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_0_1_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_aspects_5_0_1_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_jdbc_5_1_2_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_orm_5_1_2_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_tx_5_1_2_RELEASE.xml create mode 100644 src/main/java/edu/sjsu/entertainmentbox/dao/UserRepository.java create mode 100644 src/main/java/edu/sjsu/entertainmentbox/model/Actor.java create mode 100644 src/main/java/edu/sjsu/entertainmentbox/model/Movie.java create mode 100644 src/main/java/edu/sjsu/entertainmentbox/model/Rating.java create mode 100644 target/classes/edu/sjsu/entertainmentbox/dao/UserRepository.class create mode 100644 target/classes/edu/sjsu/entertainmentbox/model/Actor.class create mode 100644 target/classes/edu/sjsu/entertainmentbox/model/Movie.class create mode 100644 target/classes/edu/sjsu/entertainmentbox/model/Rating.class create mode 100644 target/classes/edu/sjsu/entertainmentbox/model/User.class delete mode 100644 target/classes/edu/sjsu/entertainmentbox/model/Users.class diff --git a/.idea/libraries/Maven__com_h2database_h2_1_4_197.xml b/.idea/libraries/Maven__com_h2database_h2_1_4_197.xml new file mode 100644 index 0000000..5d268da --- /dev/null +++ b/.idea/libraries/Maven__com_h2database_h2_1_4_197.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_zaxxer_HikariCP_3_2_0.xml b/.idea/libraries/Maven__com_zaxxer_HikariCP_3_2_0.xml new file mode 100644 index 0000000..5ccc3aa --- /dev/null +++ b/.idea/libraries/Maven__com_zaxxer_HikariCP_3_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_javax_activation_api_1_2_0.xml b/.idea/libraries/Maven__javax_activation_javax_activation_api_1_2_0.xml new file mode 100644 index 0000000..2a6ad8a --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_javax_activation_api_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_persistence_javax_persistence_api_2_2.xml b/.idea/libraries/Maven__javax_persistence_javax_persistence_api_2_2.xml new file mode 100644 index 0000000..8822cbd --- /dev/null +++ b/.idea/libraries/Maven__javax_persistence_javax_persistence_api_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_transaction_javax_transaction_api_1_2.xml b/.idea/libraries/Maven__javax_transaction_javax_transaction_api_1_2.xml new file mode 100644 index 0000000..d06b8da --- /dev/null +++ b/.idea/libraries/Maven__javax_transaction_javax_transaction_api_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_0.xml b/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_0.xml deleted file mode 100644 index e472f77..0000000 --- a/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_jta_1_1_spec_1_1_1.xml b/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_jta_1_1_spec_1_1_1.xml deleted file mode 100644 index 2ff86f5..0000000 --- a/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_jta_1_1_spec_1_1_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_aspectj_aspectjrt_1_9_2.xml b/.idea/libraries/Maven__org_aspectj_aspectjrt_1_9_2.xml new file mode 100644 index 0000000..545920a --- /dev/null +++ b/.idea/libraries/Maven__org_aspectj_aspectjrt_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_2.xml b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_2.xml new file mode 100644 index 0000000..29eb188 --- /dev/null +++ b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_1_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_0_4_Final.xml similarity index 54% rename from .idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_1_Final.xml rename to .idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_0_4_Final.xml index 34c2458..f3211b1 100644 --- a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_1_Final.xml +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_0_4_Final.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_1_4_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_5_3_6_Final.xml similarity index 56% rename from .idea/libraries/Maven__org_hibernate_hibernate_core_4_1_4_Final.xml rename to .idea/libraries/Maven__org_hibernate_hibernate_core_5_3_6_Final.xml index 081b923..ad6ca12 100644 --- a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_1_4_Final.xml +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_5_3_6_Final.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_entitymanager_5_2_3_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_entitymanager_5_2_3_Final.xml deleted file mode 100644 index dfc053d..0000000 --- a/.idea/libraries/Maven__org_hibernate_hibernate_entitymanager_5_2_3_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_0_api_1_0_1_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_0_api_1_0_1_Final.xml deleted file mode 100644 index 7c580a2..0000000 --- a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_0_api_1_0_1_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml deleted file mode 100644 index fef4d7d..0000000 --- a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_15_0_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_23_1_GA.xml similarity index 61% rename from .idea/libraries/Maven__org_javassist_javassist_3_15_0_GA.xml rename to .idea/libraries/Maven__org_javassist_javassist_3_23_1_GA.xml index dbd6e38..fd02c27 100644 --- a/.idea/libraries/Maven__org_javassist_javassist_3_15_0_GA.xml +++ b/.idea/libraries/Maven__org_javassist_javassist_3_23_1_GA.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_2_0_5_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_2_0_5_Final.xml new file mode 100644 index 0000000..e8e2ac1 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_2_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_1_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_1_1_Final.xml similarity index 50% rename from .idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_1_spec_1_0_0_Final.xml rename to .idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_1_1_Final.xml index 9b454f9..27f29c1 100644 --- a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_1_spec_1_0_0_Final.xml +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_1_1_Final.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_1_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_1_0_RELEASE.xml new file mode 100644 index 0000000..482859b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_1_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_0_RELEASE.xml new file mode 100644 index 0000000..4d59cbd --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_0_RELEASE.xml new file mode 100644 index 0000000..6fba3b4 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jpa_unknown.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jpa_unknown.xml new file mode 100644 index 0000000..460b3cb --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jpa_unknown.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_1_2_RELEASE.xml new file mode 100644 index 0000000..dba4e72 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_1_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_0_1_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_0_1_RELEASE.xml new file mode 100644 index 0000000..fee0741 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_0_1_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aspects_5_0_1_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aspects_5_0_1_RELEASE.xml new file mode 100644 index 0000000..809654c --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aspects_5_0_1_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_1_2_RELEASE.xml new file mode 100644 index 0000000..9356e57 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_1_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_5_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_5_1_2_RELEASE.xml new file mode 100644 index 0000000..ebb553c --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_5_1_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_5_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_5_1_2_RELEASE.xml new file mode 100644 index 0000000..13cf9d0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_5_1_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 572cb1e..069ff9a 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,46 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - + + + + + classPath HikariDataSource jaxb + hibernate + jpa + started + dev + h2 + test + hi + jdbc + actor @@ -85,9 +147,18 @@ @@ -173,6 +244,7 @@ - - - + + @@ -243,7 +324,7 @@ - + - - - - - @@ -298,33 +374,33 @@ - - - - - - + - - - - - + + + + + - + - - - - - + + + + + + + + + + @@ -338,13 +414,6 @@ - - - - - - - @@ -355,68 +424,219 @@ - - - - + - - + + - + - - + + - + + + + + + + + - - + + - - + + + + + + + + + + + + + + + + + - + - - + + + + + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + diff --git a/EntertainmentBox.iml b/EntertainmentBox.iml index 3eeec25..501c8d2 100644 --- a/EntertainmentBox.iml +++ b/EntertainmentBox.iml @@ -10,22 +10,13 @@ - - - - - - - - - - - - - - + + + + + @@ -34,6 +25,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -47,7 +67,6 @@ - @@ -65,25 +84,19 @@ - - - - - - diff --git a/pom.xml b/pom.xml index 1fa5fe9..35b84f2 100644 --- a/pom.xml +++ b/pom.xml @@ -24,6 +24,57 @@ + org.springframework.boot + spring-boot-starter-jpa + + + org.springframework.boot + spring-boot-devtools + runtime + + + + com.h2database + h2 + runtime + + + org.springframework.boot + spring-boot-starter-aop + 2.0.0.RELEASE + compile + + + org.springframework.boot + spring-boot-starter-jdbc + 2.0.0.RELEASE + compile + + + org.hibernate + hibernate-core + 5.3.6.Final + compile + + + javax.transaction + javax.transaction-api + 1.2 + compile + + + org.springframework.data + spring-data-jpa + 2.0.1.RELEASE + compile + + + org.springframework + spring-aspects + 5.0.1.RELEASE + compile + + org.springframework.boot spring-boot-starter-web @@ -56,10 +107,7 @@ org.springframework spring-context - - org.springframework - spring-aop - + org.springframework spring-webmvc diff --git a/src/main/java/edu/sjsu/entertainmentbox/dao/UserRepository.java b/src/main/java/edu/sjsu/entertainmentbox/dao/UserRepository.java new file mode 100644 index 0000000..cb888e9 --- /dev/null +++ b/src/main/java/edu/sjsu/entertainmentbox/dao/UserRepository.java @@ -0,0 +1,10 @@ +package edu.sjsu.entertainmentbox.dao; + + +import edu.sjsu.entertainmentbox.model.User; +import org.springframework.data.repository.CrudRepository; + +public interface UserRepository extends CrudRepository { + + +} diff --git a/src/main/java/edu/sjsu/entertainmentbox/model/Actor.java b/src/main/java/edu/sjsu/entertainmentbox/model/Actor.java new file mode 100644 index 0000000..44e30f3 --- /dev/null +++ b/src/main/java/edu/sjsu/entertainmentbox/model/Actor.java @@ -0,0 +1,60 @@ +package edu.sjsu.entertainmentbox.model; + +import javax.persistence.*; +import java.util.HashSet; +import java.util.Set; + +@Entity +public class Actor { + + private Integer actorId; + private String name; + private Set movies = new HashSet<>(0); + private Integer movieOrderId; + + public Actor() { + } + + public Actor(String name, Integer movieOrderId) { + this.name = name; + this.movieOrderId = movieOrderId; + } + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + @Column(name = "ACTOR_ID", nullable = false, unique = true) + public Integer getActorId() { + return actorId; + } + + public void setActorId(Integer actorId) { + this.actorId = actorId; + } + + @Column(name = "ACTOR_NAME") + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @ManyToMany(fetch = FetchType.LAZY, mappedBy = "actors") + public Set getMovies() { + return movies; + } + + public void setMovies(Set movies) { + this.movies = movies; + } + + @Column(name = "MVE_ORD_ID") + public Integer getMovieOrderId() { + return movieOrderId; + } + + public void setMovieOrderId(Integer movieOrderId) { + this.movieOrderId = movieOrderId; + } +} diff --git a/src/main/java/edu/sjsu/entertainmentbox/model/Customer.java b/src/main/java/edu/sjsu/entertainmentbox/model/Customer.java index 947e64a..37fd5aa 100644 --- a/src/main/java/edu/sjsu/entertainmentbox/model/Customer.java +++ b/src/main/java/edu/sjsu/entertainmentbox/model/Customer.java @@ -14,8 +14,7 @@ public class Customer { public Customer() { } - public Customer(Integer customerId, String emailAddress, Set subscription) { - this.customerId = customerId; + public Customer(String emailAddress, Set subscription) { this.emailAddress = emailAddress; this.subscription = subscription; } diff --git a/src/main/java/edu/sjsu/entertainmentbox/model/CustomerSubscription.java b/src/main/java/edu/sjsu/entertainmentbox/model/CustomerSubscription.java index 064fb64..ccee6fa 100644 --- a/src/main/java/edu/sjsu/entertainmentbox/model/CustomerSubscription.java +++ b/src/main/java/edu/sjsu/entertainmentbox/model/CustomerSubscription.java @@ -17,8 +17,7 @@ public class CustomerSubscription { public CustomerSubscription() { } - public CustomerSubscription(Integer subscriptionId, Customer customer, String subscriptionType, Integer price, Date subscriptionTS, Date subscriptionStartDate, Date subscriptionEndDate) { - this.subscriptionId = subscriptionId; + public CustomerSubscription(Customer customer, String subscriptionType, Integer price, Date subscriptionTS, Date subscriptionStartDate, Date subscriptionEndDate) { this.customer = customer; this.subscriptionType = subscriptionType; this.price = price; diff --git a/src/main/java/edu/sjsu/entertainmentbox/model/Movie.java b/src/main/java/edu/sjsu/entertainmentbox/model/Movie.java new file mode 100644 index 0000000..34449a1 --- /dev/null +++ b/src/main/java/edu/sjsu/entertainmentbox/model/Movie.java @@ -0,0 +1,175 @@ +package edu.sjsu.entertainmentbox.model; + +import javax.persistence.*; +import java.util.HashSet; +import java.util.Set; + +@Entity +public class Movie { + + private Integer movieId; + private String title; + private String genre; + private Integer year; + private String studio; + private String synopsis; + private String Image; + private String Movie; + private Set actors = new HashSet(0); + private Integer directorId; + private String country; + private Integer rating; + private String movieType; + private Integer price; + + public Movie() { + } + + public Movie(String title, String genre, Integer year, String studio, String synopsis, String image, String movie, Set actors, Integer directorId, String country, Integer rating, String movieType, Integer price) { + this.title = title; + this.genre = genre; + this.year = year; + this.studio = studio; + this.synopsis = synopsis; + Image = image; + Movie = movie; + this.actors = actors; + this.directorId = directorId; + this.country = country; + this.rating = rating; + this.movieType = movieType; + this.price = price; + } + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + @Column(name = "MOVIE_ID", nullable = false, unique = true) + public Integer getMovieId() { + return movieId; + } + + public void setMovieId(Integer movieId) { + this.movieId = movieId; + } + + @Column(name = "TITLE") + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + @Column(name = "GENRE") + public String getGenre() { + return genre; + } + + public void setGenre(String genre) { + this.genre = genre; + } + + @Column(name = "YEAR") + public Integer getYear() { + return year; + } + + public void setYear(Integer year) { + this.year = year; + } + + @Column(name = "STUDIO") + public String getStudio() { + return studio; + } + + public void setStudio(String studio) { + this.studio = studio; + } + + @Column(name = "SYNOPSIS") + public String getSynopsis() { + return synopsis; + } + + public void setSynopsis(String synopsis) { + this.synopsis = synopsis; + } + + @Column(name = "IMAGE") + public String getImage() { + return Image; + } + + public void setImage(String image) { + Image = image; + } + + @Column(name = "MOVIE") + public String getMovie() { + return Movie; + } + + public void setMovie(String movie) { + Movie = movie; + } + + + @Column(name = "DIRECTOR_ID") + public Integer getDirectorId() { + return directorId; + } + + public void setDirectorId(Integer directorId) { + this.directorId = directorId; + } + + @Column(name = "COUNTRY") + public String getCountry() { + return country; + } + + public void setCountry(String country) { + this.country = country; + } + + @Column(name = "RATING") + public Integer getRating() { + return rating; + } + + public void setRating(Integer rating) { + this.rating = rating; + } + + @Column(name = "MOVIE_TYPE") + public String getMovieType() { + return movieType; + } + + public void setMovieType(String movieType) { + this.movieType = movieType; + } + + @Column(name = "PRICE") + public Integer getPrice() { + return price; + } + + public void setPrice(Integer price) { + this.price = price; + } + + @ManyToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL) + @JoinTable(name = "Movie_Actor", joinColumns = { + @JoinColumn(name = "MOVIE_ID", nullable = false, updatable = false)}, + inverseJoinColumns = {@JoinColumn(name = "ACTOR_ID", nullable = false, updatable = false)}) + public Set getActors() { + return actors; + } + + public void setActors(Set actors) { + this.actors = actors; + } +} diff --git a/src/main/java/edu/sjsu/entertainmentbox/model/MoviePlayLog.java b/src/main/java/edu/sjsu/entertainmentbox/model/MoviePlayLog.java index 0460a3b..11adf63 100644 --- a/src/main/java/edu/sjsu/entertainmentbox/model/MoviePlayLog.java +++ b/src/main/java/edu/sjsu/entertainmentbox/model/MoviePlayLog.java @@ -17,8 +17,7 @@ public class MoviePlayLog { public MoviePlayLog() { } - public MoviePlayLog(Integer logId, Integer customerId, String playStatus, Integer movieId, Date mveStartTs, Date mveEndTS) { - this.logId = logId; + public MoviePlayLog(Integer customerId, String playStatus, Integer movieId, Date mveStartTs, Date mveEndTS) { this.customerId = customerId; this.playStatus = playStatus; this.movieId = movieId; diff --git a/src/main/java/edu/sjsu/entertainmentbox/model/Rating.java b/src/main/java/edu/sjsu/entertainmentbox/model/Rating.java new file mode 100644 index 0000000..ce132c6 --- /dev/null +++ b/src/main/java/edu/sjsu/entertainmentbox/model/Rating.java @@ -0,0 +1,72 @@ +package edu.sjsu.entertainmentbox.model; + +import javax.persistence.*; +import java.util.Date; + +@Entity +public class Rating { + + private Integer ratingId; + private Integer customerId; + private Integer movieId; + private Integer rating; + private Date ratingTS; + + public Rating() { + } + + public Rating(Integer customerId, Integer movieId, Integer rating, Date ratingTS) { + this.customerId = customerId; + this.movieId = movieId; + this.rating = rating; + this.ratingTS = ratingTS; + } + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + @Column(name = "RATING_ID", nullable = false, unique = true) + public Integer getRatingId() { + return ratingId; + } + + public void setRatingId(Integer ratingId) { + this.ratingId = ratingId; + } + + @Column(name = "CUST_ID") + public Integer getCustomerId() { + return customerId; + } + + public void setCustomerId(Integer customerId) { + this.customerId = customerId; + } + + @Column(name = "MOVIE_ID") + public Integer getMovieId() { + return movieId; + } + + public void setMovieId(Integer movieId) { + this.movieId = movieId; + } + + @Column(name = "RATING") + public Integer getRating() { + return rating; + } + + public void setRating(Integer rating) { + this.rating = rating; + } + + @Temporal(TemporalType.DATE) + @Column(name = "RATING_TS") + public Date getRatingTS() { + return ratingTS; + } + + public void setRatingTS(Date ratingTS) { + this.ratingTS = ratingTS; + } +} diff --git a/src/main/java/edu/sjsu/entertainmentbox/model/Subscription.java b/src/main/java/edu/sjsu/entertainmentbox/model/Subscription.java index d1a1d48..8d7c0a2 100644 --- a/src/main/java/edu/sjsu/entertainmentbox/model/Subscription.java +++ b/src/main/java/edu/sjsu/entertainmentbox/model/Subscription.java @@ -2,6 +2,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Id; @Entity public class Subscription { @@ -16,6 +17,7 @@ public Subscription(String type, String name, Integer discount) { this.discount = discount; } + @Id @Column(name = "SUBSCRPTN_TYPE") public String getType() { return type; diff --git a/src/main/java/edu/sjsu/entertainmentbox/model/Transaction.java b/src/main/java/edu/sjsu/entertainmentbox/model/Transaction.java index 5bb628e..c3ee1d6 100644 --- a/src/main/java/edu/sjsu/entertainmentbox/model/Transaction.java +++ b/src/main/java/edu/sjsu/entertainmentbox/model/Transaction.java @@ -17,8 +17,7 @@ public class Transaction { public Transaction() { } - public Transaction(Integer transactionId, Integer customerId, String transType, String transAmt, Date transactionStartTS, Date transactionEndTS, String transactionStatus) { - this.transactionId = transactionId; + public Transaction(Integer customerId, String transType, String transAmt, Date transactionStartTS, Date transactionEndTS, String transactionStatus) { this.customerId = customerId; this.transType = transType; this.transAmt = transAmt; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 57451da..aecc278 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,3 +1,6 @@ # Sample properties used by Spring configuration in ApplicationConfig. -HelloWorld.SiteName=Sample App \ No newline at end of file +HelloWorld.SiteName=Sample App + +# Enabling H2 Console +spring.h2.console.enabled=true \ No newline at end of file diff --git a/target/classes/application.properties b/target/classes/application.properties index 57451da..aecc278 100644 --- a/target/classes/application.properties +++ b/target/classes/application.properties @@ -1,3 +1,6 @@ # Sample properties used by Spring configuration in ApplicationConfig. -HelloWorld.SiteName=Sample App \ No newline at end of file +HelloWorld.SiteName=Sample App + +# Enabling H2 Console +spring.h2.console.enabled=true \ No newline at end of file diff --git a/target/classes/edu/sjsu/entertainmentbox/dao/UserRepository.class b/target/classes/edu/sjsu/entertainmentbox/dao/UserRepository.class new file mode 100644 index 0000000000000000000000000000000000000000..0bc2795b4b259d3bdd077a173e2a2c998615d69b GIT binary patch literal 346 zcmb7A%}N7749@t|ZR;e~fV2~bS$8KTGo$v>2lL53LA2 zcu4XEk}uzvukVjf0GPp91>*`P6-*6G=H3NLS=qp*Y3Y@)qu}si(eg6Yji|%8QXky2 zQqOOqFK8(dDz7B^B)Y~s&GvEE-ZX48#x`c;kXRG>&=<6jckIP-hfk5U{&lO7;Og7j zz;rHImwfNLqUK^dwx_+?YBO+onB0;K)cYL+=YJg;xcpTcOU F)enN=a3}x( literal 0 HcmV?d00001 diff --git a/target/classes/edu/sjsu/entertainmentbox/model/Actor.class b/target/classes/edu/sjsu/entertainmentbox/model/Actor.class new file mode 100644 index 0000000000000000000000000000000000000000..8765159720594990562e1dd7848863a6b9964f0c GIT binary patch literal 2234 zcmb7FYjfK~6ut7Zc0`>xiJ=WGp$}@i57AOei9?F(B(1@Ynb>%y`O;DB#ZktVg0$*1 z{|aWvbOvVl0sJV2b62*bxC(7Qc(uFt>fCeg9b4XE;Z`(C*yc!Rln({l(zWaX zVyThy$`YPNxghFGYiP8EL@3j?2DT}E7w_ABM8aHyeSc*u~=+drlOKT*$mS=%h)wUgJ zO3Sgqs-WI@Z5#>Lvpgy6o-pctkhm5RcqVM&no{(;=Fk^Ny5LD(503vgAC)@CN1UIi z{@iJ4bU6aM<_!Ij&6w3%r?vaCzKN;r4~N{zILt*jci*;t_0>v)b}yv85bjyHLuqtq zM_Fm`LW0;e^yv%oG~#@ zZfxYrO!oULW7yoJanr9V+w5+=Z0&BUv(8Ouorc?v@AkyD#a~udx%?jA6w&_Kg2m-= zMW;nt!pW#BMag<@dIxPGIndDQBIR__=_8%;G^bOR<}|wbu6se%)@c6po@(tMik^g_ zi}g~MKF7tDfkP9x^ni$2jBBVT3c|VbYQBJdl*K%YJrKpXj8zS9YIrV`-;h@Ri()V0 zZzz63iQm<01&kMozkwVQb%4#&$5`pXOY{j{!ioVej{z;@asJ9IVEOh5CChhCD0K>5 zpd?cBW9UUNS_06rDzO^Cj7tDe>0+)cN=Xa_SLjpdVjTun97~q}p!9E;#E7}4)aFWv zb8-xL1<@NQaTU+ckhLn%%WHHUTe^qH%{}^pZtYPKu@aRra+wX_#u%5?q)&zLe-7g$ zX;sxK1X)w^DRnqZ@iyH-Y?g9zmhz2rD9-`nI)31I7ms^N_*=}9v&@QMRyv0n+l85Z zN%tXsmRVw!+1&_cfyW*YH#HBauORWEps(o>edEz%?0idWW7$99Ic=e`SzH}e(8Bv5 z`rsU*fuAd=5!f#UYc2pgsJ@QbcaeTb%}RI_A%Urfn!5qCC(*|q@^8R-4V)|IaOQ7L RgWm4}AET=35S#KT(SKyRyQlyF literal 0 HcmV?d00001 diff --git a/target/classes/edu/sjsu/entertainmentbox/model/Customer.class b/target/classes/edu/sjsu/entertainmentbox/model/Customer.class index 14ce5b06074da57141b06f7a731bf2759ddd6405..42b43ca70e7a2d6bf8bb0d3f68fd55ca76b688df 100644 GIT binary patch delta 271 zcmYj~u}%U(5QhKRyWK-Lg$4DZi6@CBY)%R&2yZ~4y$OkQJcW&orIpkA2F3(5go4D5 zng^h=vG)!5b2Mg?$?W&d%>U~@{A?oTI_O&3`YO432w!V?iE1^ZDGpE-1pSVKKHIma zM?`$Ud9j2PE12;T(E@RCvw$tS?B=u)j#*D(Sv_K;sG~{N!WrucX?uT#GZ}xp2c|*F z?hr>XoWwuUAgKfT=`NaXMrFzfw_nj8cdy&T+nkY?`j=!nO>*5hFIRM#z9&5$(s$?s U{YbjxExoJU+8$ZI+?iJfJMG^rfB*mh delta 313 zcmZuqu}T9`5S+c2_g+jc>Wf}N6rzH~`C>S;If0l=D{g8UnT<0({zf^TKeemjHlZ8=}$MPXTR1xC<` zDZ~P*!Y!d8*hC})_*ooksLLh6kXlf_NjHLgt6*O88j>K?OsrrLif_yYcdVmTel$ll w{o5Ply`?{=#yY3PI=5_-?~J2OKCy@VWt@(ov6X8dHla3u+n(MLZdbVO5Agjp*8l(j diff --git a/target/classes/edu/sjsu/entertainmentbox/model/CustomerSubscription.class b/target/classes/edu/sjsu/entertainmentbox/model/CustomerSubscription.class index 1266d9f024089cdf9d3d5bd63cb768d96f523fa6..df56050c8d8829a452cfcb67698d5d14afa1b22c 100644 GIT binary patch delta 407 zcmYMvyGjE=7zN;e*1hknalC~!vZy3M6JrG9rLZt4B8p(45d?1!AlO-GfW_0xc+ z!R#2yj)=6P2A`@1f4TR;16kw|QJF8iQv8f$QG#=VeC~MT+at&ue+??oD4x(IOpua< z9ek0!!x;5Q!Xnv{FiVakY?I4XKjFGIYK)sY&u9KLx3zJK=#;qQ&-0pZR7ETf7WmdT z&J3&$%kz1Vau+@){u)$yH89R1d`UbPrhF3^wJhEW%ft5n?}T#66_lG&enhzz8nupc wjoqliSD|q>;alQ|QOck29r1VgY-F5W_@21YDPKlL9l-aw3p;`xi+$+AFXmB5J^%m! delta 434 zcmYk2O-n*S6o${J_uiR%Zy%GX+_VcWlv3fgs3;=nVIX#opw{jB2OW=5&0=`ZJkL8Y^Wc4WH|HXDI#%APAJl{0db<^r+WXB` zb8il7V*Kt|TtvbSxVUZlcx1k*CkTNAfC4tGOf=_N_aJX+4uMB|78IUY>1rNQFhcWs z&xIt--Bkd(3k0V==%-fqYybu!%t;fCa2kRr7@USFnVe#jENc7srDE8TTBI?M%a~Hy z$dH}ISCzmk>0?W2k;fOgijTwsViU|t%16`IVv>3ZJW+Y9*xHyOK1+NGuZhhw3+yZ^ zM;nX8mbiOt`?%p~QDlDT#PQwEVTYU*a?0#XJ3dNRi?ttTA#VMBj?K@lki5zAC&{Dq Xh^^lXi*7Fd?>BpeDivy6xO9`>Q}t3M diff --git a/target/classes/edu/sjsu/entertainmentbox/model/Movie.class b/target/classes/edu/sjsu/entertainmentbox/model/Movie.class new file mode 100644 index 0000000000000000000000000000000000000000..7f53af09bb46c1b9bf1eaa16276f88458fc46c2f GIT binary patch literal 5347 zcmd6qZF3V<6vxlDc}`l|0>z*_6hX@J5KxhaLM5aR1lp!1X(gqI+hhq_lTArBNL745 z1r-HUoY5D)(09Jj(HS$$=!_r0593F0{GYp-uF`n9eKYf7Y`==n%oH`KgZ9+JpyXhuPmsIO@>Wt25N&x3hY zFJsWPtSV)RJQbsw(@GNgD$9ClsiIXdC0&m78lfVT3Ikv zC}owxtWwta+3Iu|SJ>0tZ5f3GApC3aQ86FeQ{RrqPO^4o?Q&oOPRHY-G44&Ag>xCemJT(4(@SSP@-@W!LAk6S*@ZWKBKx` zG7$A89pTw8-nbrFQp-4)hN@@PNIZvV+~F`VuIehzi<+BN3RM-8d=-PA^EgP4nU9tD zTw%T|I+IRFwAsOStW>BLb)KUuMVvC{Dar#%62Q#JVwP!5PUtK01}O-m<#9 zSSlkjpDQyOO(NUCqS@icP|C`No>Y2fBn~zF7_N5)c|s#g`cj#x#B?g2k|@ZNRt7Mw zoSA9-P;h=_6-}qCt}cv@H08qJNIW?jODB>->n^O*JjwwUt0zluEHN{c zPG(He8{Om z;*~^7N96X_x3Q71Bsy;ITl-O!Xsbh1PAd9xy2K?S(|uVrvR5S9;xKWHhw4#25uJlZ z-mFr|D*VOR=I}zy9JF5Pj805A8$Mgobdd%D5EMdP5(?mH5kuy&fgDcs{BGl1`KwDg z#jrkDntlxjUR{|03%+P03OFR|I`>(JpdmA#fFWDw+I8l)1F2HAoK?p({&)t2QwR8# z;hY&pk-UuMp%Cq+L2SFYjtH1DO65vQHF)4bh_=$U5cSih5Iw;~m^OxJGq;}P;wdh+ zaIu32p61q0ZtddMGu+xh8ztJ+?nYsqqMnsoQDR{c7Yih=!T6q88o)JbJ&Y7mMVkfH{ssNoXQ-FDF)fE}QVHt0nS2Sg1YL=87kZ^b*13gsR= z#mI#gQLp@vB>8vh$aFrW&KkLX5wFN7yNMHP7!&)b2b%50Q^% z^SaSDZ#O9Kt&v;aS0j(SzeZj;?5dGZ4!djQm&2YK1>~@|MnO63!|HO_U!#y54%Dbi z4hL)0Er&xjS|^9QYShDQoy2UXK}6U+lWhwe+zP^N_}h-H8vyGLI)v>!g55lco*4Er z4%!3+m;vtvSYdzen#`6zpck9M!pw8Lz&CF3#;_Li964B%Tf8}L(Tbqu5v_x0c}0u2 z$R}F7IeyXN?Fon$Z%|OQc#A@!#hcUx=DNo7@Mr)wwxg$mo`u%W;c_purU;&x(JlW< zy+4ZyEQ&{T9&Fkux8>MjjP8UBFQ7hxSw~emM#pIgT_-9KXn2lZq*HSg#n@?xWyZ)b zmSX`tyoJ3hfx$m4_?L#84vV$=%~=f*JtD#xafC)O#_`sS?6xBxYk?eui6Q)haSYWs zok7XgR*|{wWG6v3+=7hH9FxTz$vk$l)9uO5!rD1!GLM~X3}oXi$T-}XY{GGyy>_y5 z?a3x#ZOVB!y>_w$$fjG6ariS?!cjAyoh;p+Y#P>Ha@NdeCp!?%{Y<;>|~eQlg+}~%g$s0JJ}-0UTZ59qDJCX(M zWTp0G8CaWhCJWlhDj+jjka7BCvI~wUAY><7ZcjE3YZskQK*&yZ17vTvAmb#?WUn}C z)@3KV*`DkYti9^2S(lyc7RYY5Amfh;lPQjxb=%4Av?p7DwXCyd-FC8jAiLj!j6ZTr zmUGl>ot^AKdomT)E<0 z-+}D=7G!)0V6sJ=-p)t9n=U)q4-RD8@p~AW5Y%Rd52u zhrdeK&~=JlUv&?-&X;tiCP$ct`lb7n^s9{s9Qx$G89h literal 0 HcmV?d00001 diff --git a/target/classes/edu/sjsu/entertainmentbox/model/MoviePlayLog.class b/target/classes/edu/sjsu/entertainmentbox/model/MoviePlayLog.class index 013906d9f677b4c1154381a1d69c1dbea41afc49..78393dba3c71d4a950fb92a99c9bdc58219b7b5c 100644 GIT binary patch delta 406 zcmYL@y-EX76olvQ|0bL0HJZ3?Sc62+O(H1%fTB?$g@RZpHdb~%g?R=!ilwihgvH)k zY-|O64sD#h3Uc9a&U|x+`KrCu9=ggpUl{GFeY+W<9HD}0gt1~9hmJ5&j1tOn@4O6e zV8H{>%ATOIP7W*U=CHF~4kwG99Bvl7IlM=DEYvwu_?(k)Folpx6%EudjhJs1GrWME z-%O+OL<=keWj3~9QlYU@6Si4djDdy7c5rD;(3C;gRxP>q8*=9L>;8X-l1XUOI4@U0 zL!P}=4 t`I^LmRs)m!9xTgcpxpzqL-ThtOl3rV{KxBZ7ba2(wR=L(squV-$q#waLAC$@ delta 381 zcmZ9Hy-EX75QXPv_x@~R)Vm8=m&FYV*&-SPT0})q8wuJdDA@V}i|^rDO(_UgT1Lde zcd*kZu(0z5tUOEv!RB)2e&-x!-jeTRvZ_?Y1J!-nQllVfQj4oF<2rne9;iWY8URt0G6HmiX4CJT$x9wqEz(Dfuo+`NkA{ZoTRY|1c|j555LI6uxbXIGmtxx~P#Q zHpHB}7S}fKgnxH5WwQ~|o05LF1=r52o!>yopU&$&@O|NxD`NA%{Q%}MUqxOY!gwUc XBr4e8jAO6?Uq(4s#_Ln?Gw}5vNVq^j diff --git a/target/classes/edu/sjsu/entertainmentbox/model/Rating.class b/target/classes/edu/sjsu/entertainmentbox/model/Rating.class new file mode 100644 index 0000000000000000000000000000000000000000..91831156f0497040f3f6ad8200047de323d98a7f GIT binary patch literal 2140 zcmb7@TTc@~6vxl>Mk&P$NRNnNrR+zWv>KawUA z6CeBlekkMr>_Xd=t(S*Avom}4e}40yGe3WQ|3O4cw3(tLt@l$Oz2fkiLxIB^4#hqy z_0fi)q^-J|*(^5%4Ob4;V^z^rv#FF#S2m@+A}Ce&9M>|W%_)6`b*xE#O9cP51gd+2 zt_1>~tLaKfbtV2ztZJs_t_zChW@>_BMXMnNU9D)Q-1dwEX;;+)9VtFG!b)z)}^ zz8G^qXpW#n}UJb&lVrQ!q_xGy4{2&B6zod})_M(rHZ+B|t4L>i1 zyw-Yu%X;txtblHzbe;{j-q6L_v=30wScnf*X&hO$s>6x+G21L?;ty#T#+C}zjkalA zv26>_hRdzNR{<)+3hJ`i-$0$;N5Gul8Kxu+{>x<=R2G(f2|r8x|8xI$Oc z)K4iv)BkoIa39iRU<7X&8ig8HSqhZSt3cD=3RljuZ$49&%_HvXEISA-LARg~ z@o5yyg6({z#AhT$P=HXD7so@klEwOc$lb;`hOBW(cjzunU}@5!DZ2L#pC7!VX?%M~ zIYi#{I&|5f1aCOe-e7<@iET{zwK73gYeNbDj2Lky6gkq3Jlz9%01^{;z?jD{8%`GK zCd-3twg(w^4U^4K?Y$4p~(i!QHgD8+@1B$3JFaQ8dZM6e)ONU#=cJVg5dPCSCdPU%`= zW9tbl>}))P_E5WfEI0Lp%~MEuMJd-+$}N5GKTw7Y z5!JYns}`O>85+e|A=)DbrvOBP33uTe@D*;` zn2mLM8Gc3lyG@E-2Oaxc^g0r)BD@xP|H}n3@&>9lQMJV1)~PM&_~WYWN?6Pd~jV{QdbpTVDt-wWekSSv^O delta 443 zcmYk&yGjE=6b9gbcC*)*m`UQsxUya#QCx3@f)*mtLO~k^Eku$x5MpVQ2hc(|&tPHa zg%pBC8Xv+!&_+9JOaF`_vdr+G`DV_r(~CZ$n`32lrsYkQ`s2Q>?rb}Y0hw?TTOpNs zmCC7e6+FU%4`5ct-CAd+>UH7YvbHeHxsHHy85s;QMaZLq5~a#-3?rx^Mv75Z!2VAk zuEwm`5xft|q#ToFQXYe_O)4;DOwuUA>8Apl7vY-4GTD=!Ta^n>t4V1G6|uZ^dG)kY z=k_VN^eb}WC6fA@KhyWFm&%#1odx=$@tmK?6Mf0}r=OLUA4@sV&I}qxNclS#e SNB>?oG;h-6ftEQ?%f{cxB~NSs diff --git a/target/classes/edu/sjsu/entertainmentbox/model/User.class b/target/classes/edu/sjsu/entertainmentbox/model/User.class new file mode 100644 index 0000000000000000000000000000000000000000..541ad491ffc6529fbe166c6d20f628694554e1de GIT binary patch literal 1934 zcmb`G>rN9<5XWcRZJ`$hDyu$Nu)3K6MYk2xmQ}rpRn0h+n$XjvJ>&z~+w5iD|Fy&PeMgF2{Hs9& z+3Cv(1WH#N-Bz2*zG|r`r=aVGE!(Q0qnaW2g;VK7F)h`y6}_%Vr3UCn0uI&<&1vd5 z6!mt$i<^Z~`LOf?opp5egQJ9Ty#iXUJDSF=<7Wb@VN(u)>HD8%Ymg*buhk;C;!<9cL*Px5t8KkN-WEy4@%k=%C@zPe#4 z*f?Ye0V1X7CRY3sCmEnYcorCfWr5F#jKXJFAUD&ZP;RzG;oMw{#9UfzK{*|1QPk5O z12RELgjNhX*Xb5=3{x7vaT;;+<=dL)`JnC=#|#;_Jf_QV6Nv{b!<~d4ueitv3D6t{ z852r)65u1bZxs51MF>R^67c4DKzV8Grx7&*KZ*pmExJQv2Z+rapy2}DqX}5n&LfOj zqHg70jqUzTfMn85Fw~Cf)Du0g2R9$c8TNB#yKp7|GKxPK@54<6lZE|cvml%6LdN66 z9eWT+Ci=-1t|rSuZ914t^ph=vY^4hs-#3%x0?8tNvem1}W}r43OcwEz{O$sKv@GZ6H>?O!vbs^*LLBRAq#FU0;0fXHh{YON90CP7lRsaA1 literal 0 HcmV?d00001 diff --git a/target/classes/edu/sjsu/entertainmentbox/model/Users.class b/target/classes/edu/sjsu/entertainmentbox/model/Users.class deleted file mode 100644 index 0f4d0a2f507e2536eb1e94827ee3b7e01c4d0cac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1908 zcmb`G>rN9<5Xa}V+d?k_a+9J!L4mSdRs|IWNg8Yul5$B47)cD-wks~#?qYXW;XQm1 zO>9j3-~;$j#{XVkZD>djD$^r7(Kzp0H4*b7%7{B*Kb8>%m zXfQK(J%ON9(KQ{trXA|Gj(W1DX*sH+TPDgG^?o>4&cLkOj%HRgWz#a;nu!V|v)R|& zc6O_9y!8qlbWQz(tA%lm0O z@sj1%D_UOXfrxu|y2SGr+_D@R>|CrRsh9ea6r*^O5^R!eZn5d1xS;8OnjJxX{-p1g zPqm6elXw{2XmW%?ERR))Gk6|JJdZq{M=JOvUkLTV-p1E5ynv6$-${J+!unz3kRb#~ z2pYhOf8r#AGz8BA!>}yy8Ie)=Gz-Y{4GPH%4GPPP4U*)P)PQm-(x9lXJq~1ossyzd z^m?E*KzArbBQyca`8JxGm-(RX6~_!|uRNwpa~Fw6EX}Qi9VZWXjEC zvrx+flS%Dl%OG3nK*o2?WOIRJk#@4xo5^IT%?Fc3+R4^I_Ob&R&mNO41d>JD$+9<- lEkbQ6nC!|sYR*{>Wcdzc{1ybJPr;Oi=po)#bL<}x{Q+bbC)WS~ From 3deec00e3b0a736d50b2e885fb8666810df0049b Mon Sep 17 00:00:00 2001 From: srivatsa Date: Sat, 1 Dec 2018 17:48:46 -0800 Subject: [PATCH 02/34] Project Structure --- .idea/codeStyles/Project.xml | 28 ++ .idea/dbnavigator.xml | 453 +++++++++++++++++ .idea/workspace.xml | 457 ++++++++++-------- .../service/AdminReportsService.java | 35 ++ .../service/AdminService.java | 35 ++ .../service/CustomerService.java | 27 ++ src/main/resources/data.sql | 4 + target/classes/data.sql | 3 + 8 files changed, 827 insertions(+), 215 deletions(-) create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/dbnavigator.xml create mode 100644 src/main/java/edu/sjsu/entertainmentbox/service/AdminReportsService.java create mode 100644 src/main/java/edu/sjsu/entertainmentbox/service/AdminService.java create mode 100644 src/main/java/edu/sjsu/entertainmentbox/service/CustomerService.java create mode 100644 src/main/resources/data.sql create mode 100644 target/classes/data.sql diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..63a2ffe --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/dbnavigator.xml b/.idea/dbnavigator.xml new file mode 100644 index 0000000..adb84be --- /dev/null +++ b/.idea/dbnavigator.xml @@ -0,0 +1,453 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 069ff9a..1fd068b 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,46 +2,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + @@ -112,8 +179,8 @@ @@ -159,6 +226,10 @@ @@ -174,6 +245,7 @@ + @@ -244,7 +316,6 @@ + + + @@ -244,68 +521,14 @@ - - - - + + + + + @@ -370,11 +593,20 @@ + + + + + + + + + - + - + @@ -383,15 +615,15 @@ - + - + - + - + @@ -406,6 +638,18 @@ + + + + + file://$PROJECT_DIR$/src/main/java/edu/sjsu/entertainmentbox/controller/MovieController.java + 80 + + + + + @@ -417,63 +661,82 @@ - + - - + + - + - - - - - + + - + - - + + - + - - + + - + - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -484,165 +747,150 @@ - + - - + + - + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + + + + - + - - + + - - - - - - - - - - - - - - - - - - - - - + - - + + - - - - - - - - - - - - + - - + + - + - - + + + + + + + - + - - + + + + + + + + + + + + + + + + + + No facets are configured + + + + + + + + + + + + + + + 1.8 + + + + + + + + EntertainmentBox + + + + + 1.8 @@ -655,6 +903,18 @@ + + + java-json + + + + + \ No newline at end of file diff --git a/EntertainmentBox.iml b/EntertainmentBox.iml index 501c8d2..fc4b691 100644 --- a/EntertainmentBox.iml +++ b/EntertainmentBox.iml @@ -10,50 +10,43 @@ - - - - - - - - - - - - - - - - - - + + + - + + + + - - - + - - + - - - - - + + + + + + + + + + + + + @@ -67,16 +60,10 @@ - - - - - - - - - - + + + + @@ -93,9 +80,12 @@ + + + diff --git a/pom.xml b/pom.xml index 35b84f2..855d933 100644 --- a/pom.xml +++ b/pom.xml @@ -6,6 +6,8 @@ 1.0 war Entertainment Box + Demo project for Spring Boot + org.springframework.boot spring-boot-starter-parent @@ -25,79 +27,54 @@ org.springframework.boot - spring-boot-starter-jpa + spring-boot-starter-data-jpa org.springframework.boot spring-boot-devtools runtime + + org.springframework.boot + spring-boot-starter-web + - com.h2database - h2 + mysql + mysql-connector-java runtime + org.springframework.boot spring-boot-starter-aop 2.0.0.RELEASE compile - - org.springframework.boot - spring-boot-starter-jdbc - 2.0.0.RELEASE - compile - - - org.hibernate - hibernate-core - 5.3.6.Final - compile - - - javax.transaction - javax.transaction-api - 1.2 - compile - - - org.springframework.data - spring-data-jpa - 2.0.1.RELEASE - compile - - - org.springframework - spring-aspects - 5.0.1.RELEASE - compile - - - - org.springframework.boot - spring-boot-starter-web - - - org.apache.tomcat - tomcat-jasper - 9.0.12 - + + + + + + + + + + + + + + + + + + + + + + + + org.springframework.boot spring-boot-starter-test diff --git a/src/main/java/edu/sjsu/entertainmentbox/controller/MovieController.java b/src/main/java/edu/sjsu/entertainmentbox/controller/MovieController.java new file mode 100644 index 0000000..a1094f9 --- /dev/null +++ b/src/main/java/edu/sjsu/entertainmentbox/controller/MovieController.java @@ -0,0 +1,113 @@ +package edu.sjsu.entertainmentbox.controller; + +import edu.sjsu.entertainmentbox.model.Actor; +import edu.sjsu.entertainmentbox.model.Movie; +import edu.sjsu.entertainmentbox.service.MovieService; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Repository; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.support.ServletUriComponentsBuilder; + +import java.net.URI; +import java.util.*; + + +@RestController +@CrossOrigin(origins = "*") +public class MovieController { + @Autowired + private MovieService movieService; + + @GetMapping("/movies/{movieId}") + @ResponseStatus(HttpStatus.FOUND) + public ResponseEntity getMovie(@PathVariable Integer movieId) throws Exception{ + Movie movie = movieService.getMovie(movieId); + return new ResponseEntity(movie, HttpStatus.FOUND); + } + + + @GetMapping("/movies/all") + @ResponseStatus(HttpStatus.FOUND) + public List getUser() throws Exception{ + List movies = movieService.findAllMovies(); + return movies; + } + + @DeleteMapping("/movies/{movieId}") + public void deleteUser(@PathVariable Integer movieId) { + movieService.deleteMovie(movieId); + } + + @PostMapping(path = "/movies" , consumes = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity createMovie(@RequestBody String movie) throws JSONException { + JSONObject jsonObject = new JSONObject(movie); + JSONArray arrJson = jsonObject.getJSONArray("actors"); + String[] arr = new String[arrJson.length()]; + Set actorSet = new HashSet<>(); + for (int i=0; i actors, Integer directorId, String country, Integer rating, String movieType, Integer price); +// Movie savedUser = movieService.addMovie(); +// +// URI location = ServletUriComponentsBuilder.fromCurrentRequest().path("/{movieid}") +// .buildAndExpand(savedUser.getMovieId()).toUri(); +// +// System.out.println(location); +// +// return ResponseEntity.created(location).build(); + + } + +// @PostMapping("/movies") +// public ResponseEntity createNewMovie(@RequestBody Movie movie){ +// Movie savedUser = movieService.addMovie(movie); +// +// URI location = ServletUriComponentsBuilder.fromCurrentRequest().path("/{movieid}") +// .buildAndExpand(savedUser.getMovieId()).toUri(); +// +// System.out.println(location); +// +// return ResponseEntity.created(location).build(); +// } +// + + + + @PutMapping("/movies/{movieId}") + public ResponseEntity updateMovie(@RequestBody Movie movie, @PathVariable Integer movieId) { + Movie savedUser = movieService.updateMovie(movieId, movie); + + URI location = ServletUriComponentsBuilder.fromCurrentRequest().path("/{movieid}") + .buildAndExpand(savedUser.getMovieId()).toUri(); + + System.out.println(location); + + return ResponseEntity.noContent().build(); + + + } + +} diff --git a/src/main/java/edu/sjsu/entertainmentbox/controller/UserController.java b/src/main/java/edu/sjsu/entertainmentbox/controller/UserController.java new file mode 100644 index 0000000..885e261 --- /dev/null +++ b/src/main/java/edu/sjsu/entertainmentbox/controller/UserController.java @@ -0,0 +1,82 @@ +package edu.sjsu.entertainmentbox.controller; + +import java.net.URI; +import java.security.Principal; + +import edu.sjsu.entertainmentbox.model.User; +import edu.sjsu.entertainmentbox.service.UserService; +import org.json.JSONException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Repository; +import org.springframework.web.bind.annotation.*; +import org.json.JSONObject; +import org.springframework.http.HttpStatus; +import org.springframework.web.servlet.support.ServletUriComponentsBuilder; + +import javax.servlet.http.HttpSession; +import java.util.*; + +import javax.xml.ws.Response; + + + +@RestController +@CrossOrigin(origins = "*") +@RequestMapping(path = "/user") +public class UserController { + + @Autowired + public UserService userService; + + + @PostMapping(path="/login",consumes = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity login(@RequestBody String user, HttpSession session) throws JSONException + { + JSONObject jsonObject = new JSONObject(user); + session.setAttribute("name",jsonObject.getString("username")); + return new ResponseEntity(userService.login(jsonObject.getString("username"),jsonObject.getString("password")),HttpStatus.OK); + } + + @PostMapping(value = "/logout") + @ResponseStatus(HttpStatus.NO_CONTENT) + public ResponseEntity logout(HttpSession session) throws JSONException{ + System.out.println(session.getAttribute("name")); + session.invalidate(); + return new ResponseEntity(HttpStatus.OK); + } + +// @PostMapping(path="/signup",consumes = MediaType.APPLICATION_JSON_VALUE) +// public ResponseEntity signup(@RequestBody String user, HttpSession session) throws JSONException +// { +// JSONObject jsonObject = new JSONObject(user); +// return new ResponseEntity(userService.addUser(jsonObject.getString("username"),jsonObject.getString("password"));,HttpStatus.OK); +// } + + @GetMapping("users/{username}") + @ResponseStatus(HttpStatus.FOUND) + public ResponseEntity getUser(@PathVariable String username) throws Exception{ + User user = userService.getUser(username); + return new ResponseEntity(user, HttpStatus.FOUND); + } + + @DeleteMapping("/users/{username}") + public void deleteUser(@PathVariable String username) { + userService.deleteUser(username); + } + + @PostMapping("/users") + public ResponseEntity createStudent(@RequestBody User user) { + User savedUser = userService.addUser(user); + + URI location = ServletUriComponentsBuilder.fromCurrentRequest().path("/{username}") + .buildAndExpand(savedUser.getEmailAddress()).toUri(); + + System.out.println(location); + + return ResponseEntity.created(location).build(); + + } + +} diff --git a/src/main/java/edu/sjsu/entertainmentbox/dao/MovieRepository.java b/src/main/java/edu/sjsu/entertainmentbox/dao/MovieRepository.java new file mode 100644 index 0000000..2b467fa --- /dev/null +++ b/src/main/java/edu/sjsu/entertainmentbox/dao/MovieRepository.java @@ -0,0 +1,13 @@ +package edu.sjsu.entertainmentbox.dao; + + +import edu.sjsu.entertainmentbox.model.Movie; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface MovieRepository extends CrudRepository { + + + +} diff --git a/src/main/java/edu/sjsu/entertainmentbox/dao/UserRepository.java b/src/main/java/edu/sjsu/entertainmentbox/dao/UserRepository.java index cb888e9..7c536b1 100644 --- a/src/main/java/edu/sjsu/entertainmentbox/dao/UserRepository.java +++ b/src/main/java/edu/sjsu/entertainmentbox/dao/UserRepository.java @@ -1,10 +1,14 @@ package edu.sjsu.entertainmentbox.dao; -import edu.sjsu.entertainmentbox.model.User; import org.springframework.data.repository.CrudRepository; +import edu.sjsu.entertainmentbox.model.User; +import org.springframework.stereotype.Repository; +import java.util.List; -public interface UserRepository extends CrudRepository { - +@Repository +public interface UserRepository extends CrudRepository{ + List findByEmailAddressAndPassword(String emailAddress, String password); } + diff --git a/src/main/java/edu/sjsu/entertainmentbox/model/Actor.java b/src/main/java/edu/sjsu/entertainmentbox/model/Actor.java index 44e30f3..f84287c 100644 --- a/src/main/java/edu/sjsu/entertainmentbox/model/Actor.java +++ b/src/main/java/edu/sjsu/entertainmentbox/model/Actor.java @@ -20,6 +20,10 @@ public Actor(String name, Integer movieOrderId) { this.movieOrderId = movieOrderId; } + public Actor(String name){ + this.name = name; + } + @Id @GeneratedValue(strategy = GenerationType.AUTO) @Column(name = "ACTOR_ID", nullable = false, unique = true) diff --git a/src/main/java/edu/sjsu/entertainmentbox/model/User.java b/src/main/java/edu/sjsu/entertainmentbox/model/User.java index 7039051..b724904 100644 --- a/src/main/java/edu/sjsu/entertainmentbox/model/User.java +++ b/src/main/java/edu/sjsu/entertainmentbox/model/User.java @@ -4,8 +4,10 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; +import javax.persistence.Table; @Entity +@Table(name = "user") public class User { private String emailAddress; diff --git a/src/main/java/edu/sjsu/entertainmentbox/service/MovieService.java b/src/main/java/edu/sjsu/entertainmentbox/service/MovieService.java new file mode 100644 index 0000000..0e958e0 --- /dev/null +++ b/src/main/java/edu/sjsu/entertainmentbox/service/MovieService.java @@ -0,0 +1,63 @@ +package edu.sjsu.entertainmentbox.service; + +import edu.sjsu.entertainmentbox.dao.MovieRepository; +import edu.sjsu.entertainmentbox.model.Movie; +import edu.sjsu.entertainmentbox.model.Actor; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Optional; +import java.util.*; + +@Service +public class MovieService { + @Autowired + private MovieRepository movieRepository; + + + public Movie addMovie(Movie movie){ + Movie savedMovie = movieRepository.save(movie); +// Set actors = movie.getActors(); +// +// Iterator it = actors.iterator(); +// while (it.hasNext()){ +// System.out.println(it.next().getName()); +// } + return savedMovie; + } + + public Movie updateMovie(Integer movie_id, Movie movie){ + Optional movieOptional = movieRepository.findById(movie_id); + if(!movieOptional.isPresent()){ + System.out.println("movie Not Found-"+movie); + } + + movie.setMovieId(movie_id); + return movieRepository.save(movie); + } + + + public Movie getMovie(Integer movie_id){ + Optional movie = movieRepository.findById(movie_id); + + + if(!movie.isPresent()){ + System.out.println("movie Not Found-"+movie); + } + + return movie.get(); + } + + public void deleteMovie(Integer movieId){ + movieRepository.deleteById(movieId); + } + + public List findAllMovies(){ + List movies = new ArrayList<>(); + movieRepository.findAll().forEach(movies::add); + return movies; + } + +} diff --git a/src/main/java/edu/sjsu/entertainmentbox/service/UserService.java b/src/main/java/edu/sjsu/entertainmentbox/service/UserService.java new file mode 100644 index 0000000..c2b3849 --- /dev/null +++ b/src/main/java/edu/sjsu/entertainmentbox/service/UserService.java @@ -0,0 +1,51 @@ +package edu.sjsu.entertainmentbox.service; + +import edu.sjsu.entertainmentbox.dao.UserRepository; +import edu.sjsu.entertainmentbox.model.User; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.servlet.support.ServletUriComponentsBuilder; + +import java.net.URI; +import java.nio.file.attribute.UserPrincipalNotFoundException; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +@Service +public class UserService { + + @Autowired + private UserRepository userRepository; + + public Iterable getAllUsers() { + List users = new ArrayList<>(); + userRepository.findAll().forEach(users::add); + return users; + } + + public User addUser(User user) { + User savedUser = userRepository.save(user); + return savedUser; + } + + public void deleteUser( String username){ + userRepository.deleteById(username); + } + + public User getUser(String username){ + Optional user = userRepository.findById(username); + + if(!user.isPresent()){ + System.out.println("username Not Found-"+username); + } + + return user.get(); + } + + + public List login(String emailAddress, String password) { + return userRepository.findByEmailAddressAndPassword(emailAddress, password); + } + +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index aecc278..06f4955 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,6 +1,26 @@ -# Sample properties used by Spring configuration in ApplicationConfig. -HelloWorld.SiteName=Sample App -# Enabling H2 Console -spring.h2.console.enabled=true \ No newline at end of file +spring.jpa.hibernate.ddl-auto=update +spring.datasource.url=jdbc:mysql://entertainment-box.c06vcy8gmkbz.us-west-1.rds.amazonaws.com:3306/entertainment_box +spring.datasource.username=Satish +spring.datasource.password=zhang123 +server.port=8080 +#spring.jackson.time-zone=Europe/Paris +#spring.jackson.locale=fr_FR + +#spring.mail.host=smtp.gmail.com +#spring.mail.port=587 +#spring.mail.username=cusr.service@gmail.com +#spring.mail.password=cusrservice +#spring.mail.properties.mail.smtp.auth=true +#spring.mail.properties.mail.smtp.starttls.enable=true + +security.basic.enabled=false +spring.jpa.show-sql = true + +# +# Allows Hibernate to generate SQL optimized for a particular DBMS +# +spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect + +#logging.level.org.springframework = debug \ No newline at end of file diff --git a/target/classes/application.properties b/target/classes/application.properties index aecc278..06f4955 100644 --- a/target/classes/application.properties +++ b/target/classes/application.properties @@ -1,6 +1,26 @@ -# Sample properties used by Spring configuration in ApplicationConfig. -HelloWorld.SiteName=Sample App -# Enabling H2 Console -spring.h2.console.enabled=true \ No newline at end of file +spring.jpa.hibernate.ddl-auto=update +spring.datasource.url=jdbc:mysql://entertainment-box.c06vcy8gmkbz.us-west-1.rds.amazonaws.com:3306/entertainment_box +spring.datasource.username=Satish +spring.datasource.password=zhang123 +server.port=8080 +#spring.jackson.time-zone=Europe/Paris +#spring.jackson.locale=fr_FR + +#spring.mail.host=smtp.gmail.com +#spring.mail.port=587 +#spring.mail.username=cusr.service@gmail.com +#spring.mail.password=cusrservice +#spring.mail.properties.mail.smtp.auth=true +#spring.mail.properties.mail.smtp.starttls.enable=true + +security.basic.enabled=false +spring.jpa.show-sql = true + +# +# Allows Hibernate to generate SQL optimized for a particular DBMS +# +spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect + +#logging.level.org.springframework = debug \ No newline at end of file diff --git a/target/classes/edu/sjsu/entertainmentbox/controller/MovieController.class b/target/classes/edu/sjsu/entertainmentbox/controller/MovieController.class new file mode 100644 index 0000000000000000000000000000000000000000..38a444275faae19adf9c95b87c23b8a0328fc2e3 GIT binary patch literal 4820 zcmcgwd3V%Q9KC6$O=p@SpsnIAo82HNwJ5DNNc_M=+@l*#4dCjTFXHbC1U;)JpPQy&&49;d?p(KUvPBm)`L zY?=#f-zOx{AKD=Lxv{{3a(Aiq@XQ)uHeqAI9nokEAo>XGZW|Xq8w7JB2bXd znnm021DA9Z|CPI=P5Q8pUJNC2uq1MN&a?~lVLe1LjdGbeK(V$(!wTr=20g^>>CeXe zoNtsaNh&KWXPIh&N447$y$K_7m|>~D*LLve{LBFbn^$M;tRb_L3BM|RhZB`1`7>+y zrz<%~Z&c>bJnMz&+1nRIJ@8FSpE5n4kJ}^Y3f5owtY>vTFPAGhecxs8t|e9@S9q}& z>CQ^149jBnF%`*F1g|GC-B_=Cnx^hRsIHbE>+-HJd@&=Ire&j1FxT5;R<5Ng)1I*? z3K577i!DT!lY(^-$+qzI`MF7kYT-XOJ{p+_`^nMV8Iku#WI5f_G-0!jS65GJ9Gtai zm=jM2!t?h#1=*lFgK~j{$83vc0oTF!Cv9>0|FF}5>*ib6Y*0saChG)lUK}*#+_^5~ zt2Q-u$| zQ}McnH}Iy4w=}$scT~Kq;XS;s;sXsI;v)?o<1-bXYxn{eG(3baHGG9{RD8?n()b+G zcye>Z)_kcBNd-F_D@!`mC>Tv_YfZKx1zQ?2UYkV<_SPGTJ3(R-xO|Gq^HA3UhwPYT zg;~hZcSc<~F5(WOP>645o2|3Hrs0hz!IM)_lF8YidqKJExW1l^*7L48?v!{c;z82e zADC7loQw;uQyLFkm%DL8QgDca>OauVsz{YNlBL4BK9%+5LA1f?O#%pqbdtMNxUF## z)g8}RAeFPDJo0r{2Jfolqk_8{fo$jjXH!m6H)aX9$E*qT#4gS8ubI$xj8} z;w0{_4_pNs6JL#v2ZY}#=T|kIv`O0*?zm-mo?typ#NrhXlW9rlf?Mmf(#_pT{QQj= zi3&rdV4y)dCn%t;d_CmKOl`6%o3Gxq?Z~mis$)tW76yy4R+M|2cX;b+S^7WRELW=~ zaR)zmyZ8aDphZqDUT@;6o!6V=D~B3aw{fNOs_@#@{}YrSc+-O0`72)ruBR$Mi(bHH zY~f1b5Zs2gQ1}sk`?hkgyZ=YD46LAa`d6e*3|>UrPiX(14^bZLx=rAz6UwT>F?kw=5Hw4=_Wbd{-e%#@7hI{NV-|0--;M!^{N z#}vHFXr(AH6x&NrUqWVM=L)pcZ|FMFI=F&$*%e%~g7q^Ov0=vwHtx8DYk$Ud3Ti>@ zp%&l>gEY^y;R20I^TQItATzCdW;F&nUBR$7MG%`(L~#i{KjZo1yFd1V^T3E18pJaWoXz h$h%ptALcuAVNz%DDc5q}A@on$)BML$3SYOU{{nXVeqaCq literal 0 HcmV?d00001 diff --git a/target/classes/edu/sjsu/entertainmentbox/controller/UserController.class b/target/classes/edu/sjsu/entertainmentbox/controller/UserController.class new file mode 100644 index 0000000000000000000000000000000000000000..4f4f61e0a93adfff17f79675bfc19815651e49be GIT binary patch literal 5055 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 MU^(2a(6IvW4ktIyga7~l delta 73 zcmeyva*Ijn)W2Q(7#J8#7`WLPIM^9D*%`PP890M8)AJHbN{dn%8R{n9DQEJ@pB&Dp ZHTg7SlQ07V69WrS2NMG;0~?rT2LR2F53c|K diff --git a/target/classes/edu/sjsu/entertainmentbox/model/Actor.class b/target/classes/edu/sjsu/entertainmentbox/model/Actor.class index 8765159720594990562e1dd7848863a6b9964f0c..879bc7501cfaed2ae2facc8ebf6e076340752d91 100644 GIT binary patch delta 433 zcmZ{gPfo%>6vn@qGA*$+DX0a4r7DBs01`=b;Q}Hi9>GNR#sjz_-oZp?uUF7CghY?v z(qnK5zZMf+;9}mJ_ulvY=FfZSx%@g6_DfdNshEg#Aupxy?Ld9rZlDfmcB4R942UHjXgs9S6V@2Q6%}$L~RtH!oTVNaUldCV1To$ka zs2^E_dkqH(^A0DwH`qfnZv}T~VSj=Hv?n;^%%Ee1w`uR)l4_Em?W3DGUG!|~YSaFQ z?$fEch&y8HqfSUmbqVMZP_bjLA0MwUhrE)+01f-#ovRb-Pjmgk(;~KEQJb?BuIxd7 gjvVsH(emDr`}>D$`Ckpm9OcZHV(4d1m+~?24dojzApigX delta 344 zcmbOyv`cV9CFACaj8TkYq8dI~iDilUIf;4c`oSednR)5fnqiw?GI=mDa!od3JKKttSQb+Kp^06K?>!H7Y2@+WpjRzsj#Bd~@394d@5lS?>Mw9K&R s0(l0>Iy<0s_CPlu;!tI^0vcfrGD2Ditb~cd0c?dMI0V>$DxDY@0P9aIQ~&?~ diff --git a/target/classes/edu/sjsu/entertainmentbox/model/User.class b/target/classes/edu/sjsu/entertainmentbox/model/User.class index 541ad491ffc6529fbe166c6d20f628694554e1de..753515f3392b022da36bee1a0f63c40e7645ad01 100644 GIT binary patch delta 264 zcmeC<-^H(Y>ff$?3=9k=47OYh91NzM4D1YMAi^9(Sbzvi5Mjm6V9m~8vr+FflQJWN zq)%32Sz?8LL26NPW^qYsUUI5_NMce>sx>16OKEXx(d3^@+gODeSQtbmZ($CX6a%uv z88{gv82A_@8H5?6fTT2oJcG<+6_z|k#mV_>;*(dgxU#A;urjDk?qe07%+0FLs09>P znjFij!>R`q*9VHbF&cx#z5~U~fnpY5wf1cKj5a`VKUN2zm?K#1CQ!^3tX7*{ht(4( b?gbVvW)~6QXJBG50{YpQfssL`n85@9ix@Tw delta 219 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 Date: Sat, 1 Dec 2018 22:27:13 -0800 Subject: [PATCH 06/34] Service classes --- .idea/codeStyles/Project.xml | 24 ++ .idea/workspace.xml | 301 +++++++++++------- .../sjsu/entertainmentbox/model/Movie.java | 10 + .../service/AdminReportsServiceImpl.java | 54 ++++ .../service/AdminServiceImpl.java | 57 ++++ .../service/CustomerService.java | 17 + .../service/CustomerServiceImpl.java | 60 ++++ .../sjsu/entertainmentbox/model/Movie.class | Bin 5433 -> 5663 bytes .../sjsu/entertainmentbox/model/Rating.class | Bin 2413 -> 2752 bytes .../service/CustomerService.class | Bin 457 -> 765 bytes 10 files changed, 401 insertions(+), 122 deletions(-) create mode 100644 src/main/java/edu/sjsu/entertainmentbox/service/AdminReportsServiceImpl.java create mode 100644 src/main/java/edu/sjsu/entertainmentbox/service/AdminServiceImpl.java create mode 100644 src/main/java/edu/sjsu/entertainmentbox/service/CustomerServiceImpl.java diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 63a2ffe..0211a90 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -24,5 +24,29 @@