getRecentDocument実装

.idea/gradle.xml

@@ -4,7 +4,6 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="jbr-17" />
         <option name="modules">

.idea/misc.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

app/src/main/java/one/nem/lacerta/LacertaApplication.java

@@ -14,7 +14,5 @@ public class LacertaApplication extends Application {
 
         // DynamicColorを有効化
         DynamicColors.applyToActivitiesIfAvailable(this);
-
     }
-
 }

app/src/main/java/one/nem/lacerta/MainActivity.java

@@ -35,8 +35,6 @@ public class MainActivity extends AppCompatActivity {
         NavigationUI.setupWithNavController(bottomNavigationView, navController);
 
         Toast.makeText(this, "testMessage", Toast.LENGTH_SHORT).show();
-
-
     }
 
-}
+}

component/scanner/src/main/java/one/nem/lacerta/component/scanner/ScannerManagerActivity.java

@@ -26,8 +26,12 @@ import java.util.Objects;
 import javax.inject.Inject;
 
 import dagger.hilt.android.AndroidEntryPoint;
+import one.nem.lacerta.model.document.DocumentDetail;
+import one.nem.lacerta.model.document.DocumentMeta;
+import one.nem.lacerta.processor.factory.DocumentProcessorFactory;
 import one.nem.lacerta.utils.LacertaLogger;
 import one.nem.lacerta.data.Document;
