diff --git a/.idea/misc.xml b/.idea/misc.xml
index a187139..846a4e8 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -13,24 +13,21 @@
-
-
-
-
+
+
-
-
+
-
+
diff --git a/app/src/main/java/com/example/nemophila/TestActivity.java b/app/src/main/java/com/example/nemophila/TestActivity.java
index 0fe08d0..d0cc268 100644
--- a/app/src/main/java/com/example/nemophila/TestActivity.java
+++ b/app/src/main/java/com/example/nemophila/TestActivity.java
@@ -12,6 +12,7 @@
import android.widget.Spinner;
import com.example.nemophila.viewmodels.AccountViewModel;
+import com.example.nemophila.viewmodels.FriendViewModel;
import com.example.nemophila.viewmodels.PostsViewModel;
import com.example.nemophila.viewmodels.ShopsViewModel;
@@ -30,10 +31,11 @@
ShopsViewModel shopsViewModel = new ViewModelProvider(this).get(ShopsViewModel.class);
AccountViewModel accountViewModel = new ViewModelProvider(this).get(AccountViewModel.class);
PostsViewModel postsViewModel = new ViewModelProvider(this).get(PostsViewModel.class);
+ FriendViewModel friendViewModel = new ViewModelProvider(this).get(FriendViewModel.class);
//テスト用のspinner
Spinner spinner = findViewById(R.id.testspinner);
- String[] spinnerItems = {"ShopsViewModel", "AccountViewModel", "PostsViewModel"}; //ここに名前を追加
+ String[] spinnerItems = {"ShopsViewModel", "AccountViewModel", "PostsViewModel", "FriendsViewModel"}; //ここに名前を追加
ArrayAdapter adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, spinnerItems);
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
spinner.setAdapter(adapter);
@@ -65,8 +67,9 @@
case 2:
postsViewModel.createPost("1114", "dbfd3740-8dcc-4b9c-b3b0-42c908da1c65", "151347fa-2c90-44d7-ba48-f23f475b910d", 1,
"和食", "辛いね", "", "", "");
-// postsViewModel.loadShopPost("151347fa-2c90-44d7-ba48-f23f475b910d");
break;
+ case 3:
+ friendViewModel.putRequesting("1111", "1112", "a95d68cc-4efb-49e2-8f55-799f768a5c09");
}
}
});
diff --git a/app/src/main/java/com/example/nemophila/resources/FriendsRest.java b/app/src/main/java/com/example/nemophila/resources/FriendsRest.java
index 52b4fbf..d590f56 100644
--- a/app/src/main/java/com/example/nemophila/resources/FriendsRest.java
+++ b/app/src/main/java/com/example/nemophila/resources/FriendsRest.java
@@ -40,7 +40,7 @@
);
@FormUrlEncoded
- @PUT("accounts/{uid}/reqesting/{requesting_id}")
+ @PUT("accounts/{uid}/requesting/{requesting_id}")
Call putRequesting(
@Path("uid") String uid,
@Path("requesting_id") String requesting_id,
@@ -48,20 +48,20 @@
);
@FormUrlEncoded
- @DELETE("accounts/{uid}/reqesting/{requesting_id}")
+ @DELETE("accounts/{uid}/requesting/{requesting_id}")
Call deleteRequesting(
@Path("uid") String uid,
@Path("requesting_id") String requesting_id,
@Field("token") String token
);
- @GET("accounts/{uid}/reqested")
+ @GET("accounts/{uid}/requested")
Call> getRequested(
@Path("uid") String uid
);
@FormUrlEncoded
- @DELETE("accounts/{uid}/reqested/{reqested_id}")
+ @DELETE("accounts/{uid}/requested/{requested_id}")
Call deleteRequested(
@Path("uid") String uid,
@Path("requested_id") String requested_id,
diff --git a/app/src/main/java/com/example/nemophila/viewmodels/FriendViewModel.java b/app/src/main/java/com/example/nemophila/viewmodels/FriendViewModel.java
index 2c79201..5d10a01 100644
--- a/app/src/main/java/com/example/nemophila/viewmodels/FriendViewModel.java
+++ b/app/src/main/java/com/example/nemophila/viewmodels/FriendViewModel.java
@@ -132,7 +132,7 @@
if (response.isSuccessful()) {
System.out.println("Successful");
} else {
- System.out.println("ResponseError");
+ System.out.println("ResponseError" + response.code());
}
}
@Override