Skip to content
Open
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
19 changes: 14 additions & 5 deletions spring-data-jpa-2/initial/src/main/java/cholog/Author.java
Original file line number Diff line number Diff line change
@@ -1,17 +1,26 @@
package cholog;

import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.*;

import java.util.Set;

@Entity
public class Author {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

@OneToOne
private Person person;

@OneToMany(mappedBy = "author")
Set<BookAuthor> books;

// @ManyToMany(mappedBy = "authors")
// Set<Book> books;

public Author(Person person) {
this.person = person;
}

public Author() {
Expand All @@ -22,6 +31,6 @@ public Long getId() {
}

public Person getPerson() {
return null;
return person;
}
}
15 changes: 10 additions & 5 deletions spring-data-jpa-2/initial/src/main/java/cholog/Book.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
package cholog;

import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.*;

import java.util.Set;

Expand All @@ -14,11 +11,19 @@ public class Book {
private Long id;
private String name;

@ManyToOne
private Publisher publisher;

@OneToMany(mappedBy="book")
Set<BookAuthor> authors;

public Book() {

}

public Book(String name, Publisher publisher) {
this.name = name;
this.publisher = publisher;
}

public Long getId() {
Expand All @@ -30,7 +35,7 @@ public String getName() {
}

public Publisher getPublisher() {
return null;
return publisher;
}

public Set<Author> getAuthors() {
Expand Down
13 changes: 13 additions & 0 deletions spring-data-jpa-2/initial/src/main/java/cholog/BookAuthor.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
package cholog;

import jakarta.persistence.*;

@Entity
public class BookAuthor {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

@ManyToOne
private Book book;

@ManyToOne
private Author author;

public BookAuthor(Book book, Author author) {

}
Expand Down
10 changes: 5 additions & 5 deletions spring-data-jpa-2/initial/src/main/java/cholog/Person.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
package cholog;

import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.*;

@Entity
public class Person {
Expand All @@ -12,6 +9,9 @@ public class Person {
private Long id;
private String name;

@OneToOne(mappedBy = "person")
private Author author;

public Person() {

}
Expand All @@ -29,6 +29,6 @@ public String getName() {
}

public Author getAuthor() {
return null;
return author;
}
}
13 changes: 8 additions & 5 deletions spring-data-jpa-2/initial/src/main/java/cholog/Publisher.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
package cholog;

import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.*;

import java.util.Set;

Expand All @@ -14,6 +11,12 @@ public class Publisher {
private Long id;
private String name;

@OneToMany(mappedBy="publisher")
Set<Book> books;

@ManyToOne
Publisher publisher;

public Publisher(String name) {
this.name = name;
}
Expand All @@ -34,6 +37,6 @@ public void addBook(Book book) {
}

public Set<Book> getBooks() {
return null;
return books;
}
}
23 changes: 19 additions & 4 deletions spring-mvc-1/initial/src/main/java/cholog/MemberController.java
Original file line number Diff line number Diff line change
@@ -1,18 +1,33 @@
package cholog;

import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;

@Controller
public class MemberController {

public String world() {
@GetMapping("/hello")
public String world(@RequestParam(name = "name", required = false) String name, Model model) {
// TODO: /hello 요청 시 resources/templates/static.html 페이지가 응답할 수 있도록 설정하세요.
// TODO: 쿼리 파라미터로 name 요청이 들어왔을 때 해당 값을 hello.html에서 사용할 수 있도록 하세요.
return null;
if (name == null){
// 쿼리 파라미터가 없는 경우
return "static";
} else {
// 쿼리 파라미터가 있는 경우.
model.addAttribute("name", name);
return "hello";
}


}

@GetMapping("/json")
@ResponseBody
public Person json() {
// TODO: /json 요청 시 {"name": "brown", "age": 20} 데이터를 응답할 수 있도록 설정하세요.
return null;
return new Person("brown", 20);
}
}
26 changes: 13 additions & 13 deletions spring-mvc-2/initial/src/main/java/cholog/MemberController.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@
import java.util.List;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicLong;

import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.*;

@Controller
public class MemberController {
Expand All @@ -19,41 +18,42 @@ public class MemberController {
private final AtomicLong index = new AtomicLong(1);

@PostMapping("/members")
public ResponseEntity<Void> create() {
public ResponseEntity<Void> create(@RequestBody Member member) {
// TODO: member 정보를 받아서 생성한다.
Member newMember = Member.toEntity(null, index.getAndIncrement());
Member newMember = Member.toEntity(member, index.getAndIncrement());
members.add(newMember);
return ResponseEntity.created(URI.create("/members/" + newMember.getId())).build();
}

@GetMapping("/members")
public ResponseEntity<List<Member>> read() {
// TODO: 저장된 모든 member 정보를 반환한다.
return null;
return new ResponseEntity<>(members, HttpStatus.OK);
}

@PutMapping("/members/{id}")
public ResponseEntity<Void> update() {
public ResponseEntity<Void> update(@PathVariable Long id, @RequestBody Member newMember) {
// TODO: member의 수정 정보와 url 상의 id 정보를 받아 member 정보를 수정한다.
Member member = members.stream()
.filter(it -> Objects.equals(it.getId(), null))
.filter(it -> Objects.equals(it.getId(), id))
.findFirst()
.orElseThrow(RuntimeException::new);

member.update(null);
member.update(newMember);
//return new ResponseEntity<>(null, HttpStatus.NO_CONTENT); 이건 왜 안되는지?
return null;
}

@DeleteMapping("/members/{id}")
public ResponseEntity<Void> delete() {
public ResponseEntity<Void> delete(@PathVariable Long id) {
// TODO: url 상의 id 정보를 받아 member를 삭제한다.
Member member = members.stream()
.filter(it -> Objects.equals(it.getId(), null))
.filter(it -> Objects.equals(it.getId(), id))
.findFirst()
.orElseThrow(RuntimeException::new);

members.remove(member);

return null;
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
}