sombochea/spring-boot-realworld-example-app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

structure update

Browse Source
This commit is contained in:
aisensiy
2017-08-18 17:08:27 +08:00
parent ce6a56e1db
commit b97bf72311
68 changed files with 225 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/io/spring/JacksonCustomizations.java
View File

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
import org.joda.time.DateTime;
import org.joda.time.format.ISODateTimeFormat;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -36,7 +37,7 @@ public class JacksonCustomizations {
if (value == null) {
gen.writeNull();
} else {
gen.writeString(value.toString());
gen.writeString(ISODateTimeFormat.dateTime().withZoneUTC().print(value));
}
}
}

6
src/main/java/io/spring/api/ArticleApi.java
View File

@@ -3,9 +3,9 @@ package io.spring.api;
import com.fasterxml.jackson.annotation.JsonRootName;
import io.spring.api.exception.NoAuthorizationException;
import io.spring.api.exception.ResourceNotFoundException;
import io.spring.application.AuthorizationService;
import io.spring.application.article.ArticleData;
import io.spring.application.article.ArticleQueryService;
import io.spring.core.service.AuthorizationService;
import io.spring.application.data.ArticleData;
import io.spring.application.ArticleQueryService;
import io.spring.core.article.ArticleRepository;
import io.spring.core.user.User;
import lombok.Getter;

4
src/main/java/io/spring/api/ArticleFavoriteApi.java
View File

@@ -1,8 +1,8 @@
package io.spring.api;
import io.spring.api.exception.ResourceNotFoundException;
import io.spring.application.article.ArticleData;
import io.spring.application.article.ArticleQueryService;
import io.spring.application.data.ArticleData;
import io.spring.application.ArticleQueryService;
import io.spring.core.article.Article;
import io.spring.core.article.ArticleRepository;
import io.spring.core.favorite.ArticleFavorite;

2
src/main/java/io/spring/api/ArticlesApi.java
View File

@@ -3,7 +3,7 @@ package io.spring.api;
import com.fasterxml.jackson.annotation.JsonRootName;
import io.spring.api.exception.InvalidRequestException;
import io.spring.application.Page;
import io.spring.application.article.ArticleQueryService;
import io.spring.application.ArticleQueryService;
import io.spring.core.article.Article;
import io.spring.core.article.ArticleRepository;
import io.spring.core.user.User;

6
src/main/java/io/spring/api/CommentsApi.java
View File

@@ -4,9 +4,9 @@ import com.fasterxml.jackson.annotation.JsonRootName;
import io.spring.api.exception.InvalidRequestException;
import io.spring.api.exception.NoAuthorizationException;
import io.spring.api.exception.ResourceNotFoundException;
import io.spring.application.AuthorizationService;
import io.spring.application.comment.CommentData;
import io.spring.application.comment.CommentQueryService;
import io.spring.core.service.AuthorizationService;
import io.spring.application.data.CommentData;
import io.spring.application.CommentQueryService;
import io.spring.core.article.Article;
import io.spring.core.article.ArticleRepository;
import io.spring.core.comment.Comment;

16
src/main/java/io/spring/api/CurrentUserApi.java
View File

