From 4a873ffd39486d540bc6459eb4243d4c88e26f29 Mon Sep 17 00:00:00 2001
From: nemukemo <hiroaka201432@gmail.com>
Date: Wed, 26 Jun 2024 16:30:37 +0900
Subject: [PATCH 1/2] =?UTF-8?q?room=E3=81=ABclassId=E3=83=95=E3=82=A3?=
 =?UTF-8?q?=E3=83=BC=E3=83=AB=E3=83=89=E3=81=AE=E8=BF=BD=E5=8A=A0=E3=80=81?=
 =?UTF-8?q?=20firestore=E3=81=8CclassId=E3=82=92=E5=9F=BA=E6=BA=96?=
 =?UTF-8?q?=E3=81=AB=E5=8F=97=E3=81=91=E5=8F=96=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4=E3=80=81=20FirestoreReception?=
 =?UTF-8?q?=E3=82=92=E5=91=BC=E3=81=B3=E5=87=BA=E3=81=99=E3=82=BF=E3=82=A4?=
 =?UTF-8?q?=E3=83=9F=E3=83=B3=E3=82=B0=E3=82=92=E4=BB=96=E3=81=AE=E3=82=A2?=
 =?UTF-8?q?=E3=82=AF=E3=83=86=E3=82=A3=E3=83=93=E3=83=86=E3=82=A3=E3=81=8B?=
 =?UTF-8?q?=E3=82=89=E6=88=BB=E3=81=A3=E3=81=A6=E3=81=8D=E3=81=9F=E3=82=BF?=
 =?UTF-8?q?=E3=82=A4=E3=83=9F=E3=83=B3=E3=82=B0=E3=81=AB=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                              |  1 +
 .../java/com/example/oplogy/AppDatabase.java  |  2 +-
 .../java/com/example/oplogy/CreateUUID.java   | 10 ++++---
 .../example/oplogy/FirestoreReception.java    |  1 +
 .../java/com/example/oplogy/MainActivity.java | 26 +++++++++++++------
 .../com/example/oplogy/SetUpActivity.java     |  7 ++++-
 .../java/com/example/oplogy/SetUpTable.java   |  6 +++--
 .../com/example/oplogy/SetUpTableDao.java     |  3 +++
 8 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 0897082..360b82e 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,6 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="GRADLE" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
diff --git a/app/src/main/java/com/example/oplogy/AppDatabase.java b/app/src/main/java/com/example/oplogy/AppDatabase.java
index 8d655f3..c52259d 100644
--- a/app/src/main/java/com/example/oplogy/AppDatabase.java
+++ b/app/src/main/java/com/example/oplogy/AppDatabase.java
@@ -3,7 +3,7 @@ package com.example.oplogy;
 import androidx.room.Database;
 import androidx.room.RoomDatabase;
 
