commit #41 - Working DEVWEB host

ompp-api/pom.xml

@@ -58,25 +58,10 @@
             <artifactId>activation</artifactId>
             <version>1.1.1</version>
         </dependency>
-
-        <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-tomcat -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-tomcat</artifactId>
-            <version>2.1.3.RELEASE</version>
-        </dependency>
-
-
-        <!-- My Web module dependency -->
-        <dependency>
-            <groupId>com.ompplus</groupId>
-            <artifactId>ompp-web</artifactId>
-            <version>${project.version}</version>
-            <scope>runtime</scope>
-        </dependency>
     </dependencies>
 
     <build>
+        <finalName>ompp-api</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

ompp-api/src/main/java/app/OmppappApplication.java

@@ -2,14 +2,21 @@ package app;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.support.SpringBootServletInitializer;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 @SpringBootApplication
 @EnableJpaRepositories("app.repositories")
-public class OmppappApplication {
+public class OmppappApplication extends SpringBootServletInitializer {
 
     public static void main(String[] args) {
         SpringApplication.run(OmppappApplication.class, args);
     }
+
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
+        return builder.sources(OmppappApplication.class);
+    }
 }
 

ompp-api/src/main/java/app/repositories/ClassEntityRepository.java

@@ -4,6 +4,7 @@ import app.entities.ClassEntity;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
+import javax.transaction.Transactional;
 import java.util.Optional;
 
 @Repository

ompp-api/src/main/java/app/repositories/LecturerClassesEntityRepository.java

@@ -5,6 +5,7 @@ import app.entities.LecturerClassessEntity;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
+import javax.transaction.Transactional;
 import java.util.List;
 import java.util.Optional;
 

ompp-api/src/main/java/app/repositories/LecturerEntityRepository.java

@@ -4,6 +4,7 @@ import app.entities.LecturerEntity;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
+import javax.transaction.Transactional;
 import java.util.Optional;
 
 @Repository

ompp-api/src/main/java/app/repositories/StudentClassesEntityRepository.java

@@ -6,6 +6,7 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
+import javax.transaction.Transactional;
 import java.util.List;
 import java.util.Optional;
 

ompp-api/src/main/java/app/repositories/StudentEntityRepository.java

@@ -4,6 +4,7 @@ import app.entities.StudentEntity;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
+import javax.transaction.Transactional;
 import java.util.Optional;
 
 @Repository

ompp-api/src/main/java/app/services/AuthenticationService.java

@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Component;
 
+import javax.transaction.Transactional;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;

ompp-api/src/main/java/app/services/GraphDataService.java

@@ -9,6 +9,7 @@ import app.repositories.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.transaction.Transactional;
 import java.util.*;
 
 @Component

ompp-api/src/main/java/app/services/MinutePaperService.java

@@ -9,6 +9,7 @@ import app.repositories.QuestionEntityRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.transaction.Transactional;
 import java.util.*;
 
 @Component

ompp-api/src/main/java/app/services/StudentInfoService.java

@@ -10,6 +10,7 @@ import app.repositories.QuestionEntityRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.transaction.Transactional;
 import java.util.*;
 
 @Component

ompp-api/src/main/resources/.ebextensions/httpd/conf.d/ssl.conf

-Listen 443
-<VirtualHost *:443>
-  ServerName server-name
-  SSLEngine on
-  SSLCertificateFile "/etc/pki/tls/certs/server.crt"
-  SSLCertificateKeyFile "/etc/pki/tls/certs/server.key"
-
-<Proxy *>
-  Require all granted
-</Proxy>
-ProxyPass / http://localhost:5000/ retry=0
-ProxyPassReverse / http://localhost:5000/
-ProxyPreserveHost on
-
-ErrorLog /var/log/httpd/elasticbeanstalk-ssl-error_log
-
-</VirtualHost>

ompp-api/src/main/resources/.ebextensions/https-instance-securitygroup.config

-Resources:
-  sslSecurityGroupIngress:
-    Type: AWS::EC2::SecurityGroupIngress
-    Properties:
-      GroupId: {"Fn::GetAtt" : ["AWSEBSecurityGroup", "GroupId"]}
-      IpProtocol: tcp
-      ToPort: 443
-      FromPort: 443
-      CidrIp: 0.0.0.0/0

