From 845557220d59b28eed70a78701c93777ee341301 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= <nem@nem.x0.to>
Date: Wed, 3 Jul 2024 16:06:16 +0900
Subject: [PATCH] =?UTF-8?q?=E5=9E=8B=E3=82=92String=E3=81=8B=E3=82=89Integ?=
 =?UTF-8?q?er=E3=81=AB=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/example/oplogy/CreateUUID.java   | 14 ++++++++------
 .../oplogy/FirestoreReception_classIdDatabase.java |  8 ++++----
 .../main/java/com/example/oplogy/MainActivity.java |  2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/example/oplogy/CreateUUID.java b/app/src/main/java/com/example/oplogy/CreateUUID.java
index f61e643..3b0b188 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 int generateUUID(List<String> classIdList ){
+    public static int generateUUID(List<Integer> classIdList ){
         while (true){
-            String uuid = String.valueOf((int)(Math.random() * 1000000));
+            int uuid = (int)(Math.random() * 1000000);
             boolean isDuplicate = false;
-            for(String classId : classIdList){
-                if(classId.equals(uuid)){
+            for(int classId : classIdList){
+                if(classId==uuid){
                     //重複があればフラグを立て、ループを抜ける
                     isDuplicate = true;
                     break;
@@ -19,9 +19,11 @@ public class CreateUUID {
             //重複がなければ生成したUUIDを返す
             if (!isDuplicate) {
                 //firestoreに挿入処理
+                InsertClassIdforFirebase insertClassIdforFirebase = new InsertClassIdforFirebase();
+                insertClassIdforFirebase.insertClassId(uuid);
                 //テスト用
-                uuid="100";
-                return Integer.parseInt(uuid);
+                uuid=100;
+                return uuid;
             }
         }
     }
diff --git a/app/src/main/java/com/example/oplogy/FirestoreReception_classIdDatabase.java b/app/src/main/java/com/example/oplogy/FirestoreReception_classIdDatabase.java
index 258330a..a88ea67 100644
--- a/app/src/main/java/com/example/oplogy/FirestoreReception_classIdDatabase.java
+++ b/app/src/main/java/com/example/oplogy/FirestoreReception_classIdDatabase.java
@@ -17,14 +17,14 @@ import java.util.List;
 import java.util.Map;
 public class FirestoreReception_classIdDatabase {
     private FirebaseFirestore db;
-    private List<String> classIdList= new ArrayList<>();
+    private List<Integer> classIdList= new ArrayList<>();
 
     public FirestoreReception_classIdDatabase() {
         db = FirebaseFirestore.getInstance();
     }
 
 
-    public List<String> getAllDocumentsFromClassIdDatabase() {
+    public List<Integer> getAllDocumentsFromClassIdDatabase() {
         db.collection("classId_Database")
                 .get()
                 .addOnCompleteListener(new OnCompleteListener<QuerySnapshot>() {
@@ -34,7 +34,7 @@ public class FirestoreReception_classIdDatabase {
                             for (QueryDocumentSnapshot document : task.getResult()) {
                                 Log.d("結果", document.getId() + " => " + document.getData());
                                 //データをListに追加
-                                classIdList.add((String) document.get("classId"));
+                                classIdList.add(((Long) document.get("classId")).intValue());
                             }
                         } else {
                             Log.d("結果", "Error getting documents: ", task.getException());
@@ -45,7 +45,7 @@ public class FirestoreReception_classIdDatabase {
         return classIdList;
     }
 
-    public List<String> getClassIdList() {
+    public List<Integer> getClassIdList() {
         return classIdList;
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/oplogy/MainActivity.java b/app/src/main/java/com/example/oplogy/MainActivity.java
index ac4c194..6a19593 100644
--- a/app/src/main/java/com/example/oplogy/MainActivity.java
+++ b/app/src/main/java/com/example/oplogy/MainActivity.java
@@ -162,7 +162,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
     //UUIDを表示するかのダイアログ
     private void showUUIDYesNoDialog() {
         firestoreReception_classIdDatabase = new FirestoreReception_classIdDatabase();
-        List<String> classIdList = firestoreReception_classIdDatabase.getAllDocumentsFromClassIdDatabase();
+        List<Integer> classIdList = firestoreReception_classIdDatabase.getAllDocumentsFromClassIdDatabase();
 
 
         AlertDialog.Builder builder = new AlertDialog.Builder(this);