Skip to content
Merged

Koko #13

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
8 changes: 2 additions & 6 deletions src/main/java/kr/co/catdog/CatdogApplication.java
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
package kr.co.catdog;

import org.json.simple.JSONObject;

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
import org.springframework.web.client.RestTemplate;


import java.util.Map;

Expand Down
16 changes: 16 additions & 0 deletions src/main/java/kr/co/catdog/controller/AccountController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package kr.co.catdog.controller;

import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;

@Controller
public class AccountController {
@GetMapping("/login")
String login() {
return "sign-in";
}
@GetMapping("/signup")
String signup(){
return "sign-up";
}
}
13 changes: 13 additions & 0 deletions src/main/java/kr/co/catdog/controller/UserController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package kr.co.catdog.controller;

import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;

@Controller
@Slf4j
public class UserController {


}
21 changes: 21 additions & 0 deletions src/main/java/kr/co/catdog/domain/UserVO.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package kr.co.catdog.domain;

import lombok.*;

import java.time.LocalDate;

@NoArgsConstructor
@AllArgsConstructor
@Getter
@ToString
@Builder

public class UserVO {
String user_id;
String user_pw;
String user_name;
String user_phoneNumber;
LocalDate user_regdate;
String user_image;
Boolean user_matchinguse;
}
23 changes: 23 additions & 0 deletions src/main/java/kr/co/catdog/dto/UserDTO.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package kr.co.catdog.dto;

import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.time.LocalDate;

@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class UserDTO {
String user_id;
String user_pw;
String user_name;
String user_phoneNumber;
LocalDate user_regdate;
String user_image;
int user_matchinguse;

}
22 changes: 22 additions & 0 deletions src/main/java/kr/co/catdog/mapper/UserMapper.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package kr.co.catdog.mapper;

import kr.co.catdog.domain.UserVO;
import org.apache.catalina.User;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.ResultMap;

@Mapper
public interface UserMapper {


UserVO selectOne(UserVO userVO);


int insert(UserVO userVO);

int update(UserVO userVO);

int delete(UserVO userVO);


}
4 changes: 2 additions & 2 deletions src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ mybatis.type-aliases-package=kr.co.catdog
mybatis.mapper-locations= mybatis/mapper/*.xml
mybatis.configuration.jdbc-type-for-null=null

logging.level.org.springframework=debug
logging.level.org.springframework.web=debug
logging.level.org.springframework=warn
logging.level.org.springframework.web=warn
34 changes: 34 additions & 0 deletions src/main/resources/mybatis/mapper/UserMapper.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?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="kr.co.catdog.mapper.UserMapper">

<resultMap id="userMap" type="UserVO">
<result property="user_id" column="user_id"/>
<result property="user_pw" column="user_pw"/>
<result property="user_name" column="user_name"/>
<result property="user_phoneNumber" column="user_phoneNumber"/>
<result property="user_image" column="user_image"/>
<result property="user_matchinguse" column="user_matchinguse"/>
</resultMap>

<select id="selectOne" resultMap="userMap">
SELECT * FROM user WHERE user_id = #{user_id}
</select>

<insert id="insert">
INSERT INTO (user_id, user_pw, user_name, user_phoneNumber, user_image, user_matchinguse)
VALUES (#{user_id}, #{user_pw}, #{user_name}, #{user_phoneNumber}, #{user_image}, #{user_matchinguse})
</insert>

<update id="update">
UPDATE user
SET user_pw = #{user_pw},user_name= #{user_name}, user_phoneNumber=#{user_phoneNumber}, user_image= #{user_image}, user_matchinguse=#{user_matchinguse}
WHERE user_id= #{user_id}
</update>

<delete id="delete">
DELETE FROM user WHERE user_id= #{user_id}
</delete>
</mapper>
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ <h3 class="font-weight-bolder jh-pink-title text-gradient">Welcome back</h3>
<div class="card-footer text-center pt-0 px-lg-2 px-1">
<p class="mb-4 text-sm mx-auto">
Don't have an account?
<a href="javascript:;" class="jh-pink-title text-gradient font-weight-bold">Sign up</a>
<a href="/signup" class="jh-pink-title text-gradient font-weight-bold">Sign up</a>
</p>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ <h3 class="font-weight-bolder jh-pink-title text-gradient">Join us today</h3>
<div class="card-footer text-center pt-0 px-sm-4 px-1">
<p class="mb-4 mx-auto">
Already have an account?
<a href="javascrpt:;" class="jh-pink-title text-gradient font-weight-bold">Sign in</a>
<a th:href="@{/login}" class="jh-pink-title text-gradient font-weight-bold">Sign in</a>
</p>
</div>
</div>
Expand Down
42 changes: 42 additions & 0 deletions src/test/java/kr/co/catdog/mapper/UserMapperTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package kr.co.catdog.mapper;

import groovy.util.logging.Slf4j;
import kr.co.catdog.domain.UserVO;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;

import static org.junit.jupiter.api.Assertions.*;
@SpringBootTest
@Slf4j
class UserMapperTest {
@Autowired
UserMapper userMapper;
@Test
void selectOne() {
}

@Test
void insert() {
UserVO userVO = UserVO.builder()
.user_id("asdf")
.user_pw("1233")
.user_name("지현")
.user_image("asdf")
.user_matchinguse(true)
.user_phoneNumber("012121515")
.build();

userMapper.insert(userVO);

}

@Test
void update() {
}

@Test
void delete() {
}
}