diff --git a/app/src/main/java/com/example/nemophila/TestActivity.java b/app/src/main/java/com/example/nemophila/TestActivity.java index 3b2af0b..bd60023 100644 --- a/app/src/main/java/com/example/nemophila/TestActivity.java +++ b/app/src/main/java/com/example/nemophila/TestActivity.java @@ -64,7 +64,7 @@ //accountViewModel.getAccount("1111"); break; case 2: - //postsViewModel.fetchPosts("1"); + postsViewModel.getShopPosts("2637a768-da49-40f9-bd48-a4f3aea64e28"); break; } } diff --git a/app/src/main/java/com/example/nemophila/entities/AccountJson.java b/app/src/main/java/com/example/nemophila/entities/AccountJson.java index 91d194c..012ae18 100644 --- a/app/src/main/java/com/example/nemophila/entities/AccountJson.java +++ b/app/src/main/java/com/example/nemophila/entities/AccountJson.java @@ -1,16 +1,23 @@ package com.example.nemophila.entities; public class AccountJson { + private int postsCount; private String name; private String id; private String token; //Getter + public int getPostsCount() { + return postsCount; + } public String getId() {return id;} public String getName() {return name;} public String getToken() {return token;} //Setter + public void setPostsCount(int postsCount) { + this.postsCount = postsCount; + } public void setName(String name) {this.name = name;} public void setId(String id) {this.id = id;} public void setToken(String token) {this.token = token;} diff --git a/app/src/main/java/com/example/nemophila/resources/AccountsRest.java b/app/src/main/java/com/example/nemophila/resources/AccountsRest.java index 81e0aa5..2da0430 100644 --- a/app/src/main/java/com/example/nemophila/resources/AccountsRest.java +++ b/app/src/main/java/com/example/nemophila/resources/AccountsRest.java @@ -62,5 +62,18 @@ @Field("name") String name, @Field("token") String token ); - + + @GET("accounts/{uid}/posts") + Call> getAccountPosts( + @Path("uid") String uid + ); + + @DELETE("shops/{sid}/posts/{uid}/{pid}") + Call deletePost( + @Path("sid") String sid, + + @Path("uid") String uid, + @Path("pid") String pid, + @Field("token") String token + ); } diff --git a/app/src/main/java/com/example/nemophila/viewmodels/PostsViewModel.java b/app/src/main/java/com/example/nemophila/viewmodels/PostsViewModel.java index 4614381..30199fe 100644 --- a/app/src/main/java/com/example/nemophila/viewmodels/PostsViewModel.java +++ b/app/src/main/java/com/example/nemophila/viewmodels/PostsViewModel.java @@ -34,7 +34,7 @@ this.accountPostsLiveData = new MutableLiveData<>(); this.shopPostsLiveData = new MutableLiveData<>(); this.retrofit = new Retrofit.Builder() - .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/Nemophila/") + .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/nemophila/") .addConverterFactory(JacksonConverterFactory.create()) .build(); this.postsRest = retrofit.create(PostsRest.class); @@ -93,8 +93,10 @@ //PostJsonからPostを作成し,それをLiveDataにセット public void getShopPosts(String sid) { + System.out.println("通信前" + postJson.get(0)); ArrayList posts = new ArrayList<>(); getShopPostJson(sid); + System.out.println("通信after" + postJson); for(PostJson pj: postJson) { Post post = new Post(pj); posts.add(post); @@ -121,6 +123,7 @@ @Override public void onFailure(Call> call, Throwable t) { System.out.println("networkError"); + System.out.println(t); //通信エラー } });