+import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
 
 @AndroidEntryPoint
 public class ScannerManagerActivity extends AppCompatActivity {
@@ -40,6 +44,11 @@ public class ScannerManagerActivity extends AppCompatActivity {
     @Inject
     Document document;
 
+    @Inject
+    DocumentProcessorFactory documentProcessorFactory;
+
+    @Inject
+    LacertaVcsFactory lacertaVcsFactory;
 
     // Variables
     private ArrayList<Bitmap> croppedImages = new ArrayList<>();
@@ -143,7 +152,21 @@ public class ScannerManagerActivity extends AppCompatActivity {
 
     private void saveNewDocument() {
         logger.debug(TAG, "saveNewDocument");
-
+        DocumentMeta documentMeta = new DocumentMeta("Untitled"); // TODO-rca: デフォルトタイトルを指定できるようにする
+        DocumentDetail documentDetail = document.createDocument(documentMeta);
+        Bitmap[] bitmaps = new Bitmap[this.croppedImages.size()];
+        this.croppedImages.toArray(bitmaps);
+        try {
+            documentProcessorFactory.create(documentDetail).addNewPagesToLast(bitmaps);
+            Toast.makeText(this, "Saved.", Toast.LENGTH_SHORT).show();
+            lacertaVcsFactory.create(documentDetail.getMeta().getId()).generateRevisionAtCurrent("Initial commit");
+            lacertaVcsFactory.create(documentDetail.getMeta().getId()).printLog(); // Debug
+            lacertaVcsFactory.create(documentDetail.getMeta().getId()).printRev(); // Debug
+            finish();
+        } catch (Exception e) {
+            logger.error(TAG, "Error: " + e.getMessage());
+            logger.e_code("9dff2a28-20e8-4ccd-9d04-f0c7646faa6a");
+        }
     }
 
     private void insertToExistDocument() {

data/src/main/java/one/nem/lacerta/data/LacertaLibrary.java

@@ -1,5 +1,8 @@
 package one.nem.lacerta.data;
 
+import java.util.ArrayList;
+
+import one.nem.lacerta.model.ListItem;
 import one.nem.lacerta.model.ListItemType;
 
 import one.nem.lacerta.model.LibraryItemPage;
@@ -8,8 +11,8 @@ import one.nem.lacerta.model.document.DocumentDetail;
 public interface LacertaLibrary {
 
     // Get History
-    LibraryItemPage getRecentDocument(int limit);
-    LibraryItemPage getRecentDocument(int limit, int offset);
+    ArrayList<ListItem> getRecentDocument(int limit);
+    ArrayList<ListItem> getRecentDocument(int limit, int offset);
 
     // Get Library page
     LibraryItemPage getLibraryPage(int limit);

data/src/main/java/one/nem/lacerta/data/impl/DocumentImpl.java

@@ -24,6 +24,7 @@ import one.nem.lacerta.utils.LacertaLogger;
 
 // Lacerta/vcs
 import one.nem.lacerta.vcs.LacertaVcs;
+import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
 
 
 public class DocumentImpl implements Document {
@@ -36,14 +37,14 @@ public class DocumentImpl implements Document {
     @Inject
     LacertaDatabase database;
 
-//    @Inject
-//    LacertaVcs vcs;
+    @Inject
+    LacertaVcsFactory vcsFactory;
 
 
     @Inject
     public DocumentImpl() {
         // Init
-        logger.debug(TAG, "called");
+//        logger.debug(TAG, "called");
     }
 
 
@@ -69,7 +70,8 @@ public class DocumentImpl implements Document {
         database.documentDao().insert(documentEntity);
 
         // Vcs
-//        vcs.createDocument(meta.getId());
+        LacertaVcs vcs = vcsFactory.create(meta.getId());
+        vcs.createDocument(meta.getId());
 
         return detail;
     }

data/src/main/java/one/nem/lacerta/data/impl/LacertaLibraryImpl.java

@@ -1,18 +1,48 @@
 package one.nem.lacerta.data.impl;
 
+import java.text.DateFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+
 import one.nem.lacerta.data.LacertaLibrary;
 import one.nem.lacerta.model.LibraryItemPage;
+import one.nem.lacerta.model.ListItem;
+import one.nem.lacerta.model.ListItemType;
 import one.nem.lacerta.model.document.DocumentDetail;
+import one.nem.lacerta.source.database.LacertaDatabase;
+import one.nem.lacerta.source.database.common.DateTypeConverter;
+import one.nem.lacerta.source.database.entity.DocumentEntity;
+import one.nem.lacerta.utils.LacertaLogger;
 
 public class LacertaLibraryImpl implements LacertaLibrary {
+
+    @Inject
+    LacertaLogger logger;
+
+    @Inject
+    LacertaDatabase database;
+
     @Override
-    public LibraryItemPage getRecentDocument(int limit) {
-        return null;
+    public ArrayList<ListItem> getRecentDocument(int limit) {
+        List<DocumentEntity> documentEntities = database.documentDao().getRecentDocument(limit);
+
+        ArrayList<ListItem> listItems = new ArrayList<>();
+        for (DocumentEntity documentEntity : documentEntities) {
+            ListItem listItem = new ListItem();
+            listItem.setItemType(ListItemType.ITEM_TYPE_DOCUMENT);
+            listItem.setTitle(documentEntity.title);
+            listItem.setDescription(DateFormat.getDateInstance().format(documentEntity.updatedAt));
+            listItem.setItemId(documentEntity.id);
+            listItems.add(listItem);
+        }
+        return listItems;
     }
 
     @Override
-    public LibraryItemPage getRecentDocument(int limit, int offset) {
-        return null;
+    public ArrayList<ListItem> getRecentDocument(int limit, int offset) {
+        return null; // TODO-rca: Implement
     }
 
     @Override

data/src/main/java/one/nem/lacerta/data/impl/LacertaLibraryStubImpl.java

@@ -148,8 +148,8 @@ public class LacertaLibraryStubImpl implements LacertaLibrary {
      * @return ページオブジェクト
      */
     @Override
-    public LibraryItemPage getRecentDocument(int limit) {
-        return getRecentDocumentPage(limit);
+    public ArrayList<ListItem> getRecentDocument(int limit) {
+        return getRecentDocumentPage(limit).getListItems();
     }
 
     /**
@@ -159,8 +159,8 @@ public class LacertaLibraryStubImpl implements LacertaLibrary {
      * @return ページオブジェクト
      */
     @Override
-    public LibraryItemPage getRecentDocument(int limit, int offset) {
-        return getRecentDocumentPage(limit);
+    public ArrayList<ListItem> getRecentDocument(int limit, int offset) {
+        return getRecentDocumentPage(limit).getListItems();
     }
 
     /**

feature/debug/src/main/res/layout/list_item_debug_menu.xml

@@ -23,6 +23,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/debug_menu_item_title" />
 
-
-
 </androidx.constraintlayout.widget.ConstraintLayout>

feature/home/build.gradle

@@ -1,5 +1,4 @@
 plugins {
-    id 'com.google.dagger.hilt.android'
     id 'com.android.library'
 }
 
@@ -30,8 +29,6 @@ dependencies {
 
     implementation libs.androidx.appcompat
     implementation libs.com.google.android.material
-    implementation project(path: ':feature:debug')
-    implementation project(path: ':utils')
     testImplementation libs.junit
     androidTestImplementation libs.androidx.test.ext.junit
     androidTestImplementation libs.androidx.test.espresso.core
@@ -41,18 +38,6 @@ dependencies {
     implementation libs.navigation.ui
     implementation libs.navigation.dynamic.features.fragment
 
-    // DI
-    implementation libs.com.google.dagger.hilt.android
-    annotationProcessor libs.com.google.dagger.hilt.compiler
-
     // shared
     implementation project(':shared:ui')
-
-    // DI
-    implementation project(':data')
-
-    //model
-    implementation project(':model')
-
-    implementation "androidx.recyclerview:recyclerview:1.3.2"
 }

feature/home/src/androidTest/java/one/nem/lacerta/feature/home/ExampleInstrumentedTest.java

@@ -22,7 +22,5 @@ public class ExampleInstrumentedTest {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
         assertEquals("one.nem.lacerta.feature.home.test", appContext.getPackageName());
-
-
     }
 }

feature/home/src/main/java/one/nem/lacerta/feature/home/HomeTopFragment.java

@@ -1,40 +1,20 @@
 package one.nem.lacerta.feature.home;
 
 import android.os.Bundle;
-import android.util.Log;
+
+import androidx.fragment.app.Fragment;
+
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import dagger.hilt.android.AndroidEntryPoint;
-import one.nem.lacerta.data.Document;
-import one.nem.lacerta.data.LacertaLibrary;
-import one.nem.lacerta.model.ListItem;
-import one.nem.lacerta.model.document.DocumentMeta;
-
-
-
 /**
  * A simple {@link Fragment} subclass.
  * Use the {@link HomeTopFragment#newInstance} factory method to
  * create an instance of this fragment.
  */
-@AndroidEntryPoint
 public class HomeTopFragment extends Fragment {
 
-    @Inject
-    LacertaLibrary lacertaLibrary;
-
-
     // TODO: Rename parameter arguments, choose names that match
     // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
     private static final String ARG_PARAM1 = "param1";
@@ -66,15 +46,12 @@ public class HomeTopFragment extends Fragment {
         return fragment;
     }
 
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (getArguments() != null) {
             mParam1 = getArguments().getString(ARG_PARAM1);
             mParam2 = getArguments().getString(ARG_PARAM2);
-
-
         }
     }
 
@@ -82,42 +59,6 @@ public class HomeTopFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
-        View view = inflater.inflate(R.layout.fragment_home_top, container, false);
-
-//        List<DocumentMeta> metas = document.getAllDocumentMetas(100);
-
-        List<ListItem> listItem = lacertaLibrary.getRecentDocument(100).getListItems();
-
-        Log.d("docs", Integer.toString(listItem.size()));
-
-        RecyclerView recyclerView = view.findViewById(R.id.item_recycler_view);
-
-        recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-
-        MyAdapter myAdapter = new MyAdapter(listItems);
-
-        recyclerView.setAdapter(myAdapter);
-
-        return view;
-
-
-        }
-String pageTitle;
-    String pageId;
-    ArrayList listItems;
-
-    String title;
-    String description;
-
-    String itemId;
-
-
-
-}
-
-
-
-
-
-
-
+        return inflater.inflate(R.layout.fragment_home_top, container, false);
+    }
+}

feature/home/src/main/java/one/nem/lacerta/feature/home/MyAdapter.java

@@ -1,70 +0,0 @@
-package one.nem.lacerta.feature.home;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import one.nem.lacerta.model.ListItem;
-import one.nem.lacerta.model.document.DocumentMeta;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class MyAdapter extends RecyclerView.Adapter<MyAdapter.MyAdapterViewHolder> {
-
-    ArrayList<ListItem> listItems;
-
-    public MyAdapter(ArrayList<ListItem> ListItem) {
-//        this.listItem = listItem;
-    }
-
-    @NonNull
-    @Override
-    public MyAdapterViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_home_document, parent, false);
-        return new MyAdapterViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull MyAdapterViewHolder holder, int position) {
-
-
-        holder.title.setText(listItems.get(position).getTitle());
-        holder.description.setText(listItems.get(position).getDescription());
-
-
-
-
-
-
-
-
-    }
-
-
-    @Override
-    public int getItemCount() {
-        return listItems.size();
-    }
-
-    public class MyAdapterViewHolder extends RecyclerView.ViewHolder {
-
-        TextView title;
-
-        TextView description;
-
-        public MyAdapterViewHolder(@NonNull View itemView) {
-            super(itemView);
-
-            title = itemView.findViewById(R.id.debug_menu_item_title);
-            description = itemView.findViewById(R.id.debug_menu_item_description);
-
-
-        }
-    }
-}
-

feature/home/src/main/res/layout/fragment_home_top.xml

@@ -3,19 +3,12 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".HomeTopFragment"
-    tools:ignore="ExtraText">
-
+    tools:context=".HomeTopFragment">
 
     <!-- TODO: Update blank fragment layout -->
-
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/item_recycler_view"
+    <TextView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-
-    </androidx.recyclerview.widget.RecyclerView>
+        android:layout_height="match_parent"
+        android:text="@string/hello_blank_fragment" />
 
 </FrameLayout>

feature/home/src/main/res/layout/list_item_home_document.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="16dp">
-
-    <TextView
-        android:id="@+id/debug_menu_item_title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:textSize="16sp"
-        android:layout_marginEnd="8dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/debug_menu_item_description"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:textSize="14sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/debug_menu_item_title" />
-
-    <TextView
-        android:id="@+id/debug_menu_item_updated_at_home"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:textSize="14sp"
-        android:text="Updated at: aaaaaaaaaa"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>

feature/home/src/main/res/values/ids.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <item name="my_recycler_view" type="id" />
-    <item name="TITLE" type="id" />
-    <item name="textView" type="id" />
-</resources>

feature/home/src/main/res/values/refs.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>

feature/home/src/main/res/values/strings.xml

@@ -1,5 +1,4 @@
 <resources>
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
-    <string name="textview">TextView</string>
 </resources>

feature/library/src/main/java/one/nem/lacerta/feature/library/LibraryTopFragment.java

@@ -25,8 +25,6 @@ import one.nem.lacerta.data.Document;
 import one.nem.lacerta.model.document.DocumentMeta;
 import one.nem.lacerta.model.document.tag.DocumentTag;
 
-
-
 /**
  * A simple {@link Fragment} subclass.
  * Use the {@link LibraryTopFragment#newInstance} factory method to

model/src/main/java/one/nem/lacerta/model/document/DocumentDetail.java

@@ -73,6 +73,4 @@ public class DocumentDetail {
         this.pages = pages;
     }
 
-
-    }
-
+}

model/src/main/java/one/nem/lacerta/model/document/DocumentMeta.java

@@ -48,6 +48,17 @@ public class DocumentMeta { // TODO-rca: JavaDoc対応
     public DocumentMeta() {
     }
 
+    public DocumentMeta(String title) {
+        this.id = UUID.randomUUID().toString();
+        this.title = title;
+        this.tags = new ArrayList<>();
+        this.author = ""; // TODO-rca: 作者のデフォルト値を設定できるようにする
+        this.defaultBranch = "main"; // TODO-rca: デフォルトブランチのデフォルト値を設定できるようにする
+        this.path = new PublicPath().getRoot();
+        this.updatedAt = new Date();
+        this.createdAt = new Date();
+    }
+
     public DocumentMeta(String title, List<DocumentTag> tags, String author, String defaultBranch) {
         this.id = UUID.randomUUID().toString();
         this.title = title;

source/build.gradle

@@ -47,4 +47,7 @@ dependencies {
     // Utils モジュール
     implementation project(':utils')
 
+    // Model
+    implementation project(':model')
+
 }

source/src/main/java/one/nem/lacerta/source/database/LacertaDatabase.java

@@ -4,6 +4,8 @@ import androidx.room.Database;
 import androidx.room.RoomDatabase;
 
 // Entities
+import one.nem.lacerta.source.database.dao.FolderDao;
+import one.nem.lacerta.source.database.entity.FolderEntity;
 import one.nem.lacerta.source.database.entity.TagEntity;
 import one.nem.lacerta.source.database.entity.DocumentEntity;
 import one.nem.lacerta.source.database.entity.LibraryEntity;
@@ -17,11 +19,12 @@ import one.nem.lacerta.source.database.dao.LibraryDao;
 import one.nem.lacerta.source.database.dao.VcsRevDao;
 import one.nem.lacerta.source.database.dao.VcsLogDao;
 
-@Database(entities = {TagEntity.class, DocumentEntity.class, LibraryEntity.class, VcsRevEntity.class, VcsLogEntity.class}, version = 2)
+@Database(entities = {TagEntity.class, DocumentEntity.class, LibraryEntity.class, VcsRevEntity.class, VcsLogEntity.class, FolderEntity.class}, version = 4)
 public abstract class LacertaDatabase extends RoomDatabase {
     public abstract TagDao tagDao();
     public abstract DocumentDao documentDao();
     public abstract LibraryDao libraryDao();
     public abstract VcsRevDao vcsRevDao();
     public abstract VcsLogDao vcsLogDao();
+    public abstract FolderDao folderDao();
 }

source/src/main/java/one/nem/lacerta/source/database/dao/DocumentDao.java

@@ -28,6 +28,12 @@ public interface DocumentDao {
     @Query("SELECT * FROM Document WHERE id IN (:ids)")
     List<DocumentEntity> findByIds(List<String> ids);
 
+    @Query("SELECT * FROM Document WHERE public_path = :publicPath LIMIT :limit")
+    List<DocumentEntity> findByPublicPathWithLimit(String publicPath, int limit);
+
+    @Query("SELECT * FROM Document ORDER BY created_at DESC LIMIT :limit")
+    List<DocumentEntity> getRecentDocument(int limit);
+
     // Insert
     @Insert
     void insert(DocumentEntity document);

source/src/main/java/one/nem/lacerta/source/database/dao/FolderDao.java

@@ -0,0 +1,23 @@
+package one.nem.lacerta.source.database.dao;
+
+import androidx.room.Dao;
+import androidx.room.Insert;
+import androidx.room.Query;
+
+import one.nem.lacerta.source.database.entity.FolderEntity;
+
+@Dao
+public interface FolderDao {
+
+    @Query("SELECT * FROM Folder WHERE id = :id")
+    FolderEntity findById(String id);
+
+    @Query("SELECT * FROM Folder WHERE public_path = :publicPath")
+    FolderEntity findByPublicPath(String publicPath);
+
+    @Insert
+    void insert(FolderEntity folderEntity);
+
+    @Insert
+    void insertAll(FolderEntity... folderEntities);
+}

source/src/main/java/one/nem/lacerta/source/database/dao/VcsLogDao.java

@@ -3,6 +3,7 @@ package one.nem.lacerta.source.database.dao;
 import androidx.room.Dao;
 import androidx.room.Insert;
 import androidx.room.Query;
+import androidx.room.Update;
 
 import java.util.List;
 
@@ -24,6 +25,14 @@ public interface VcsLogDao {
     @Query("SELECT * FROM vcs_log WHERE document_id = :documentId")
     List<VcsLogEntity> findByDocumentId(String documentId);
 
+    @Query("SELECT * FROM vcs_log WHERE document_id = :documentId AND is_included = :isIncluded ORDER BY created_at")
+    List<VcsLogEntity> findByDocumentIdAndIncluded(String documentId, boolean isIncluded);
+
+    @Query("SELECT * FROM vcs_log WHERE document_id = :documentId AND branch_name = :branchName")
+    List<VcsLogEntity> findByDocumentIdAndBranchName(String documentId, String branchName);
+
+    @Query("SELECT * FROM vcs_log WHERE document_id = :documentId AND branch_name = :branchName AND is_included = :isIncluded ORDER BY created_at")
+    List<VcsLogEntity> findByDocumentIdAndBranchNameAndIncluded(String documentId, String branchName, boolean isIncluded);
     // Insert
 
     @Insert
@@ -35,5 +44,12 @@ public interface VcsLogDao {
     @Insert
     void insert(VcsLogEntity vcsLog);
 
-    // TODO-rca: Update, Deleteが必要か検討
+    @Update
+    void update(VcsLogEntity vcsLog);
+
+    @Update
+    void updateAll(VcsLogEntity... vcsLogs);
+
+    @Update
+    void updateAll(List<VcsLogEntity> vcsLogs);
 }

source/src/main/java/one/nem/lacerta/source/database/entity/FolderEntity.java

@@ -0,0 +1,22 @@
+package one.nem.lacerta.source.database.entity;
+
+import androidx.annotation.NonNull;
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.PrimaryKey;
+
+@Entity(tableName = "folder")
+public class FolderEntity {
+
+    @PrimaryKey
+    @ColumnInfo(name = "id")
+    @NonNull
+    public String id; // フォルダID
+
+    @ColumnInfo(name = "title")
+    public String name; // フォルダ名
+
+    @ColumnInfo(name = "public_path")
+    public String publicPath; // 公開パス
+
+}

source/src/main/java/one/nem/lacerta/source/database/entity/VcsLogEntity.java

@@ -45,4 +45,10 @@ public class VcsLogEntity {
      */
     @ColumnInfo(name = "action")
     public String action;
+
+    /**
+     * Revに含まれてるかどうか
+     */
+    @ColumnInfo(name = "is_included")
+    public boolean isIncluded;
 }

vcs/src/main/java/one/nem/lacerta/vcs/LacertaVcs.java

@@ -11,7 +11,12 @@ public interface LacertaVcs {
 
     public void createDocument(String documentId);
 
+    public void generateRevisionAtCurrent(String message);
+
+
     // debug
     public void printLog();
 
+    public void printRev();
+
 }

vcs/src/main/java/one/nem/lacerta/vcs/impl/LacertaVcsImpl.java

@@ -1,5 +1,7 @@
 package one.nem.lacerta.vcs.impl;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.UUID;
 
 import javax.inject.Inject;
@@ -8,8 +10,12 @@ import dagger.assisted.Assisted;
 import dagger.assisted.AssistedInject;
 import one.nem.lacerta.source.database.LacertaDatabase;
 import one.nem.lacerta.source.database.entity.VcsLogEntity;
+import one.nem.lacerta.source.database.entity.VcsRevEntity;
 import one.nem.lacerta.utils.LacertaLogger;
+import one.nem.lacerta.vcs.ActionType;
 import one.nem.lacerta.vcs.LacertaVcs;
+import one.nem.lacerta.vcs.internal.JsonUtils;
+import one.nem.lacerta.vcs.model.action.InsertPage;
 
 public class LacertaVcsImpl implements LacertaVcs {
 
@@ -38,12 +44,17 @@ public class LacertaVcsImpl implements LacertaVcs {
     @Override
     public void insertPage(int index, String fileName) {
         logger.debug(TAG, "insertPage");
+
+        // InsertPage
+        InsertPage insertPage = new InsertPage(index, fileName);
+        insertPage.setActionType(ActionType.INSERT_PAGE);
+
         VcsLogEntity vcsLogEntity = new VcsLogEntity();
         vcsLogEntity.id = UUID.randomUUID().toString();
         vcsLogEntity.documentId = documentId;
         vcsLogEntity.branchName = "master";
         vcsLogEntity.createdAt = new java.util.Date();
-        vcsLogEntity.action = "placeholder";
+        vcsLogEntity.action = JsonUtils.toJson(insertPage);
         database.vcsLogDao().insert(vcsLogEntity);
     }
 
@@ -54,7 +65,61 @@ public class LacertaVcsImpl implements LacertaVcs {
 
     @Override
     public void createDocument(String documentId) {
+        logger.debug(TAG, "createDocument");
 
+        VcsLogEntity vcsLogEntity = new VcsLogEntity();
+        vcsLogEntity.id = UUID.randomUUID().toString();
+        vcsLogEntity.documentId = documentId;
+        vcsLogEntity.branchName = "master";
+        vcsLogEntity.createdAt = new java.util.Date();
+        vcsLogEntity.action = "ph-createDocument";
+        database.vcsLogDao().insert(vcsLogEntity);
+    }
+
+    // Internal
+    private ArrayList<VcsLogEntity> getNonIncludedVcsLogEntities() {
+        return new ArrayList<>(database.vcsLogDao().findByDocumentIdAndIncluded(documentId, false));
+    }
+
+    private ArrayList<VcsLogEntity> getNonIncludedVcsLogEntities(String branchName) {
+        return new ArrayList<>(database.vcsLogDao().findByDocumentIdAndBranchNameAndIncluded(documentId, branchName, false));
+    }
+
+    private void setIncludedVcsLogEntities(ArrayList<VcsLogEntity> vcsLogEntities) {
+        vcsLogEntities.forEach(vcsLogEntity -> {
+            vcsLogEntity.isIncluded = true;
+            database.vcsLogDao().update(vcsLogEntity);
+        });
+
+        logger.debug(TAG, "setIncludedVcsLogEntities updated: " + vcsLogEntities.size() + " entities");
+    }
+
+    @Override
+    public void generateRevisionAtCurrent(String message) {
+        logger.debug(TAG, "generateRevisionAtCurrent");
+        // TODO-rca: ブランチを考慮する
+
+        ArrayList<VcsLogEntity> vcsLogEntities = getNonIncludedVcsLogEntities();
+
+        ArrayList<String> logIds = new ArrayList<>();
+        vcsLogEntities.forEach(vcsLogEntity -> {
+            logIds.add(vcsLogEntity.id);
+        });
+
+        VcsRevEntity vcsRevEntity = new VcsRevEntity();
+        vcsRevEntity.id = UUID.randomUUID().toString();
+        vcsRevEntity.documentId = documentId;
+        vcsRevEntity.branchName = "master";
+        vcsRevEntity.createdAt = new java.util.Date();
+        vcsRevEntity.commitMessage = message;
+        vcsRevEntity.logIds = logIds;
+
+        database.vcsRevDao().insert(vcsRevEntity);
+
+        setIncludedVcsLogEntities(vcsLogEntities);
+
+        logger.debug(TAG, "generateRevisionAtCurrent finished");
+        logger.debug(TAG, "New revision inserted: " + vcsRevEntity.id);
     }
 
     @Override
@@ -62,6 +127,19 @@ public class LacertaVcsImpl implements LacertaVcs {
         logger.debug(TAG, "printLog");
         database.vcsLogDao().findAll().forEach(vcsLog -> {
             logger.debug(TAG, vcsLog.id);
+            logger.debug(TAG, vcsLog.documentId + " " + vcsLog.branchName);
+            logger.debug(TAG, vcsLog.action);
+        });
+    }
+
+    @Override
+    public void printRev() {
+        logger.debug(TAG, "printRev");
+        database.vcsRevDao().findAll().forEach(vcsRev -> {
+            logger.debug(TAG, vcsRev.id);
+            logger.debug(TAG, vcsRev.documentId + " " + vcsRev.branchName);
+            logger.debug(TAG, vcsRev.commitMessage);
+            logger.debug(TAG, vcsRev.logIds.toString());
         });
     }
 }