Skip to content

Commit

Permalink
[refac] delete unused import statements (#123)
Browse files Browse the repository at this point in the history
  • Loading branch information
kgy1008 authored Jul 17, 2024
1 parent ce42621 commit 060bde7
Show file tree
Hide file tree
Showing 30 changed files with 52 additions and 85 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@ public class HankkiserverApplication {
public static void main(String[] args) {
SpringApplication.run(HankkiserverApplication.class, args);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,4 @@ public Object beforeBodyWrite(Object body, MethodParameter returnType, MediaType
}
return body;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,16 @@
import lombok.RequiredArgsConstructor;
import org.hankki.hankkiserver.api.dto.HankkiResponse;
import org.hankki.hankkiserver.api.favorite.controller.request.FavoriteDeleteRequest;
import org.hankki.hankkiserver.api.favorite.controller.request.FavoritePostRequest;
import org.hankki.hankkiserver.api.favorite.controller.request.FavoritesGetRequest;
import org.hankki.hankkiserver.api.favorite.service.FavoriteCommandService;
import org.hankki.hankkiserver.api.favorite.service.command.FavoritesGetCommand;
import org.hankki.hankkiserver.api.favorite.service.command.FavoritePostCommand;
import org.hankki.hankkiserver.api.favorite.controller.request.FavoritePostRequest;
import org.hankki.hankkiserver.api.favorite.service.command.FavoriteStoreDeleteCommand;
import org.hankki.hankkiserver.api.favorite.service.command.FavoriteStorePostCommand;
import org.hankki.hankkiserver.api.favorite.service.command.FavoritesDeleteCommand;
import org.hankki.hankkiserver.api.favorite.service.command.FavoritesWithStatusGetCommand;
import org.hankki.hankkiserver.api.favorite.service.FavoriteQueryService;
import org.hankki.hankkiserver.api.favorite.service.command.*;
import org.hankki.hankkiserver.api.favorite.service.response.FavoriteGetResponse;
import org.hankki.hankkiserver.api.favorite.service.response.FavoritesWithStatusGetResponse;
import org.hankki.hankkiserver.auth.UserId;
import org.hankki.hankkiserver.common.code.CommonSuccessCode;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.Mapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.hankki.hankkiserver.api.favorite.service.FavoriteQueryService;
import org.hankki.hankkiserver.api.favorite.service.response.FavoriteGetResponse;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

@RestController
@RequiredArgsConstructor
Expand Down Expand Up @@ -82,4 +68,4 @@ public HankkiResponse<FavoriteGetResponse> getFavorite(@UserId final Long userId
public HankkiResponse<FavoritesWithStatusGetResponse> getFavoritesWithStatus(@UserId Long id, @RequestBody final FavoritesGetRequest request) {
return HankkiResponse.success(CommonSuccessCode.OK, favoriteQueryService.findFavoritesWithStatus(FavoritesWithStatusGetCommand.of(id, request)));
}
}
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
package org.hankki.hankkiserver.api.favorite.service;

import java.util.List;
import lombok.RequiredArgsConstructor;
import org.hankki.hankkiserver.common.code.BusinessErrorCode;
import org.hankki.hankkiserver.common.exception.InternalServerException;
import org.hankki.hankkiserver.domain.favorite.model.Favorite;
import org.hankki.hankkiserver.domain.favorite.repository.FavoriteRepository;
import org.hankki.hankkiserver.domain.favoritestore.model.FavoriteStore;
import org.springframework.stereotype.Component;

import java.util.List;

@Component
@RequiredArgsConstructor
public class FavoriteDeleter {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
package org.hankki.hankkiserver.api.favorite.service;

import java.util.List;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import java.util.LinkedHashMap;
import org.hankki.hankkiserver.api.favorite.service.command.FavoritesGetCommand;
import org.hankki.hankkiserver.api.favorite.service.command.FavoritesWithStatusGetCommand;
import org.hankki.hankkiserver.api.favorite.service.response.FavoriteGetResponse;
import org.hankki.hankkiserver.api.favorite.service.response.FavoritesWithStatusGetResponse;
import org.hankki.hankkiserver.api.store.service.StoreFinder;
import org.hankki.hankkiserver.domain.favorite.model.Favorite;
import org.hankki.hankkiserver.domain.favoritestore.model.FavoriteStore;
import org.hankki.hankkiserver.domain.store.model.Store;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.LinkedHashMap;
import java.util.List;
import java.util.stream.Collectors;

@Service
@RequiredArgsConstructor
public class FavoriteQueryService {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ public record FavoriteStoreDeleteCommand(
Long favoriteId,
Long storeId
) {

public static FavoriteStoreDeleteCommand of(Long userId, Long favoriteId, Long storeId) {
return new FavoriteStoreDeleteCommand(userId, favoriteId, storeId);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
package org.hankki.hankkiserver.api.favorite.service.command;

import org.hankki.hankkiserver.auth.UserId;
import org.springframework.web.bind.annotation.PathVariable;

public record FavoriteStorePostCommand(
Long userId,
Long favoriteId,
Long storeId
) {

public static FavoriteStorePostCommand of(Long userId, Long favoriteId, Long storeId) {
return new FavoriteStorePostCommand(userId, favoriteId, storeId);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package org.hankki.hankkiserver.api.favorite.service.response;

import static org.hankki.hankkiserver.api.favorite.service.response.util.FavoriteResponseUtil.transformDetail;
import org.hankki.hankkiserver.domain.favorite.model.Favorite;

import java.util.List;
import org.hankki.hankkiserver.domain.favorite.model.Favorite;

import static org.hankki.hankkiserver.api.favorite.service.response.util.FavoriteResponseUtil.transformDetail;

public record FavoriteGetResponse(
String title,
List<String> details,
List<FavoriteStoreResponse> stores
) {

public static FavoriteGetResponse of(final Favorite favorite) {
return new FavoriteGetResponse(
favorite.getName(),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
package org.hankki.hankkiserver.api.favoritestore.service;

import java.util.List;
import lombok.RequiredArgsConstructor;
import org.hankki.hankkiserver.common.code.BusinessErrorCode;
import org.hankki.hankkiserver.common.exception.InternalServerException;
import org.hankki.hankkiserver.domain.favorite.model.Favorite;
import org.hankki.hankkiserver.domain.favoritestore.model.FavoriteStore;
import org.hankki.hankkiserver.domain.favoritestore.repository.FavoriteStoreRepository;
import org.springframework.stereotype.Component;

import java.util.List;

@Component
@RequiredArgsConstructor
public class FavoriteStoreDeleter {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
package org.hankki.hankkiserver.api.favoritestore.service;

import java.util.Optional;
import lombok.RequiredArgsConstructor;
import org.hankki.hankkiserver.common.code.FavoriteStoreErrorCode;
import org.hankki.hankkiserver.common.code.StoreErrorCode;
import org.hankki.hankkiserver.common.exception.NotFoundException;
import org.hankki.hankkiserver.domain.favorite.model.Favorite;
import org.hankki.hankkiserver.domain.favoritestore.model.FavoriteStore;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@ public class StoreController {
private final HeartCommandService heartCommandService;

@GetMapping("/stores/{storeId}")
public HankkiResponse<StoreGetResponse> getStore(@PathVariable final Long storeId,
@UserId final Long userId) {
public HankkiResponse<StoreGetResponse> getStore(@PathVariable final Long storeId, @UserId final Long userId) {
return HankkiResponse.success(CommonSuccessCode.OK, storeQueryService.getStoreInformation(storeId, userId));
}

Expand All @@ -48,13 +47,15 @@ public HankkiResponse<StorePinsResponse> getStorePins(@RequestParam(required = f
@RequestParam(required = false) final SortOption sortOption) {
return HankkiResponse.success(CommonSuccessCode.OK, storeQueryService.getStorePins(universityId, storeCategory, priceCategory, sortOption));
}

@GetMapping("/stores")
public HankkiResponse<StoresResponse> getStores(@RequestParam(required = false) final Long universityId,
@RequestParam(required = false) final StoreCategory storeCategory,
@RequestParam(required = false) final PriceCategory priceCategory,
@RequestParam(required = false) final SortOption sortOption) {
return HankkiResponse.success(CommonSuccessCode.OK, storeQueryService.getStores(universityId, storeCategory, priceCategory, sortOption));
}

@GetMapping("/stores/{id}/thumbnail")
public HankkiResponse<StoreThumbnailResponse> getStoreThumbnail(@PathVariable final Long id) {
return HankkiResponse.success(CommonSuccessCode.OK, storeQueryService.getStoreThumbnail(id));
Expand Down Expand Up @@ -90,6 +91,7 @@ public HankkiResponse<Void> validateDuplicatedStore(@RequestBody final StoreDupl
storeQueryService.validateDuplicatedStore(StoreValidationCommand.of(request));
return HankkiResponse.success(CommonSuccessCode.OK);
}

@PostMapping("/stores")
public HankkiResponse<StorePostResponse> createStore(@RequestPart(required = false) final MultipartFile image,
@Valid @RequestPart final StorePostRequest request,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ public record StorePostRequest(
long universityId,
@Size(min = 1) @Valid
List<MenuPostRequest> menus
) {
) {
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,4 @@ public enum PriceCategory {
private final String name;
private final int maxPrice;
private final int minPrice;

}
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ protected Store findByIdWithHeartAndIsDeletedFalse(final Long id) {
protected Optional<Store> findByLatitudeAndLongitude(final double latitude, final double longitude) {
return storeRepository.findByPoint_LatitudeAndPoint_Longitude(latitude, longitude);
}

protected boolean existsByLatitudeAndLongitude(final double latitude, final double longitude) {
return storeRepository.existsByPoint_LatitudeAndPoint_Longitude(latitude, longitude);
}
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@ public record StorePinsResponse(List<PinResponse> pins) {
public static StorePinsResponse of (final List<PinResponse> pins) {
return new StorePinsResponse(pins);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@

import org.hankki.hankkiserver.domain.store.model.Store;

public record StoreResponse (long id,
String imageUrl,
String category,
String name,
int lowestPrice,
int heartCount) {

public record StoreResponse (
long id,
String imageUrl,
String category,
String name,
int lowestPrice,
int heartCount
) {
public static StoreResponse of(final Store store) {
return new StoreResponse(store.getId(), store.getImages().get(0).getImageUrl(), store.getCategory().getName(), store.getName(), store.getLowestPrice(), store.getHeartCount());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public University findById(final Long id) {
return universityRepository.findById(id)
.orElseThrow(() -> new NotFoundException(UniversityErrorCode.UNIVERSITY_NOT_FOUND));
}

public List<University> findAll () {
return universityRepository.findAll();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,11 @@
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;

public record UserUniversityPostRequest(long universityId, @NotBlank @Size(min = 3, max = 20) String name, double longitude, double latitude) {
}
public record UserUniversityPostRequest(
long universityId,
@NotBlank @Size(min = 3, max = 20)
String name,
double longitude,
double latitude
) {
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
import org.hankki.hankkiserver.domain.store.model.Store;

public record UserStoreReportedResponse(
Long id,
String name,
String category,
String imageUrl,
int lowestPrice,
int heartCount
Long id,
String name,
String category,
String imageUrl,
int lowestPrice,
int heartCount
) {
public static UserStoreReportedResponse of(Store store) {
return new UserStoreReportedResponse(
Expand All @@ -19,4 +19,4 @@ public static UserStoreReportedResponse of(Store store) {
store.getLowestPrice(),
store.getHeartCount());
}
}
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package org.hankki.hankkiserver.api.user.service.response;

import java.util.List;
import org.hankki.hankkiserver.domain.store.model.Store;

import java.util.List;

public record UserStoresReportedGetResponse(
List<UserStoreReportedResponse> stores
List<UserStoreReportedResponse> stores
) {
public static UserStoresReportedGetResponse of(List<Store> stores) {
return new UserStoresReportedGetResponse(stores.stream().map(UserStoreReportedResponse::of).toList());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
public record UserUniversityFindResponse(long id,
String name,
double longitude,
double latitude) {
double latitude)
{
public static UserUniversityFindResponse of (UserUniversity userUniversity) {
return new UserUniversityFindResponse(userUniversity.getUniversityId(), userUniversity.getUniversityName(),
userUniversity.getLongitude(), userUniversity.getLatitude());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import org.hankki.hankkiserver.auth.jwt.JwtProvider;
import org.hankki.hankkiserver.auth.jwt.JwtValidator;
import org.hankki.hankkiserver.common.code.AuthErrorCode;
import org.hankki.hankkiserver.common.code.ErrorCode;
import org.hankki.hankkiserver.common.exception.UnauthorizedException;
import org.springframework.security.core.context.SecurityContext;
import org.springframework.security.core.context.SecurityContextHolder;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
import org.hankki.hankkiserver.common.exception.UnauthorizedException;
import org.springframework.stereotype.Component;

import java.net.URI;

import static org.hankki.hankkiserver.auth.filter.JwtAuthenticationFilter.BEARER;

@RequiredArgsConstructor
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.hankki.hankkiserver.common.code;

import lombok.AccessLevel;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
Expand Down Expand Up @@ -41,5 +40,4 @@ public enum AuthErrorCode implements ErrorCode {

private final HttpStatus httpStatus;
private final String message;

}
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.hankki.hankkiserver.common.code;

import lombok.AccessLevel;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,5 @@ public interface StoreRepository extends JpaRepository<Store, Long>, CustomStore
@Query("select s from Store s where s.point.latitude = :latitude and s.point.longitude = :longitude")
Optional<Store> findByPoint_LatitudeAndPoint_Longitude(double latitude, double longitude);

Optional<Store> findByName(String name);

boolean existsByPoint_LatitudeAndPoint_Longitude(double latitude, double longitude);
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,4 @@ public interface UserRepository extends JpaRepository<User, Long> {
Optional<User> findByPlatformAndSerialId(Platform platform, String serialId);

boolean existsByPlatformAndSerialIdAndMemberStatus(Platform platform, String serialId, MemberStatus memberStatus);
Optional<User> findByPlatformAndSerialIdAndMemberStatus(Platform platform, String serialId, MemberStatus memberStatus);
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

import java.util.List;


public record ApplePublicKeys(
List<ApplePublicKey> keys
) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.hankki.hankkiserver.external.openfeign.kakao;

import org.hankki.hankkiserver.external.openfeign.kakao.dto.KakaoUnlinkRequest;
import org.hankki.hankkiserver.external.openfeign.kakao.dto.KakaoUserInfo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.HttpHeaders;
Expand Down

0 comments on commit 060bde7

Please sign in to comment.