Api gateway and discovery server (#9)

* api gate e disc serv * trying adding discovery eapi gateway * api-gateway cors e webapp * fixed CORS settings for api geteway * fixed date parsing * unzip fucking works * fixed web app * fixed webapp * fixed frontend * fixed white spaces in zip file names * handled evaluation requests when battle has not started yet more gracefully --------- Co-authored-by: manuelamarenghi <[email protected]>
manuelamarenghi · Feb 4, 2024 · e88bcce · e88bcce
1 parent 7f17929
commit e88bcce
Show file tree

Hide file tree

Showing 103 changed files with 3,889 additions and 48 deletions.
diff --git a/code/account-manager/Dockerfile b/code/account-manager/Dockerfile
@@ -1,5 +1,7 @@
 FROM openjdk:21
 
+ENV TZ=Europe/Rome
+
 COPY target/*.jar account-manager-app.jar
 
 ENTRYPOINT ["java","-jar","/account-manager-app.jar"]

diff --git a/code/account-manager/src/main/java/ckb/AccountManager/AccountManagerApplication.java b/code/account-manager/src/main/java/ckb/AccountManager/AccountManagerApplication.java
@@ -2,8 +2,10 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
 @SpringBootApplication
+@EnableDiscoveryClient
 public class AccountManagerApplication {
 
  public static void main(String[] args) {

diff --git a/code/account-manager/src/main/java/ckb/AccountManager/controller/MailController.java b/code/account-manager/src/main/java/ckb/AccountManager/controller/MailController.java
@@ -14,7 +14,6 @@
 @RequestMapping("/api/account/mail")
 @Slf4j
 @RequiredArgsConstructor
-@CrossOrigin(origins = "*")
 public class MailController extends Controller {
  private final UserService userService;
 

diff --git a/code/account-manager/src/main/java/ckb/AccountManager/controller/MailStudentsController.java b/code/account-manager/src/main/java/ckb/AccountManager/controller/MailStudentsController.java
@@ -15,7 +15,6 @@
 @RequestMapping("/api/account/mail-students")
 @Slf4j
 @RequiredArgsConstructor
-@CrossOrigin(origins = "*")
 public class MailStudentsController extends Controller {
  private final UserService userService;
 

diff --git a/code/account-manager/src/main/java/ckb/AccountManager/controller/SignInController.java b/code/account-manager/src/main/java/ckb/AccountManager/controller/SignInController.java
@@ -12,7 +12,6 @@
 @RequestMapping("/api/account/sign-in")
 @Slf4j
 @RequiredArgsConstructor
-@CrossOrigin(origins = "*")
 public class SignInController extends Controller {
  private final UserService userService;
 

diff --git a/code/account-manager/src/main/java/ckb/AccountManager/controller/SignUpController.java b/code/account-manager/src/main/java/ckb/AccountManager/controller/SignUpController.java
@@ -16,7 +16,6 @@
 @RequestMapping("/api/account/sign-up")
 @RequiredArgsConstructor
 @Slf4j
-@CrossOrigin(origins = "*")
 public class SignUpController extends Controller {
 
  private static final String EMAIL_REGEX = "^[a-zA-Z0-9_+&*-]+(?:\\.[a-zA-Z0-9_+&*-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,7}$";

diff --git a/code/account-manager/src/main/java/ckb/AccountManager/controller/UpdateController.java b/code/account-manager/src/main/java/ckb/AccountManager/controller/UpdateController.java
@@ -16,7 +16,6 @@
 @RequestMapping("/api/account/update")
 @RequiredArgsConstructor
 @Slf4j
-@CrossOrigin(origins = "*")
 public class UpdateController extends Controller {
 
  private static final String EMAIL_REGEX = "^[a-zA-Z0-9_+&*-]+(?:\\.[a-zA-Z0-9_+&*-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,7}$";

diff --git a/code/account-manager/src/main/java/ckb/AccountManager/controller/UserController.java b/code/account-manager/src/main/java/ckb/AccountManager/controller/UserController.java
@@ -14,7 +14,6 @@
 @RequestMapping("/api/account/user")
 @RequiredArgsConstructor
 @Slf4j
-@CrossOrigin(origins = "*")
 public class UserController extends Controller {
 
  private final UserService userService;

diff --git a/code/account-manager/src/main/resources/application.properties b/code/account-manager/src/main/resources/application.properties
@@ -5,4 +5,9 @@ spring.datasource.password=root
 spring.jpa.hibernate.ddl-auto=update
 spring.jpa.properties.hibernate.format_sql=true
 spring.jpa.show-sql=true
-server.port=8086
+server.port=8086
+
+eureka.client.service-url.defaultZone=http://discovery-server:8761/eureka
+spring.application.name=account-manager
+eureka.client.register-with-eureka=true
+eureka.client.fetch-registry=true
diff --git a/code/api-gateway/.gitignore b/code/api-gateway/.gitignore
@@ -0,0 +1,33 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
diff --git a/code/api-gateway/.mvn/wrapper/maven-wrapper.jar b/code/api-gateway/.mvn/wrapper/maven-wrapper.jar
diff --git a/code/api-gateway/.mvn/wrapper/maven-wrapper.properties b/code/api-gateway/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
diff --git a/code/api-gateway/Dockerfile b/code/api-gateway/Dockerfile
@@ -0,0 +1,9 @@
+FROM openjdk:21
+
+ENV TZ=Europe/Rome
+
+COPY target/*.jar api-gateway-app.jar
+
+ENTRYPOINT ["java","-jar","/api-gateway-app.jar"]
+
+EXPOSE 8080