ompp-api/src/main/resources/.ebextensions/https-instance-single.config

-Resources:
-  sslSecurityGroupIngress:
-    Type: AWS::EC2::SecurityGroupIngress
-    Properties:
-      GroupId: {"Fn::GetAtt" : ["AWSEBSecurityGroup", "GroupId"]}
-      IpProtocol: tcp
-      ToPort: 443
-      FromPort: 443
-      CidrIp: 0.0.0.0/0

ompp-api/src/main/resources/.ebextensions/https-instance.config

-files:
-  /etc/pki/tls/certs/server.crt:
-    mode: "000400"
-    owner: root
-    group: root
-    content: |
-      -----BEGIN CERTIFICATE-----
-      certificate file contents
-      -----END CERTIFICATE-----
-
-  /etc/pki/tls/certs/server.key:
-    mode: "000400"
-    owner: root
-    group: root
-    content: |
-      -----BEGIN RSA PRIVATE KEY-----
-      private key contents # See note below.
-      -----END RSA PRIVATE KEY-----
-
-  /opt/elasticbeanstalk/hooks/appdeploy/post/99_start_httpd.sh:
-    mode: "000755"
-    owner: root
-    group: root
-    content: |
-      #!/usr/bin/env bash
-      sudo service httpd restart

ompp-api/src/main/resources/application.properties

 spring.jpa.hibernate.ddl-auto=none
-spring.datasource.url=jdbc:mysql://aa120m6cmptgb1a.cx4yxdv2ekw9.us-west-2.rds.amazonaws.com:3306/ompdb?useSSL=false
+spring.datasource.url=jdbc:mysql://devweb2018.cis.strath.ac.uk:3306/ywb16155
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.username=apiuser
-spring.datasource.password=password
+spring.datasource.username=ywb16155
+spring.datasource.password=Uir2Imaim7eo
+spring.datasource.tomcat.max-active=50
+spring.datasource.tomcat.max-idle=10
+spring.datasource.tomcat.max-wait=10000
+spring.jpa.database-platform=org.hibernate.dialect.MySQLDialect
 spring.jpa.open-in-view=false
 spring.jpa.show-sql=false
 
+server.tomcat.additional-tld-skip-patterns='*.jar'
+server.context-path=/ywb16155-root/ompp-api
 server.port=8443
 server.ssl.enabled=true
 server.ssl.key-store-type=PKCS12

ompp-web/package.json

@@ -4,7 +4,7 @@
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
-    "build": "ng build --prod --aot",
+    "build": "ng build --prod --aot --base-href /~ywb16155/omp-plus/",
     "test": "ng test",
     "lint": "ng lint",
     "e2e": "ng e2e"

ompp-web/src/app/ErrorComponents/http-error.service.ts

@@ -9,7 +9,8 @@ export class HttpErrorService {
     if (error.error instanceof ErrorEvent) {
         console.error('Frontend or network error occurred. ' + error.message);
     } else {
-      console.error('Backend error occurred. ' + error.message);
+      console.error('Backend error occurred. ' + 'NAME: ' + error.name + ' ' + 'MSG: ' + error.message + ' '
+        + 'ERR: ' + error.error + ' ' + 'URL: ' + error.url.toString());
     }
 
     return throwError('Something bad has happened. Please try again later.');

ompp-web/src/environments/environment.prod.ts

 export const environment = {
-  apiUrl: 'https://omp-plus.us-west-2.elasticbeanstalk.com:8443',
+  apiUrl: 'https://devweb2018.cis.strath.ac.uk/ywb16155-root/ompp-api',
   debugMode: false,
   production: true
 };

ompp-web/src/environments/environment.ts

@@ -3,7 +3,7 @@
 // The list of file replacements can be found in `angular.json`.
 
 export const environment = {
-  apiUrl: 'https://localhost:8443',
+  apiUrl: 'https://devweb2018.cis.strath.ac.uk/ywb16155-root/ompp-api',
   debugMode: false,
   production: false
 };