fix: WorkDataをSwaggerのSchemaと同じものに変更

Funcy-ICT · Oct 10, 2023 · ad52379 · ad52379
1 parent b3d5913
commit ad52379
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 9 deletions.
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -34,6 +34,7 @@ android {
     buildFeatures {
         dataBinding true
     }
+    namespace 'com.example.funcy_portfolio_android'
 }
 
 dependencies {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.funcy_portfolio_android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 

diff --git a/app/src/main/java/com/example/funcy_portfolio_android/model/data/WorkData.kt b/app/src/main/java/com/example/funcy_portfolio_android/model/data/WorkData.kt
@@ -3,18 +3,22 @@ package com.example.funcy_portfolio_android.model.data
 data class WorkData(
     val title: String,
     val description: String,
+    val thumbnail: String,
+    val user_icon: String,
+    val user_name: String,
+    val userID: String,
     val images: List<ImageData>,
-    val URL: String,
+    val work_url: String,
     val movie_url: String,
     val tags: List<TagData>,
-    val group: String?,
+    val group: String,
     val security: Int,
 )
 
 data class ImageData(
-    val Image: String
+    val image: String
 )
 
 data class TagData(
-    val Tag: String
+    val tag: String
 )
diff --git a/...rc/main/java/com/example/funcy_portfolio_android/ui/workRegister/WorkRegisterViewModel.kt b/...rc/main/java/com/example/funcy_portfolio_android/ui/workRegister/WorkRegisterViewModel.kt
@@ -80,19 +80,27 @@ class WorkRegisterViewModel : ViewModel() {
         description: String,
         security: Int,
         work_url: String,
-        youtube_url: String
+        youtube_url: String,
+        group: String,
+        user_icon: String,
+        user_name: String,
+        userID: String
     ): String? {
         viewModelScope.launch {
             val postTagList = stringTagListToTagList(tags)
             res = workRepository.registerWork(
                 WorkData(
                     title,
                     description,
+                    thumbnail,
+                    user_icon,
+                    user_name,
+                    userID,
                     listOf(ImageData("")),
                     work_url,
                     youtube_url,
                     postTagList,
-                    null,
+                    group,
                     security
                 )
             )