Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion aics-admin/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:17-jdk-slim
FROM eclipse-temurin:17-jdk-jammy
WORKDIR /app
COPY aics-admin/build/libs/*.jar app.jar
ENTRYPOINT ["java", "-jar", "app.jar"]
2 changes: 1 addition & 1 deletion aics-api/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:17-jdk-slim
FROM eclipse-temurin:17-jdk-jammy
WORKDIR /app
COPY aics-api/build/libs/*.jar app.jar
ENTRYPOINT ["java", "-jar", "app.jar"]
16 changes: 4 additions & 12 deletions aics-api/src/main/resources/db/schema.sql
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,10 @@ CREATE TABLE graduation_user
(
id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
name VARCHAR(10) NOT NULL,
email VARCHAR(50) NOT NULL UNIQUE,
email VARCHAR(50) UNIQUE,
advisor_professor VARCHAR(20),
graduation_type VARCHAR(20) NOT NULL
CONSTRAINT graduaton_type_check
graduation_type VARCHAR(20)
CONSTRAINT graduation_type_check
CHECK ((graduation_type)::TEXT = ANY (ARRAY ['THESIS', 'CERTIFICATE'])),
graduation_date DATE,
mid_thesis_id BIGINT,
Expand All @@ -162,15 +162,7 @@ CREATE TABLE graduation_user
user_id VARCHAR(10) NOT NULL,
created_at TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
updated_at TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
deleted_at TIMESTAMP(6) DEFAULT NULL,
CONSTRAINT fk_graduation_user_user FOREIGN KEY (user_id) REFERENCES "user" (id)
ON DELETE CASCADE,
CONSTRAINT fk_graduation_user_mid_thesis FOREIGN KEY (mid_thesis_id) REFERENCES "thesis" (id)
ON DELETE CASCADE,
CONSTRAINT fk_graduation_user_final_thesis FOREIGN KEY (final_thesis_id) REFERENCES "thesis" (id)
ON DELETE CASCADE,
CONSTRAINT fk_graduation_user_certificate FOREIGN KEY (certificate_id) REFERENCES "certificate" (id)
ON DELETE CASCADE,
deleted_at TIMESTAMP(6) DEFAULT NULL
);

-- schedule
Expand Down
2 changes: 1 addition & 1 deletion aics-auth/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:17-jdk-slim
FROM eclipse-temurin:17-jdk-jammy
WORKDIR /app
COPY aics-auth/build/libs/*.jar app.jar
ENTRYPOINT ["java", "-jar", "app.jar"]
10 changes: 7 additions & 3 deletions codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ coverage:
threshold: 5%
paths:
- "aics-api/src"
- "aics-domain/src"
# - "aics-domain/src"
- "aics-api/src/testFixtures"
- "aics-domain/src/testFixtures"
# - "aics-domain/src/testFixtures"
only_pulls: true
patch:
default:
Expand All @@ -23,4 +23,8 @@ comment:
behavior: default
require_changes: false
branches:
- develop
- develop

ignore:
- "aics-domain/src/**"
- "aics-domain/src/testFixtures/**"