@@ -2,8 +2,9 @@ package io.spring.api;
import com.fasterxml.jackson.annotation.JsonRootName;
import io.spring.api.exception.InvalidRequestException;
import io.spring.application.user.UserQueryService;
import io.spring.application.user.UserWithToken;
import io.spring.application.UserQueryService;
import io.spring.application.UserWithToken;
import io.spring.application.data.UserData;
import io.spring.core.user.User;
import io.spring.core.user.UserRepository;
import lombok.Getter;
@@ -40,11 +41,15 @@ public class CurrentUserApi {
@GetMapping
public ResponseEntity currentUser(@AuthenticationPrincipal User currentUser,
@RequestHeader(value = "Authorization") String authorization) {
return ResponseEntity.ok(userResponse(userQueryService.fetchCurrentUser(currentUser.getUsername(), authorization.split(" ")[1])));
UserData userData = userQueryService.findById(currentUser.getId()).get();
return ResponseEntity.ok(userResponse(
new UserWithToken(userData, authorization.split(" ")[1])
));
}
@PutMapping
public ResponseEntity updateProfile(@AuthenticationPrincipal User currentUser,
@RequestHeader("Authorization") String token,
@Valid @RequestBody UpdateUserParam updateUserParam,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
@@ -59,7 +64,10 @@ public class CurrentUserApi {
updateUserParam.getBio(),
updateUserParam.getImage());
userRepository.save(currentUser);
return ResponseEntity.ok(userResponse(userQueryService.fetchNewAuthenticatedUser(currentUser.getUsername())));
UserData userData = userQueryService.findById(currentUser.getId()).get();
return ResponseEntity.ok(userResponse(
new UserWithToken(userData, token.split(" ")[1])
));
}
private void checkUniquenessOfUsernameAndEmail(User currentUser, UpdateUserParam updateUserParam, BindingResult bindingResult) {

4
src/main/java/io/spring/api/ProfileApi.java
View File

@@ -1,8 +1,8 @@
package io.spring.api;
import io.spring.api.exception.ResourceNotFoundException;
import io.spring.application.profile.ProfileData;
import io.spring.application.profile.ProfileQueryService;
import io.spring.application.data.ProfileData;
import io.spring.application.ProfileQueryService;
import io.spring.core.user.FollowRelation;
import io.spring.core.user.User;
import io.spring.core.user.UserRepository;

2
src/main/java/io/spring/api/TagsApi.java
View File

@@ -1,6 +1,6 @@
package io.spring.api;
import io.spring.application.tag.TagsQueryService;
import io.spring.application.TagsQueryService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;

46
src/main/java/io/spring/api/UsersApi.java
View File

@@ -2,8 +2,10 @@ package io.spring.api;
import com.fasterxml.jackson.annotation.JsonRootName;
import io.spring.api.exception.InvalidRequestException;
import io.spring.application.user.UserQueryService;
import io.spring.application.user.UserWithToken;
import io.spring.application.UserQueryService;
import io.spring.application.UserWithToken;
import io.spring.application.data.UserData;
import io.spring.core.service.JwtService;
import io.spring.core.user.EncryptService;
import io.spring.core.user.User;
import io.spring.core.user.UserRepository;
@@ -32,32 +34,25 @@ public class UsersApi {
private UserQueryService userQueryService;
private String defaultImage;
private EncryptService encryptService;
private JwtService jwtService;
@Autowired
public UsersApi(UserRepository userRepository,
UserQueryService userQueryService,
EncryptService encryptService,
@Value("${image.default}") String defaultImage) {
@Value("${image.default}") String defaultImage,
JwtService jwtService) {
this.userRepository = userRepository;
this.userQueryService = userQueryService;
this.encryptService = encryptService;
this.defaultImage = defaultImage;
this.jwtService = jwtService;
}
@RequestMapping(path = "/users", method = POST)
public ResponseEntity createUser(@Valid @RequestBody RegisterParam registerParam, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
throw new InvalidRequestException(bindingResult);
}
if (userRepository.findByUsername(registerParam.getUsername()).isPresent()) {
bindingResult.rejectValue("username", "DUPLICATED", "duplicated username");
throw new InvalidRequestException(bindingResult);
}
checkInput(registerParam, bindingResult);
if (userRepository.findByEmail(registerParam.getEmail()).isPresent()) {
bindingResult.rejectValue("email", "DUPLICATED", "duplicated email");
throw new InvalidRequestException(bindingResult);
}
User user = new User(
registerParam.getEmail(),
registerParam.getUsername(),
@@ -65,14 +60,33 @@ public class UsersApi {
"",
defaultImage);
userRepository.save(user);
return ResponseEntity.status(201).body(userResponse(userQueryService.fetchNewAuthenticatedUser(user.getUsername())));
UserData userData = userQueryService.findById(user.getId()).get();
return ResponseEntity.status(201).body(userResponse(new UserWithToken(userData, jwtService.toToken(user))));
}
private void checkInput(@Valid @RequestBody RegisterParam registerParam, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
throw new InvalidRequestException(bindingResult);
}
if (userRepository.findByUsername(registerParam.getUsername()).isPresent()) {
bindingResult.rejectValue("username", "DUPLICATED", "duplicated username");
}
if (userRepository.findByEmail(registerParam.getEmail()).isPresent()) {
bindingResult.rejectValue("email", "DUPLICATED", "duplicated email");
}
if (bindingResult.hasErrors()) {
throw new InvalidRequestException(bindingResult);
}
}
@RequestMapping(path = "/users/login", method = POST)
public ResponseEntity userLogin(@Valid @RequestBody LoginParam loginParam, BindingResult bindingResult) {
Optional<User> optional = userRepository.findByEmail(loginParam.getEmail());
if (optional.isPresent() && encryptService.check(loginParam.getPassword(), optional.get().getPassword())) {
return ResponseEntity.ok(userResponse(userQueryService.fetchNewAuthenticatedUser(optional.get().getUsername())));
UserData userData = userQueryService.findById(optional.get().getId()).get();
return ResponseEntity.ok(userResponse(new UserWithToken(userData, jwtService.toToken(optional.get()))));
} else {
bindingResult.rejectValue("password", "INVALID", "invalid email or password");
throw new InvalidRequestException(bindingResult);

3
src/main/java/io/spring/api/security/JwtTokenFilter.java
View File

@@ -1,7 +1,6 @@
package io.spring.api.security;
import io.spring.application.JwtService;
import io.spring.core.user.User;
import io.spring.core.service.JwtService;
import io.spring.core.user.UserRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;

2
src/main/java/io/spring/application/article/ArticleFavoritesQueryService.java → src/main/java/io/spring/application/ArticleFavoritesQueryService.java
View File

@@ -1,4 +1,4 @@
package io.spring.application.article;
package io.spring.application;
import io.spring.core.user.User;
import org.apache.ibatis.annotations.Mapper;

8
src/main/java/io/spring/application/article/ArticleQueryService.java → src/main/java/io/spring/application/ArticleQueryService.java
View File

@@ -1,8 +1,10 @@
package io.spring.application.article;
package io.spring.application;
import io.spring.application.Page;
import io.spring.application.profile.UserRelationshipQueryService;
import io.spring.application.data.ArticleData;
import io.spring.application.data.ArticleDataList;
import io.spring.infrastructure.mybatis.readservice.UserRelationshipQueryService;
import io.spring.core.user.User;
import io.spring.infrastructure.mybatis.readservice.ArticleReadService;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;

6
src/main/java/io/spring/application/comment/CommentQueryService.java → src/main/java/io/spring/application/CommentQueryService.java
View File

@@ -1,7 +1,9 @@
package io.spring.application.comment;
package io.spring.application;
import io.spring.application.profile.UserRelationshipQueryService;
import io.spring.application.data.CommentData;
import io.spring.infrastructure.mybatis.readservice.UserRelationshipQueryService;
import io.spring.core.user.User;
import io.spring.infrastructure.mybatis.readservice.CommentReadService;
import org.springframework.stereotype.Service;
import java.util.List;

8
src/main/java/io/spring/application/profile/ProfileQueryService.java → src/main/java/io/spring/application/ProfileQueryService.java
View File

@@ -1,8 +1,10 @@
package io.spring.application.profile;
package io.spring.application;
import io.spring.application.user.UserData;
import io.spring.application.user.UserReadService;
import io.spring.application.data.ProfileData;
import io.spring.application.data.UserData;
import io.spring.infrastructure.mybatis.readservice.UserReadService;
import io.spring.core.user.User;
import io.spring.infrastructure.mybatis.readservice.UserRelationshipQueryService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

3
src/main/java/io/spring/application/tag/TagsQueryService.java → src/main/java/io/spring/application/TagsQueryService.java
View File

@@ -1,5 +1,6 @@
package io.spring.application.tag;
package io.spring.application;
import io.spring.infrastructure.mybatis.readservice.TagReadService;
import org.springframework.stereotype.Service;
import java.util.List;

24
src/main/java/io/spring/application/UserQueryService.java Normal file
View File

@@ -0,0 +1,24 @@
package io.spring.application;
import io.spring.application.data.UserData;
import io.spring.core.service.JwtService;
import io.spring.infrastructure.mybatis.readservice.UserReadService;
import org.springframework.stereotype.Service;
import java.util.Optional;
@Service
public class UserQueryService {
private UserReadService userReadService;
private JwtService jwtService;
public UserQueryService(UserReadService userReadService, JwtService jwtService) {
this.userReadService = userReadService;
this.jwtService = jwtService;
}
public Optional<UserData> findById(String id) {
return Optional.ofNullable(userReadService.findById(id));
}
}

3
src/main/java/io/spring/application/user/UserWithToken.java → src/main/java/io/spring/application/UserWithToken.java
View File

@@ -1,5 +1,6 @@
package io.spring.application.user;
package io.spring.application;
import io.spring.application.data.UserData;
import lombok.Getter;
@Getter

3
src/main/java/io/spring/application/article/ArticleData.java → src/main/java/io/spring/application/data/ArticleData.java
View File

@@ -1,7 +1,6 @@
package io.spring.application.article;
package io.spring.application.data;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.spring.application.profile.ProfileData;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

2
src/main/java/io/spring/application/article/ArticleDataList.java → src/main/java/io/spring/application/data/ArticleDataList.java
View File

@@ -1,4 +1,4 @@
package io.spring.application.article;
package io.spring.application.data;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;

3
src/main/java/io/spring/application/comment/CommentData.java → src/main/java/io/spring/application/data/CommentData.java
View File

@@ -1,8 +1,7 @@
package io.spring.application.comment;
package io.spring.application.data;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.spring.application.profile.ProfileData;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

2
src/main/java/io/spring/application/profile/ProfileData.java → src/main/java/io/spring/application/data/ProfileData.java
View File

@@ -1,4 +1,4 @@
package io.spring.application.profile;
package io.spring.application.data;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.AllArgsConstructor;

2
src/main/java/io/spring/application/user/UserData.java → src/main/java/io/spring/application/data/UserData.java
View File

@@ -1,4 +1,4 @@
package io.spring.application.user;
package io.spring.application.data;
import lombok.AllArgsConstructor;
import lombok.Data;

25
src/main/java/io/spring/application/user/UserQueryService.java
View File

@@ -1,25 +0,0 @@
package io.spring.application.user;
import io.spring.application.JwtService;
import org.springframework.stereotype.Service;
@Service
public class UserQueryService {
private UserReadService userReadService;
private JwtService jwtService;
public UserQueryService(UserReadService userReadService, JwtService jwtService) {
this.userReadService = userReadService;
this.jwtService = jwtService;
}
public UserWithToken fetchNewAuthenticatedUser(String username) {
UserData userData = userReadService.findByUsername(username);
return new UserWithToken(userData, jwtService.toToken(userData));
}
public UserWithToken fetchCurrentUser(String username, String token) {
return new UserWithToken(userReadService.findByUsername(username), token);
}
}

2
src/main/java/io/spring/application/AuthorizationService.java → src/main/java/io/spring/core/service/AuthorizationService.java
View File

@@ -1,4 +1,4 @@
package io.spring.application;
package io.spring.core.service;
import io.spring.core.article.Article;
import io.spring.core.comment.Comment;

6
src/main/java/io/spring/application/JwtService.java → src/main/java/io/spring/core/service/JwtService.java
View File

@@ -1,13 +1,13 @@
package io.spring.application;
package io.spring.core.service;
import io.spring.application.user.UserData;
import io.spring.core.user.User;
import org.springframework.stereotype.Service;
import java.util.Optional;
@Service
public interface JwtService {
String toToken(UserData userData);
String toToken(User user);
Optional<String> getSubFromToken(String token);
}

2
src/main/java/io/spring/infrastructure/favorite/ArticleFavoriteMapper.java → src/main/java/io/spring/infrastructure/mybatis/mapper/ArticleFavoriteMapper.java
View File

@@ -1,4 +1,4 @@
package io.spring.infrastructure.favorite;
package io.spring.infrastructure.mybatis.mapper;
import io.spring.core.favorite.ArticleFavorite;
import org.apache.ibatis.annotations.Mapper;

2
src/main/java/io/spring/infrastructure/article/ArticleMapper.java → src/main/java/io/spring/infrastructure/mybatis/mapper/ArticleMapper.java
View File

@@ -1,4 +1,4 @@
package io.spring.infrastructure.article;
package io.spring.infrastructure.mybatis.mapper;
import io.spring.core.article.Article;
import io.spring.core.article.Tag;

2
src/main/java/io/spring/infrastructure/comment/CommentMapper.java → src/main/java/io/spring/infrastructure/mybatis/mapper/CommentMapper.java
View File

@@ -1,4 +1,4 @@
package io.spring.infrastructure.comment;
package io.spring.infrastructure.mybatis.mapper;
import io.spring.core.comment.Comment;
import org.apache.ibatis.annotations.Mapper;

2
src/main/java/io/spring/infrastructure/user/UserMapper.java → src/main/java/io/spring/infrastructure/mybatis/mapper/UserMapper.java
View File

@@ -1,4 +1,4 @@
package io.spring.infrastructure.user;
package io.spring.infrastructure.mybatis.mapper;
import io.spring.core.user.FollowRelation;
import io.spring.core.user.User;

3
src/main/java/io/spring/application/article/ArticleReadService.java → src/main/java/io/spring/infrastructure/mybatis/readservice/ArticleReadService.java
View File

@@ -1,6 +1,7 @@
package io.spring.application.article;
package io.spring.infrastructure.mybatis.readservice;
import io.spring.application.Page;
import io.spring.application.data.ArticleData;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Component;

3
src/main/java/io/spring/application/comment/CommentReadService.java → src/main/java/io/spring/infrastructure/mybatis/readservice/CommentReadService.java
View File

@@ -1,5 +1,6 @@
package io.spring.application.comment;
package io.spring.infrastructure.mybatis.readservice;
import io.spring.application.data.CommentData;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Component;

2
src/main/java/io/spring/application/tag/TagReadService.java → src/main/java/io/spring/infrastructure/mybatis/readservice/TagReadService.java
View File

@@ -1,4 +1,4 @@
package io.spring.application.tag;
package io.spring.infrastructure.mybatis.readservice;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Component;

5
src/main/java/io/spring/application/user/UserReadService.java → src/main/java/io/spring/infrastructure/mybatis/readservice/UserReadService.java
View File

@@ -1,5 +1,6 @@
package io.spring.application.user;
package io.spring.infrastructure.mybatis.readservice;
import io.spring.application.data.UserData;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Component;
@@ -9,5 +10,7 @@ import org.springframework.stereotype.Component;
public interface UserReadService {
UserData findByUsername(@Param("username") String username);
UserData findById(@Param("id") String id);
}

2
src/main/java/io/spring/application/profile/UserRelationshipQueryService.java → src/main/java/io/spring/infrastructure/mybatis/readservice/UserRelationshipQueryService.java
View File

@@ -1,4 +1,4 @@
package io.spring.application.profile;
package io.spring.infrastructure.mybatis.readservice;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

3
src/main/java/io/spring/infrastructure/favorite/MyBatisArticleFavoriteRepository.java → src/main/java/io/spring/infrastructure/repository/MyBatisArticleFavoriteRepository.java
View File

@@ -1,7 +1,8 @@
package io.spring.infrastructure.favorite;
package io.spring.infrastructure.repository;
import io.spring.core.favorite.ArticleFavorite;
import io.spring.core.favorite.ArticleFavoriteRepository;
import io.spring.infrastructure.mybatis.mapper.ArticleFavoriteMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;

3
src/main/java/io/spring/infrastructure/article/MyBatisArticleRepository.java → src/main/java/io/spring/infrastructure/repository/MyBatisArticleRepository.java
View File

@@ -1,8 +1,9 @@
package io.spring.infrastructure.article;
package io.spring.infrastructure.repository;
import io.spring.core.article.Article;
import io.spring.core.article.ArticleRepository;
import io.spring.core.article.Tag;
import io.spring.infrastructure.mybatis.mapper.ArticleMapper;
import org.springframework.stereotype.Repository;
import java.util.Optional;

3
src/main/java/io/spring/infrastructure/comment/MyBatisCommentRepository.java → src/main/java/io/spring/infrastructure/repository/MyBatisCommentRepository.java
View File

@@ -1,7 +1,8 @@
package io.spring.infrastructure.comment;
package io.spring.infrastructure.repository;
import io.spring.core.comment.Comment;
import io.spring.core.comment.CommentRepository;
import io.spring.infrastructure.mybatis.mapper.CommentMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

3
src/main/java/io/spring/infrastructure/user/MyBatisUserRepository.java → src/main/java/io/spring/infrastructure/repository/MyBatisUserRepository.java
View File

@@ -1,8 +1,9 @@
package io.spring.infrastructure.user;
package io.spring.infrastructure.repository;
import io.spring.core.user.FollowRelation;
import io.spring.core.user.User;
import io.spring.core.user.UserRepository;
import io.spring.infrastructure.mybatis.mapper.UserMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;

8
src/main/java/io/spring/infrastructure/service/DefaultJwtService.java
View File

@@ -4,8 +4,8 @@ import io.jsonwebtoken.Claims;
import io.jsonwebtoken.Jws;
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.SignatureAlgorithm;
import io.spring.application.JwtService;
import io.spring.application.user.UserData;
import io.spring.core.service.JwtService;
import io.spring.core.user.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
@@ -26,9 +26,9 @@ public class DefaultJwtService implements JwtService {
}
@Override
public String toToken(UserData userData) {
public String toToken(User user) {
return Jwts.builder()
.setSubject(userData.getId())
.setSubject(user.getId())
.setExpiration(expireTimeFromNow())
.signWith(SignatureAlgorithm.HS512, secret)
.compact();

2
src/main/resources/application.properties
View File

@@ -4,4 +4,4 @@ jwt.secret=nRvyYC4soFxBdZ-F-5Nnzz5USXstR1YylsTd-mA0aKtI9HUlriGrtkf-TiuDapkLiUCog
jwt.sessionTime=86400
mybatis.config-location=classpath:mybatis-config.xml
mybatis.mapper-locations=mapper/*.xml
logging.level.io.spring.application.article.ArticleReadService=DEBUG
logging.level.io.spring.infrastructure.mybatis.readservice.ArticleReadService=DEBUG

2
src/main/resources/mapper/ArticleFavoriteMapper.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="io.spring.infrastructure.favorite.ArticleFavoriteMapper">
<mapper namespace="io.spring.infrastructure.mybatis.mapper.ArticleFavoriteMapper">
<insert id="insert">
insert into article_favorites (article_id, user_id) values (#{articleFavorite.articleId}, #{articleFavorite.userId})
</insert>

4
src/main/resources/mapper/ArticleFavoritesQueryService.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="io.spring.application.article.ArticleFavoritesQueryService">
<mapper namespace="io.spring.application.ArticleFavoritesQueryService">
<select id="isUserFavorite" resultType="java.lang.Boolean">
select count(1) from article_favorites where user_id = #{userId} and article_id = #{articleId}
</select>
@@ -28,7 +28,7 @@
and AF.user_id = #{currentUser.id}
</select>
<resultMap id="favoriteCount" type="io.spring.application.article.ArticleFavoriteCount">
<resultMap id="favoriteCount" type="io.spring.application.ArticleFavoriteCount">
<id column="id" property="id"/>
<result column="favoriteCount" property="count"/>
</resultMap>

2
src/main/resources/mapper/ArticleMapper.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="io.spring.infrastructure.article.ArticleMapper">
<mapper namespace="io.spring.infrastructure.mybatis.mapper.ArticleMapper">
<insert id="insert">
insert into articles(id, slug, title, description, body, user_id, created_at, updated_at)
values(

7
src/main/resources/mapper/ArticleReadService.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="io.spring.application.article.ArticleReadService">
<mapper namespace="io.spring.infrastructure.mybatis.readservice.ArticleReadService">
<sql id="profileColumns">
U.id userId,
U.username userUsername,
@@ -81,6 +81,7 @@
<foreach index="index" collection="articleIds" item="id" open="(" separator="," close=")">
#{id}
</foreach>
order by A.created_at desc
</select>
<select id="findArticlesOfAuthors" resultMap="articleData">
<include refid="selectArticleData"/>
@@ -101,7 +102,7 @@
<id javaType="string" column="articleId"/>
</resultMap>
<resultMap id="articleData" type="io.spring.application.article.ArticleData">
<resultMap id="articleData" type="io.spring.application.data.ArticleData">
<id column="articleId" property="id"/>
<result column="articleSlug" property="slug"/>
<result column="articleTitle" property="title"/>
@@ -115,7 +116,7 @@
</collection>
</resultMap>
<resultMap id="profileData" type="io.spring.application.profile.ProfileData">
<resultMap id="profileData" type="io.spring.application.data.ProfileData">
<id column="userId" property="id"/>
<result column="userUsername" property="username"/>
<result column="userBio" property="bio"/>

2
src/main/resources/mapper/CommentMapper.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="io.spring.infrastructure.comment.CommentMapper">
<mapper namespace="io.spring.infrastructure.mybatis.mapper.CommentMapper">
<insert id="insert">
insert into comments(id, body, user_id, article_id, created_at, updated_at)
values (

8
src/main/resources/mapper/CommentReadService.xml
View File

@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="io.spring.application.comment.CommentReadService">
<mapper namespace="io.spring.infrastructure.mybatis.readservice.CommentReadService">
<sql id="selectCommentData">
SELECT
C.id commentId,
C.body commentBody,
C.created_at commentCreatedAt,
<include refid="io.spring.application.article.ArticleReadService.profileColumns"/>
<include refid="io.spring.infrastructure.mybatis.readservice.ArticleReadService.profileColumns"/>
from comments C
left join users U
on C.user_id = U.id
@@ -21,11 +21,11 @@
where C.article_id = #{articleId}
</select>
<resultMap id="commentData" type="io.spring.application.comment.CommentData">
<resultMap id="commentData" type="io.spring.application.data.CommentData">
<id column="commentId" property="id"/>
<result column="commentBody" property="body"/>
<result column="commentCreatedAt" property="createdAt"/>
<result column="commentCreatedAt" property="updatedAt"/>
<association property="profileData" resultMap="io.spring.application.article.ArticleReadService.profileData"/>
<association property="profileData" resultMap="io.spring.infrastructure.mybatis.readservice.ArticleReadService.profileData"/>
</resultMap>
</mapper>

2
src/main/resources/mapper/TagReadService.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="io.spring.application.tag.TagReadService">
<mapper namespace="io.spring.infrastructure.mybatis.readservice.TagReadService">
<select id="all" resultType="string">
select name from tags
</select>

2
src/main/resources/mapper/UserMapper.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="io.spring.infrastructure.user.UserMapper">
<mapper namespace="io.spring.infrastructure.mybatis.mapper.UserMapper">
<insert id="insert">
insert into users (id, username, email, password, bio, image) values(
#{user.id},

7
src/main/resources/mapper/UserReadService.xml
View File

@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="io.spring.application.user.UserReadService">
<select id="findByUsername" resultType="io.spring.application.user.UserData">
<mapper namespace="io.spring.infrastructure.mybatis.readservice.UserReadService">
<select id="findByUsername" resultType="io.spring.application.data.UserData">
select * from users where username = #{username}
</select>
<select id="findById" resultType="io.spring.application.data.UserData">
select * from users where id = #{id}
</select>
</mapper>

2
src/main/resources/mapper/UserRelationshipQueryService.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="io.spring.application.profile.UserRelationshipQueryService">
<mapper namespace="io.spring.infrastructure.mybatis.readservice.UserRelationshipQueryService">
<select id="isUserFollowing" resultType="java.lang.Boolean">
select count(1) from follows where user_id = #{userId} and follow_id = #{anotherUserId}
</select>