diff --git a/app/src/main/java/com/example/citrusclient/models/BookModel.java b/app/src/main/java/com/example/citrusclient/models/BookModel.java index 317b57d..2e121f9 100644 --- a/app/src/main/java/com/example/citrusclient/models/BookModel.java +++ b/app/src/main/java/com/example/citrusclient/models/BookModel.java @@ -2,33 +2,67 @@ public class BookModel { - private Account account; - private Book book; + private int bookId; + private String title; + private boolean publicity; + private String color; + private String time; + private String accountColor; + private int favoriteCount; - public BookModel(){} - - public BookModel(Account ac, Book bk) { - account = ac; - book = bk; - } - public Account getAccount() { - return account; + public int getBookId() { + return bookId; } - public void setAccount(Account account) { - this.account = account; + public void setBookId(int bookId) { + this.bookId = bookId; } - public Book getBook() { - return book; + public String getTitle() { + return title; } - public void setBook(Book book) { - this.book = book; + public void setTitle(String title) { + this.title = title; } + public boolean isPublicity() { + return publicity; + } + public void setPublicity(boolean publicity) { + this.publicity = publicity; + } + public String getColor() { + return color; + } + public void setColor(String color) { + this.color = color; + } + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + + public String getAccountColor() { + return accountColor; + } + + public void setAccountColor(String accountColor) { + this.accountColor = accountColor; + } + + public int getFavoriteCount() { + return favoriteCount; + } + + public void setFavoriteCount(int favoriteCount) { + this.favoriteCount = favoriteCount; + } } diff --git a/app/src/main/java/com/example/citrusclient/rest/FavoritesRest.java b/app/src/main/java/com/example/citrusclient/rest/FavoritesRest.java index cffd5df..46a31f7 100644 --- a/app/src/main/java/com/example/citrusclient/rest/FavoritesRest.java +++ b/app/src/main/java/com/example/citrusclient/rest/FavoritesRest.java @@ -1,9 +1,11 @@ package com.example.citrusclient.rest; import com.example.citrusclient.models.Book; +import com.example.citrusclient.models.BookModel; import java.util.HashMap; import java.util.HashSet; +import java.util.List; import retrofit2.Call; import retrofit2.http.DELETE; @@ -18,7 +20,7 @@ //主{account_id}がいいねした本の一覧 @GET("accounts/{account_id}/favorites") - Call>> getFavoritesBooks( + Call> getFavoritesBooks( @Path("account_id") String accountId, @Query("token") String token ); diff --git a/app/src/main/java/com/example/citrusclient/viewmodels/FavoritesViewModel.java b/app/src/main/java/com/example/citrusclient/viewmodels/FavoritesViewModel.java index 2812549..6a172b7 100644 --- a/app/src/main/java/com/example/citrusclient/viewmodels/FavoritesViewModel.java +++ b/app/src/main/java/com/example/citrusclient/viewmodels/FavoritesViewModel.java @@ -1,10 +1,14 @@ package com.example.citrusclient.viewmodels; import com.example.citrusclient.models.Book; +import com.example.citrusclient.models.BookModel; import com.example.citrusclient.rest.FavoritesRest; +import java.lang.reflect.Array; +import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; +import java.util.List; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; @@ -18,10 +22,11 @@ private final Retrofit retrofit; private final FavoritesRest favoritesRest; - private final MutableLiveData>> favoritesBooksLiveData; + private final MutableLiveData> favoritesBooksLiveData; private final MutableLiveData> favoritesBookIdLiveData; private final MutableLiveData> favoritedAccountsLiveData; + public FavoritesViewModel(){ this.retrofit = new Retrofit.Builder() .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/citrus/") @@ -32,16 +37,15 @@ this.favoritesBookIdLiveData = new MutableLiveData<>(); this.favoritedAccountsLiveData = new MutableLiveData<>(); } - public MutableLiveData>> getFavoritesBooksLiveData(){return favoritesBooksLiveData;} + public MutableLiveData> getFavoritesBooksLiveData(){return favoritesBooksLiveData;} public MutableLiveData> getFavoritesBookIdLiveData(){return favoritesBookIdLiveData;} - public MutableLiveData> getFavoritedAccountsLiveData(){return favoritedAccountsLiveData;} + public MutableLiveData> getFavoritedAccountsLiveData(){return favoritedAccountsLiveData} - //対応型変更 public void loadFavoritesBooks(String accountId, String token){ - Call>> call = favoritesRest.getFavoritesBooks(accountId,token); - call.enqueue(new Callback>>() { + Call> call = favoritesRest.getFavoritesBooks(accountId,token); + call.enqueue(new Callback>() { @Override - public void onResponse(Call>> call, Response>> response) { + public void onResponse(Call> call, Response> response) { if(response.isSuccessful()){ System.out.println("success : getFavoritesBooks"); favoritesBooksLiveData.setValue(response.body()); @@ -49,7 +53,7 @@ } @Override - public void onFailure(Call>> call, Throwable t) { + public void onFailure(Call> call, Throwable t) { System.out.println("NetworkError : getFavoritesBooks" + t); } });