merged develop

docker/pg/1-createTable.sql

@@ -15,16 +15,16 @@ create table sample (
 create table friend (
   id serial primary key,
   userid INTEGER not null,
-  friendid INTEGER not null,
   name varchar(30) not null,
-  latestemolog varchar(30)
+  latestemolog varchar(30),
+  updated_at timestamp
 );
 
 create table emolog (
   id serial primary key,
   userid INTEGER not null,
   friendid INTEGER not null,
-  create_at timestamp,
+  created_at timestamp,
   contents varchar(30)
 );
 
@@ -66,4 +66,5 @@ insert into emolog(userid, friendid, create_at, contents) values
  (2, 1, current_timestamp, ':hotel:'),
  (1, 3, current_timestamp, ':gorilla:'),
  (3, 1, current_timestamp, ':space:')
-;
+;
+

src/main/java/com/example/demo/controller/FriendController.java

@@ -0,0 +1,31 @@
+package com.example.demo.controller;
+
+import com.example.demo.entity.Friend;
+import com.example.demo.service.FriendService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+
+@Controller
+@RequestMapping(path = "/friendlist")
+public class FriendController {
+
+    @Autowired
+    FriendService service;
+
+    @RequestMapping(value="/{userid}",method=RequestMethod.GET)
+    public String selectAll(@PathVariable("userid") String userid, Model model) {
+        int userId = Integer.parseInt(userid);
+        List<Friend> friends = service.selectAll(userId);
+        model.addAttribute("friends", friends);
+        return "friendlist.html";
+    }
+
+}

src/main/java/com/example/demo/dao/FriendDao.java

@@ -0,0 +1,17 @@
+package com.example.demo.dao;
+
+import com.example.demo.entity.Emolog;
+import com.example.demo.entity.Friend;
+import org.seasar.doma.Dao;
+import org.seasar.doma.Select;
+import org.seasar.doma.boot.ConfigAutowireable;
+
+import java.util.List;
+
+@Dao
+@ConfigAutowireable
+public interface FriendDao {
+
+    @Select
+    List<Friend> selectAll(int userid);
+}

src/main/java/com/example/demo/entity/Emolog.java

@@ -9,7 +9,6 @@
 import org.seasar.doma.GeneratedValue;
 import org.seasar.doma.GenerationType;
 import org.seasar.doma.Id;
-import org.springframework.format.datetime.standard.DateTimeContext;
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.NotNull;
@@ -31,18 +30,16 @@ public class Emolog implements Serializable {
     private Integer id;
 
     @NotNull
-    @Size(min=30)
-    private String userid;
+    @Size(max=30)
+    private Integer userid;
 
     @NotNull
-    @Size(min=50)
-    private String friendid;
-
-    private LocalDateTime create_at;
+    @Size(max=50)
+    private Integer friendid;
 
     @NotNull
     @Max(40)
-    private String contents;
-
+    private String latestemolog;
 
+    private LocalDateTime create_at;
 }

src/main/java/com/example/demo/entity/Friend.java

@@ -0,0 +1,47 @@
+package com.example.demo.entity;
+
+
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import org.seasar.doma.Entity;
+import org.seasar.doma.GeneratedValue;
+import org.seasar.doma.GenerationType;
+import org.seasar.doma.Id;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+@Entity
+@Data
+@Getter
+@Setter
+public class Friend implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    @NotNull
+    @Size(max=30)
+    private Integer userid;
+
+    @NotNull
+    @Size(max=30)
+    private String name;
+
+    @Max(30)
+    private String latestemolog;
+
+    private LocalDateTime updated_at;
+
+
+
+}

src/main/java/com/example/demo/repository/FriendRepository.java

@@ -0,0 +1,19 @@
+package com.example.demo.repository;
+
+import com.example.demo.dao.FriendDao;
+import com.example.demo.entity.Friend;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public class FriendRepository {
+
+    @Autowired
+    FriendDao dao;
+
+    public List<Friend> selectAll(int user) { // (4)
+        return dao.selectAll(user);
+    }
+}

src/main/java/com/example/demo/service/FriendService.java

@@ -0,0 +1,19 @@
+package com.example.demo.service;
+
+import com.example.demo.entity.Friend;
+import com.example.demo.repository.FriendRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class FriendService {
+
+    @Autowired
+    FriendRepository repository;
+
+    public List<Friend> selectAll(int user){
+        return repository.selectAll(user);
+    }
+}

src/main/resources/META-INF/com/example/demo/dao/FriendDao/selectAll.sql

@@ -0,0 +1,4 @@
+select *
+from friend
+where userid = /* userid */1
+order by updated_at