-@Database(entities = {SetUpTable.class}, version = 2)
+@Database(entities = {SetUpTable.class}, version = 2, exportSchema = false)
 public abstract class AppDatabase extends RoomDatabase {
     // データベースにアクセスするためのメソッドを提供する
     public abstract SetUpTableDao setUpTableDao();
diff --git a/app/src/main/java/com/example/oplogy/CreateUUID.java b/app/src/main/java/com/example/oplogy/CreateUUID.java
index e246aab..f61e643 100644
--- a/app/src/main/java/com/example/oplogy/CreateUUID.java
+++ b/app/src/main/java/com/example/oplogy/CreateUUID.java
@@ -5,12 +5,12 @@ import java.util.List;
 
 public class CreateUUID {
 
-    public static String generateUUID(List<String> classIdList ){
+    public static int generateUUID(List<String> classIdList ){
         while (true){
-            String uuid = String.valueOf((int)(Math.random()*100000));
+            String uuid = String.valueOf((int)(Math.random() * 1000000));
             boolean isDuplicate = false;
             for(String classId : classIdList){
-                if(Integer.parseInt(classId) == Integer.parseInt(uuid)){
+                if(classId.equals(uuid)){
                     //重複があればフラグを立て、ループを抜ける
                     isDuplicate = true;
                     break;
@@ -19,7 +19,9 @@ public class CreateUUID {
             //重複がなければ生成したUUIDを返す
             if (!isDuplicate) {
                 //firestoreに挿入処理
-                return uuid;
+                //テスト用
+                uuid="100";
+                return Integer.parseInt(uuid);
             }
         }
     }
diff --git a/app/src/main/java/com/example/oplogy/FirestoreReception.java b/app/src/main/java/com/example/oplogy/FirestoreReception.java
index b7d8581..a9481eb 100644
--- a/app/src/main/java/com/example/oplogy/FirestoreReception.java
+++ b/app/src/main/java/com/example/oplogy/FirestoreReception.java
@@ -28,6 +28,7 @@ public class FirestoreReception {
 
     //ClassIdを引数にデータの作成を行う
     public void getDocumentsByClassId(int classId) {
+        myDataList.clear();
         CollectionReference collectionRef = db.collection("QuestionnaireForms");
 
         // classIdが引数のものを取得する
diff --git a/app/src/main/java/com/example/oplogy/MainActivity.java b/app/src/main/java/com/example/oplogy/MainActivity.java
index 5783546..689cffe 100644
--- a/app/src/main/java/com/example/oplogy/MainActivity.java
+++ b/app/src/main/java/com/example/oplogy/MainActivity.java
@@ -84,12 +84,6 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         db = FirebaseFirestore.getInstance();
         firestoreReception = new FirestoreReception();
 
-        //TODO:3.classIdをmainアクティビティで取得する手段を作る
-        //4.以上のことを実装するためにユーザーにid作成、setupをすることを促すような制限をかける
-        if(classId!=100000){
-            firestoreReception.getDocumentsByClassId(classId);
-        }
-
     }
 
 
@@ -109,6 +103,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         if(view == setUp){
             imageSetup.setImageResource(R.drawable.ischecked_uuid);
             Intent toSetup = new Intent(MainActivity.this,SetUpActivity.class);
+            toSetup.putExtra("classId", classId);
             startActivity(toSetup);
             finish();   // 画面遷移後元の状態に戻す
         }
@@ -156,7 +151,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         builder.setPositiveButton("Yes", new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
-                String classId = CreateUUID.generateUUID(classIdList);
+                classId = CreateUUID.generateUUID(classIdList);
                 Toast.makeText(MainActivity.this, "クラスID: " + classId, Toast.LENGTH_SHORT).show();
                 Log .d("classIdList", classIdList.toString());
 
@@ -292,4 +287,19 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         }
     }
 
-}
\ No newline at end of file
+    @Override
+    protected void onResume(){
+        super.onResume();
+        //roomからclassIdを取得
+        ExecutorService executor = Executors.newSingleThreadExecutor();
+        executor.execute(() -> {
+            AppDatabase db = Room.databaseBuilder(getApplicationContext(), AppDatabase.class, "SetUpTable").build();
+            SetUpTableDao setUpTableDao = db.setUpTableDao();
+            classId = setUpTableDao.getClassId();
+        });
+        if (classId != 100000 ) {
+            firestoreReception.getDocumentsByClassId(classId);
+        }
+    }
+}
+
diff --git a/app/src/main/java/com/example/oplogy/SetUpActivity.java b/app/src/main/java/com/example/oplogy/SetUpActivity.java
index 8b3385d..851d0f1 100644
--- a/app/src/main/java/com/example/oplogy/SetUpActivity.java
+++ b/app/src/main/java/com/example/oplogy/SetUpActivity.java
@@ -50,6 +50,8 @@ public class SetUpActivity extends FragmentActivity
 
 
 
+
+
     Button startTimeSetButton;
     Button endTimeSetButton;
 
@@ -61,6 +63,8 @@ public class SetUpActivity extends FragmentActivity
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_set_up);
 
+        int classId= getIntent().getIntExtra("classId", 100000);
+
         setTeacherName = findViewById(R.id.teacherName);                    //先生の名前
         setStartPoint = findViewById(R.id.startPoint);                      //開始地点
 
@@ -139,7 +143,8 @@ public class SetUpActivity extends FragmentActivity
                         intervalTime,
                         startBreakTime,
                         endBreakTime,
-                        totalStudent
+                        totalStudent,
+                        classId
                 );
 
                 // 同じ名前のエントリが存在するかどうかを確認
diff --git a/app/src/main/java/com/example/oplogy/SetUpTable.java b/app/src/main/java/com/example/oplogy/SetUpTable.java
index a61ed27..e6d986e 100644
--- a/app/src/main/java/com/example/oplogy/SetUpTable.java
+++ b/app/src/main/java/com/example/oplogy/SetUpTable.java
@@ -16,12 +16,13 @@ public class SetUpTable {
     public String endBreakTime;
     public int totalStudent;
 
-    //TODO: ここのコードをあとで実装する。roomにString classIdの作成
+    //TODO: ここのコードをあとで実装する。roomにint classIdの作成
+    int classId;
 
 
     //コンストラクタ
     public SetUpTable(String teacherName, String startPoint, String startTime, String endTime,
-                        String intervalTime, String startBreakTime, String endBreakTime, int totalStudent) {
+                        String intervalTime, String startBreakTime, String endBreakTime, int totalStudent,int classId) {
         this.teacherName = teacherName;
         this.startPoint = startPoint;
         this.startTime = startTime;
@@ -30,6 +31,7 @@ public class SetUpTable {
         this.startBreakTime = startBreakTime;
         this.endBreakTime = endBreakTime;
         this.totalStudent = totalStudent;
+        this.classId = classId;
     }
     //getter
     public int getId() {
diff --git a/app/src/main/java/com/example/oplogy/SetUpTableDao.java b/app/src/main/java/com/example/oplogy/SetUpTableDao.java
index c5269e0..fcc4efd 100644
--- a/app/src/main/java/com/example/oplogy/SetUpTableDao.java
+++ b/app/src/main/java/com/example/oplogy/SetUpTableDao.java
@@ -39,4 +39,7 @@ public interface SetUpTableDao {
     String getStartBreakTime();
     @Query("SELECT EndBreakTime FROM SetUpTable")
     String getEndBreakTime();
+    //クラスIDの取得
+    @Query("SELECT classId FROM SetUpTable")
+    int getClassId();
 }
\ No newline at end of file
-- 
2.45.1


From 28afc982a7ce71e7438cc4af489afe6d61460105 Mon Sep 17 00:00:00 2001
From: nemukemo <hiroaka201432@gmail.com>
Date: Fri, 28 Jun 2024 10:38:49 +0900
Subject: [PATCH 2/2] =?UTF-8?q?room=E3=81=ABclassId=E3=83=95=E3=82=A3?=
 =?UTF-8?q?=E3=83=BC=E3=83=AB=E3=83=89=E3=81=AE=E8=BF=BD=E5=8A=A0=E3=80=81?=
 =?UTF-8?q?=20firestore=E3=81=8CclassId=E3=82=92=E5=9F=BA=E6=BA=96?=
 =?UTF-8?q?=E3=81=AB=E5=8F=97=E3=81=91=E5=8F=96=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4=E3=80=81=20FirestoreReception?=
 =?UTF-8?q?=E3=82=92=E5=91=BC=E3=81=B3=E5=87=BA=E3=81=99=E3=82=BF=E3=82=A4?=
 =?UTF-8?q?=E3=83=9F=E3=83=B3=E3=82=B0=E3=82=92=E4=BB=96=E3=81=AE=E3=82=A2?=
 =?UTF-8?q?=E3=82=AF=E3=83=86=E3=82=A3=E3=83=93=E3=83=86=E3=82=A3=E3=81=8B?=
 =?UTF-8?q?=E3=82=89=E6=88=BB=E3=81=A3=E3=81=A6=E3=81=8D=E3=81=9F=E3=82=BF?=
 =?UTF-8?q?=E3=82=A4=E3=83=9F=E3=83=B3=E3=82=B0=E3=81=AB=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/example/oplogy/MainActivity.java | 4 ++--
 app/src/main/java/com/example/oplogy/SetUpTable.java   | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/example/oplogy/MainActivity.java b/app/src/main/java/com/example/oplogy/MainActivity.java
index 689cffe..b6952e1 100644
--- a/app/src/main/java/com/example/oplogy/MainActivity.java
+++ b/app/src/main/java/com/example/oplogy/MainActivity.java
@@ -175,7 +175,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
 
         CountDownLatch latch = new CountDownLatch(2);
 
-        // タスク1: ローカルDBから生徒数を取得
+        // タスク1: ローカルDBから生徒数を取得してtotalStudentと比較
         executor.execute(() -> {
             AppDatabase db = Room.databaseBuilder(getApplicationContext(), AppDatabase.class, "SetUpTable").build();
             SetUpTableDao setUpTableDao = db.setUpTableDao();
@@ -194,7 +194,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
             });
         });
 
-        // タスク2: Firestoreからデータを取得
+        // タスク2: ルート作成を行う
         executor.execute(() -> {
             List<MyDataClass> myDataList = firestoreReception.getMyDataList();
             CreateRoot createRoot = new CreateRoot(MainActivity.this);
diff --git a/app/src/main/java/com/example/oplogy/SetUpTable.java b/app/src/main/java/com/example/oplogy/SetUpTable.java
index e6d986e..dfb21ad 100644
--- a/app/src/main/java/com/example/oplogy/SetUpTable.java
+++ b/app/src/main/java/com/example/oplogy/SetUpTable.java
@@ -16,7 +16,6 @@ public class SetUpTable {
     public String endBreakTime;
     public int totalStudent;
 
-    //TODO: ここのコードをあとで実装する。roomにint classIdの作成
     int classId;
 
 
-- 
2.45.1