Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/DSM-Repo/Whopper
Browse files Browse the repository at this point in the history
  • Loading branch information
dkflfkd53 committed Aug 1, 2024
2 parents 0196b17 + 7219bd4 commit 7b459b5
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 29 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/git-action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,3 @@ jobs:
with:
environment: prod
access_key: ${{ secrets.XQUARE_ACCESS_KEY }}
buildargs: |
PROFILE=prod
MONGO_URI=${{ secrets.MONGO_URI }}
LOGIN_URL=${{ secrets.LOGIN_URL }}
REDIS_HOST=${{ secrets.REDIS_HOST }}
SECRET=${{ secrets.SECRET }}
15 changes: 0 additions & 15 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,5 @@
FROM openjdk:21-jdk

ARG PROFILE
ENV PROFILE ${PROFILE}

ARG MONGO_URI
ENV MONGO_URI ${MONGO_URI}

ARG LOGIN_URL
ENV LOGIN_URL ${LOGIN_URL}

ARG REDIS_HOST
ENV REDIS_HOST ${REDIS_HOST}

ARG SECRET
ENV SECRET ${SECRET}

ARG JAR_FILE=./build/libs/*.jar
COPY ${JAR_FILE} application.jar

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;

import java.util.List;

@RestController
@RequiredArgsConstructor
@RequestMapping("/major")
Expand All @@ -17,8 +19,8 @@ public class MajorController {
private final DeleteMajorUseCase deleteMajorUseCase;

@PostMapping
public void add(@RequestParam String input) {
addMajorUseCase.add(input);
public void add(@RequestBody AddMajorRequest request) {
addMajorUseCase.add(request.majors());
}

@GetMapping
Expand All @@ -30,4 +32,6 @@ public DataResponseInfo<MajorEntity> findAll() {
public void delete(@PathVariable String majorId) {
deleteMajorUseCase.delete(majorId);
}

private record AddMajorRequest(List<String> majors) {}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,21 @@
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;

import java.util.List;

@Service
@RequiredArgsConstructor
public class AddMajorService implements AddMajorUseCase {
private final MajorRepository majorRepository;

@Override
public void add(String majorName) {
if (majorRepository.existsByName(majorName)) {
throw AlreadyExistsMajorNameException.EXCEPTION;
}
public void add(List<String> majors) {
majors.forEach(this::addMajor);
}

majorRepository.save(MajorEntity.createEntity(majorName));
private void addMajor(String major) {
if (!majorRepository.existsByName(major)) {
majorRepository.save(MajorEntity.createEntity(major));
}
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.example.whopper.domain.major.application.usecase;

import java.util.List;

public interface AddMajorUseCase {
void add(String majorName);
void add(List<String> majors);
}

0 comments on commit 7b459b5

Please sign in to comment.