diff --git a/.env b/.env new file mode 100644 index 0000000..86e65a1 --- /dev/null +++ b/.env @@ -0,0 +1 @@ +timezone=UTC \ No newline at end of file diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..8af972c --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..d615283 --- /dev/null +++ b/build.gradle @@ -0,0 +1,45 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '4.1.1' + id 'io.spring.dependency-management' version '1.1.7' +} + +group = 'com.study' +version = '0.0.1-SNAPSHOT' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +repositories { + mavenCentral() +} + +dependencies { + //Web + implementation 'org.springframework.boot:spring-boot-starter-web' + //JPA + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + //PostgreSQL + runtimeOnly 'org.postgresql:postgresql' + //Lombok + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + //Swagger + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.9' + //Validation + implementation 'org.springframework.boot:spring-boot-starter-validation' + //Jackson + implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310' + //H2 + runtimeOnly 'com.h2database:h2' + runtimeOnly 'org.springframework.boot:spring-boot-h2console' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/docs/Requirements.md b/docs/Requirements.md new file mode 100644 index 0000000..e69de29 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..eddabd2 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..ad7845b --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,9 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip +networkTimeout=10000 +retries=0 +retryBackOffMs=500 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..249efbb --- /dev/null +++ b/gradlew @@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# gradlew start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh gradlew +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..a51ec4f --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,82 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem gradlew startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +"%COMSPEC%" /c exit 1 + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +"%COMSPEC%" /c exit 1 + +:execute +@rem Setup the command line + + + +@rem Execute gradlew +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel + +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL% diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..334cb3f --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'course-registration' diff --git a/src/main/java/com/study/course_registration/CourseRegistrationApplication.java b/src/main/java/com/study/course_registration/CourseRegistrationApplication.java new file mode 100644 index 0000000..d6b5812 --- /dev/null +++ b/src/main/java/com/study/course_registration/CourseRegistrationApplication.java @@ -0,0 +1,13 @@ +package com.study.course_registration; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class CourseRegistrationApplication { + + public static void main(String[] args) { + SpringApplication.run(CourseRegistrationApplication.class, args); + } + +} diff --git a/src/main/java/com/study/course_registration/config/JpaConfig.java b/src/main/java/com/study/course_registration/config/JpaConfig.java new file mode 100644 index 0000000..3746e85 --- /dev/null +++ b/src/main/java/com/study/course_registration/config/JpaConfig.java @@ -0,0 +1,10 @@ +package com.study.course_registration.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; + +@Configuration +@EnableJpaAuditing +public class JpaConfig { + +} diff --git a/src/main/java/com/study/course_registration/controller/CourseRegistrationController.java b/src/main/java/com/study/course_registration/controller/CourseRegistrationController.java new file mode 100644 index 0000000..02d0686 --- /dev/null +++ b/src/main/java/com/study/course_registration/controller/CourseRegistrationController.java @@ -0,0 +1,38 @@ +package com.study.course_registration.controller; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; + +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.study.course_registration.service.CourseRegistrationService; + +import com.study.course_registration.dto.RequestDto; +import com.study.course_registration.dto.ResponseDto; + +@RestController +@RequestMapping ("/api/v1") +public class CourseRegistrationController { + + private final CourseRegistrationService courseRegistrationService; + + public CourseRegistrationController(CourseRegistrationService courseRegistrationService) { + this.courseRegistrationService = courseRegistrationService; + } + + @PostMapping("/course-register") + @Operation(summary = "Register a course", + description = "Registers a new course with the provided details.") + @ApiResponses({ + @ApiResponse (responseCode = "200", description = "Course registered successfully"), + @ApiResponse (responseCode = "400", description = "Invalid request data") + }) + public ResponseDto registerCourse(@Validated RequestDto requestDto) { + return courseRegistrationService.registerCourse(requestDto); + } + +} diff --git a/src/main/java/com/study/course_registration/dto/RequestDto.java b/src/main/java/com/study/course_registration/dto/RequestDto.java new file mode 100644 index 0000000..57831c6 --- /dev/null +++ b/src/main/java/com/study/course_registration/dto/RequestDto.java @@ -0,0 +1,7 @@ +package com.study.course_registration.dto; + +public record RequestDto( + +) { + +} diff --git a/src/main/java/com/study/course_registration/dto/ResponseDto.java b/src/main/java/com/study/course_registration/dto/ResponseDto.java new file mode 100644 index 0000000..5e566c0 --- /dev/null +++ b/src/main/java/com/study/course_registration/dto/ResponseDto.java @@ -0,0 +1,7 @@ +package com.study.course_registration.dto; + +public record ResponseDto( + +) { + +} diff --git a/src/main/java/com/study/course_registration/entity/BaseCreateEntity.java b/src/main/java/com/study/course_registration/entity/BaseCreateEntity.java new file mode 100644 index 0000000..009a49f --- /dev/null +++ b/src/main/java/com/study/course_registration/entity/BaseCreateEntity.java @@ -0,0 +1,15 @@ +package com.study.course_registration.entity; + +import java.time.Instant; + +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +import jakarta.persistence.*; + +@MappedSuperclass +@EntityListeners (AuditingEntityListener.class) +public class BaseCreateEntity { + @CreatedDate + private Instant createdAt; +} diff --git a/src/main/java/com/study/course_registration/entity/BaseDeleteEntity.java b/src/main/java/com/study/course_registration/entity/BaseDeleteEntity.java new file mode 100644 index 0000000..183c8d8 --- /dev/null +++ b/src/main/java/com/study/course_registration/entity/BaseDeleteEntity.java @@ -0,0 +1,24 @@ +package com.study.course_registration.entity; + +import java.time.Instant; + +import jakarta.persistence.MappedSuperclass; +import lombok.Getter; + +@MappedSuperclass +@Getter +public class BaseDeleteEntity { + private Instant deletedAt; + + public void delete() { + this.deletedAt = Instant.now(); + } + + public void restore() { + this.deletedAt = null; + } + + public boolean isDeleted() { + return this.deletedAt != null; + } +} diff --git a/src/main/java/com/study/course_registration/entity/BaseEntity.java b/src/main/java/com/study/course_registration/entity/BaseEntity.java new file mode 100644 index 0000000..fddfcaa --- /dev/null +++ b/src/main/java/com/study/course_registration/entity/BaseEntity.java @@ -0,0 +1,15 @@ +package com.study.course_registration.entity; + +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import lombok.Getter; + +@Getter +@MappedSuperclass +public class BaseEntity { + @Id + @GeneratedValue(strategy = GenerationType.UUID) + private String id; +} diff --git a/src/main/java/com/study/course_registration/entity/BaseTimeZoneEntity.java b/src/main/java/com/study/course_registration/entity/BaseTimeZoneEntity.java new file mode 100644 index 0000000..7bb7acc --- /dev/null +++ b/src/main/java/com/study/course_registration/entity/BaseTimeZoneEntity.java @@ -0,0 +1,19 @@ +package com.study.course_registration.entity; + +import java.time.Instant; + +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.MappedSuperclass; + +@MappedSuperclass +@EntityListeners (AuditingEntityListener.class) +public class BaseTimeZoneEntity extends BaseEntity { + @CreatedDate + private Instant createdAt; + + @LastModifiedDate + private Instant updatedAt; +} diff --git a/src/main/java/com/study/course_registration/entity/Lesson.java b/src/main/java/com/study/course_registration/entity/Lesson.java new file mode 100644 index 0000000..9d48741 --- /dev/null +++ b/src/main/java/com/study/course_registration/entity/Lesson.java @@ -0,0 +1,33 @@ +package com.study.course_registration.entity; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.Instant; + +@Entity +@NoArgsConstructor +@Getter +@Table(name = "lessons") +public class Lesson extends BaseTimeZoneEntity { + private String name; + + @ManyToOne(fetch = FetchType.LAZY) + private Subject subject; + + @ManyToOne(fetch = FetchType.LAZY) + private Professor professor; + + private Instant startTime; + + private Instant endTime; + + public Lesson(String name, Subject subject, Professor professor, Instant startTime, Instant endTime) { + this.name = name; + this.subject = subject; + this.professor = professor; + this.startTime = startTime; + this.endTime = endTime; + } +} diff --git a/src/main/java/com/study/course_registration/entity/Professor.java b/src/main/java/com/study/course_registration/entity/Professor.java new file mode 100644 index 0000000..061b151 --- /dev/null +++ b/src/main/java/com/study/course_registration/entity/Professor.java @@ -0,0 +1,17 @@ +package com.study.course_registration.entity; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@NoArgsConstructor +@Getter +@Table(name = "professors") +public class Professor extends BaseTimeZoneEntity { + private String name; + + public Professor(String name) { + this.name = name; + } +} diff --git a/src/main/java/com/study/course_registration/entity/Subject.java b/src/main/java/com/study/course_registration/entity/Subject.java new file mode 100644 index 0000000..671262a --- /dev/null +++ b/src/main/java/com/study/course_registration/entity/Subject.java @@ -0,0 +1,23 @@ +package com.study.course_registration.entity; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@NoArgsConstructor +@Getter +@Table(name = "subjects") +public class Subject extends BaseTimeZoneEntity { + private String name; + + private String code; + + private String description; + + public Subject(String name, String code, String description) { + this.name = name; + this.code = code; + this.description = description; + } +} diff --git a/src/main/java/com/study/course_registration/entity/User.java b/src/main/java/com/study/course_registration/entity/User.java new file mode 100644 index 0000000..6a90f5c --- /dev/null +++ b/src/main/java/com/study/course_registration/entity/User.java @@ -0,0 +1,26 @@ +package com.study.course_registration.entity; + +import com.study.course_registration.enums.UserRole; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@NoArgsConstructor +@Table(name = "users") +public class User extends BaseTimeZoneEntity { + private String name; + + private Long grade; + + @Enumerated(EnumType.STRING) + private UserRole role; + + public User(String name, Long grade, UserRole role) { + this.name = name; + this.grade = grade; + this.role = role; + } +} diff --git a/src/main/java/com/study/course_registration/entity/UserLesson.java b/src/main/java/com/study/course_registration/entity/UserLesson.java new file mode 100644 index 0000000..d8a0185 --- /dev/null +++ b/src/main/java/com/study/course_registration/entity/UserLesson.java @@ -0,0 +1,36 @@ +package com.study.course_registration.entity; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@NoArgsConstructor +@Getter +@Table(name = "user_lessons") +public class UserLesson extends BaseCreateEntity { + + @EmbeddedId + private UserLessonId id; + + @MapsId("userId") + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn ( + name = "user_id", + foreignKey = @ForeignKey(name = "fk_user_lesson_user_id") + ) + private User user; + + @MapsId("lessonId") + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn ( + name = "lesson_id", + foreignKey = @ForeignKey(name = "fk_user_lesson_lesson_id") + ) + private Lesson lesson; + + public UserLesson(User user, Lesson lesson) { + this.user = user; + this.lesson = lesson; + } +} diff --git a/src/main/java/com/study/course_registration/entity/UserLessonId.java b/src/main/java/com/study/course_registration/entity/UserLessonId.java new file mode 100644 index 0000000..ae89dbf --- /dev/null +++ b/src/main/java/com/study/course_registration/entity/UserLessonId.java @@ -0,0 +1,21 @@ +package com.study.course_registration.entity; + +import jakarta.persistence.Embeddable; +import java.io.Serializable; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Embeddable +@Getter +@NoArgsConstructor +@EqualsAndHashCode +public class UserLessonId implements Serializable { + private String userId; + private String lessonId; + + public UserLessonId(String userId, String lessonId) { + this.userId = userId; + this.lessonId = lessonId; + } +} diff --git a/src/main/java/com/study/course_registration/enums/UserRole.java b/src/main/java/com/study/course_registration/enums/UserRole.java new file mode 100644 index 0000000..df05484 --- /dev/null +++ b/src/main/java/com/study/course_registration/enums/UserRole.java @@ -0,0 +1,5 @@ +package com.study.course_registration.enums; + +public enum UserRole { + STUDENT, POSTGRADUATE +} diff --git a/src/main/java/com/study/course_registration/repository/LessonRepository.java b/src/main/java/com/study/course_registration/repository/LessonRepository.java new file mode 100644 index 0000000..7f24d8b --- /dev/null +++ b/src/main/java/com/study/course_registration/repository/LessonRepository.java @@ -0,0 +1,9 @@ +package com.study.course_registration.repository; + +import org.springframework.data.jpa.repository.JpaRepository; + +import com.study.course_registration.entity.Lesson; + +public interface LessonRepository extends JpaRepository { + +} diff --git a/src/main/java/com/study/course_registration/repository/ProfessorRepository.java b/src/main/java/com/study/course_registration/repository/ProfessorRepository.java new file mode 100644 index 0000000..46b7075 --- /dev/null +++ b/src/main/java/com/study/course_registration/repository/ProfessorRepository.java @@ -0,0 +1,9 @@ +package com.study.course_registration.repository; + +import org.springframework.data.jpa.repository.JpaRepository; + +import com.study.course_registration.entity.Professor; + +public interface ProfessorRepository extends JpaRepository { + +} diff --git a/src/main/java/com/study/course_registration/repository/SubjectRepository.java b/src/main/java/com/study/course_registration/repository/SubjectRepository.java new file mode 100644 index 0000000..49dcfa2 --- /dev/null +++ b/src/main/java/com/study/course_registration/repository/SubjectRepository.java @@ -0,0 +1,9 @@ +package com.study.course_registration.repository; + +import org.springframework.data.jpa.repository.JpaRepository; + +import com.study.course_registration.entity.Subject; + +public interface SubjectRepository extends JpaRepository { + +} diff --git a/src/main/java/com/study/course_registration/repository/UserLessonRepository.java b/src/main/java/com/study/course_registration/repository/UserLessonRepository.java new file mode 100644 index 0000000..38538f4 --- /dev/null +++ b/src/main/java/com/study/course_registration/repository/UserLessonRepository.java @@ -0,0 +1,10 @@ +package com.study.course_registration.repository; + +import org.springframework.data.jpa.repository.JpaRepository; + +import com.study.course_registration.entity.UserLesson; +import com.study.course_registration.entity.UserLessonId; + +public interface UserLessonRepository extends JpaRepository { + +} diff --git a/src/main/java/com/study/course_registration/repository/UserRepository.java b/src/main/java/com/study/course_registration/repository/UserRepository.java new file mode 100644 index 0000000..0a26ccd --- /dev/null +++ b/src/main/java/com/study/course_registration/repository/UserRepository.java @@ -0,0 +1,9 @@ +package com.study.course_registration.repository; + +import org.springframework.data.jpa.repository.JpaRepository; + +import com.study.course_registration.entity.User; + +public interface UserRepository extends JpaRepository { + +} diff --git a/src/main/java/com/study/course_registration/seeder/DataSeeder.java b/src/main/java/com/study/course_registration/seeder/DataSeeder.java new file mode 100644 index 0000000..92310bf --- /dev/null +++ b/src/main/java/com/study/course_registration/seeder/DataSeeder.java @@ -0,0 +1,91 @@ +package com.study.course_registration.seeder; + +import org.springframework.context.annotation.Profile; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +import com.study.course_registration.entity.Lesson; +import com.study.course_registration.entity.Professor; +import com.study.course_registration.entity.Subject; +import com.study.course_registration.entity.User; +import com.study.course_registration.entity.UserLesson; +import com.study.course_registration.enums.UserRole; +import com.study.course_registration.repository.LessonRepository; +import com.study.course_registration.repository.UserRepository; +import com.study.course_registration.repository.SubjectRepository; +import com.study.course_registration.repository.ProfessorRepository; +import com.study.course_registration.repository.UserLessonRepository; + +import java.time.Instant; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.time.temporal.ChronoUnit; +import java.util.List; + +import org.springframework.boot.CommandLineRunner; + +@Component +@Profile ("local") +public class DataSeeder implements CommandLineRunner { + + private static final ZoneId KST = ZoneId.of("Asia/Seoul"); + + private final UserRepository userRepository; + private final LessonRepository lessonRepository; + private final SubjectRepository subjectRepository; + private final ProfessorRepository professorRepository; + private final UserLessonRepository userLessonRepository; + + public DataSeeder(UserRepository userRepository, LessonRepository lessonRepository, SubjectRepository subjectRepository, ProfessorRepository professorRepository, UserLessonRepository userLessonRepository) { + this.userRepository = userRepository; + this.lessonRepository = lessonRepository; + this.subjectRepository = subjectRepository; + this.professorRepository = professorRepository; + this.userLessonRepository = userLessonRepository; + } + + @Override + @Transactional + public void run(String... args) throws Exception { + if(userRepository.count() > 0) { + return; + } + + List professors = professorRepository.saveAll(List.of( + new Professor("김영한"), + new Professor("최태영"), + new Professor("조재한") + )); + + List subjects = subjectRepository.saveAll(List.of( + new Subject("자바 프로그래밍", "CS201", "자바 프로그래밍 기초"), + new Subject("자료구조", "CS202", "자료구조 및 알고리즘"), + new Subject("데이터베이스", "CS203", "데이터베이스 시스템") + )); + + Instant base = Instant.now().truncatedTo(ChronoUnit.HOURS); + List lessons = lessonRepository.saveAll(List.of( + new Lesson("자바 프로그래밍", subjects.get(0), professors.get(0), kst(3, 2, 9), kst(3, 2, 11)), + new Lesson("자료구조", subjects.get(1), professors.get(1), kst(3, 2, 13), kst(3, 2, 17)), + new Lesson("데이터베이스", subjects.get(2), professors.get(2), kst(3, 3, 10), kst(3, 3, 14)) + )); + + List users = userRepository.saveAll(List.of( + new User("학생1", 1L, UserRole.STUDENT), + new User("학생2", 2L, UserRole.STUDENT), + new User("대학원생", 3L, UserRole.POSTGRADUATE) + )); + + List userLessons = userLessonRepository.saveAll(List.of( + new UserLesson(users.get(0), lessons.get(0)), + new UserLesson(users.get(0), lessons.get(1)), + new UserLesson(users.get(1), lessons.get(1)), + new UserLesson(users.get(2), lessons.get(2)) + )); + } + + private Instant kst(int month, int day, int hour) { + return ZonedDateTime.of(2026, month, day, hour, 0, 0, 0, KST).toInstant(); + } + +} diff --git a/src/main/java/com/study/course_registration/service/CourseRegistrationService.java b/src/main/java/com/study/course_registration/service/CourseRegistrationService.java new file mode 100644 index 0000000..c3c38a3 --- /dev/null +++ b/src/main/java/com/study/course_registration/service/CourseRegistrationService.java @@ -0,0 +1,36 @@ +package com.study.course_registration.service; + +import org.springframework.stereotype.Service; + +import com.study.course_registration.dto.RequestDto; +import com.study.course_registration.dto.ResponseDto; +import com.study.course_registration.repository.LessonRepository; +import com.study.course_registration.repository.UserLessonRepository; +import com.study.course_registration.repository.UserRepository; +import com.study.course_registration.repository.SubjectRepository; +import com.study.course_registration.repository.ProfessorRepository; + +@Service +public class CourseRegistrationService { + private final UserRepository userRepository; + private final LessonRepository lessonRepository; + private final SubjectRepository subjectRepository; + private final ProfessorRepository professorRepository; + private final UserLessonRepository userLessonRepository; + + public CourseRegistrationService(UserRepository userRepository, LessonRepository lessonRepository, SubjectRepository subjectRepository, ProfessorRepository professorRepository, UserLessonRepository userLessonRepository) { + this.userRepository = userRepository; + this.lessonRepository = lessonRepository; + this.subjectRepository = subjectRepository; + this.professorRepository = professorRepository; + this.userLessonRepository = userLessonRepository; + } + + public ResponseDto registerCourse(RequestDto requestDto) { + + return new ResponseDto(); + } +} +// 저장 전 log +// 검증 로직 +// \ No newline at end of file diff --git a/src/main/resources/application-dev.yaml b/src/main/resources/application-dev.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/main/resources/application-local.yaml b/src/main/resources/application-local.yaml new file mode 100644 index 0000000..a2e3fcf --- /dev/null +++ b/src/main/resources/application-local.yaml @@ -0,0 +1,21 @@ +spring: + datasource: + url: jdbc:h2:mem:course_db + driver-class-name: org.h2.Driver + username: sa + password: + jpa: + hibernate: + ddl-auto: create-drop + show-sql: true + properties: + hibernate: + format_sql: true + h2: + console: + enabled: true + path: /h2-console + +logging: + level: + org.hibernate.SQL: debug diff --git a/src/main/resources/application-prod.yaml b/src/main/resources/application-prod.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml new file mode 100644 index 0000000..d149947 --- /dev/null +++ b/src/main/resources/application.yaml @@ -0,0 +1,28 @@ +server: + application: + name: ${APP_NAME:course-registration} + profiles: + active: ${APP_PROFILE:local} + +spring: + jackson: + time-zone: UTC + h2: + console: + enabled: true + path: /h2-console + datasource: + url: jdbc:h2:mem:course_db + username: sa + password: + driver-class-name: org.h2.Driver + jpa: + hibernate: + ddl-auto: create + show-sql: true + properties: + hibernate: + format_sql: true + +logging.level: + org.hibernate.SQL: debug diff --git a/src/test/java/com/study/course_registration/CourseRegistrationApplicationTests.java b/src/test/java/com/study/course_registration/CourseRegistrationApplicationTests.java new file mode 100644 index 0000000..491e913 --- /dev/null +++ b/src/test/java/com/study/course_registration/CourseRegistrationApplicationTests.java @@ -0,0 +1,13 @@ +package com.study.course_registration; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class CourseRegistrationApplicationTests { + + @Test + void contextLoads() { + } + +}