feat: TASK-7 working with favourite screen logic

Author: VKolisnichenko1

app/src/main/java/com/android/gitapi/domain/model/ProjectItemModel.java

@@ -2,7 +2,7 @@
 
 
 public class ProjectItemModel {
-    private long id;
+    private int id;
     private String ownerUser;
     private String description;
     private String stars;
@@ -14,7 +14,7 @@ public class ProjectItemModel {
     private String htmlUrl;
     private boolean isFavourite = false;
 
-    public ProjectItemModel(long id, String ownerUser, String description, String stars, String avatarUrl, String repositoryName, String createdAt, String language, long forks, String htmlUrl) {
+    public ProjectItemModel(int id, String ownerUser, String description, String stars, String avatarUrl, String repositoryName, String createdAt, String language, long forks, String htmlUrl) {
         this.id = id;
         this.ownerUser = ownerUser;
         this.description = description;
@@ -38,14 +38,6 @@ public void setFavourite(boolean favourite) {
         isFavourite = favourite;
     }
 
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
     public String getOwnerUser() {
         return ownerUser;
     }
@@ -118,6 +110,14 @@ public void setHtmlUrl(String htmlUrl) {
         this.htmlUrl = htmlUrl;
     }
 
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getId() {
+        return id;
+    }
+
     @Override
     public String toString() {
         return "ProjectItemModel{" +

app/src/main/java/com/android/gitapi/domain/repository/DataBaseRepository.java

@@ -1,7 +1,5 @@
 package com.android.gitapi.domain.repository;
 
-import androidx.lifecycle.LiveData;
-
 import com.android.gitapi.domain.database.entity.RepositoryEntity;
 
 import java.util.List;

app/src/main/java/com/android/gitapi/domain/usecase/AddFavouriteUseCase.java

@@ -22,6 +22,7 @@ public AddFavouriteUseCase(DataBaseRepository dataBaseRepository) {
     protected Completable buildUseCaseSingle(ProjectItemModel itemModel) {
         return Completable.fromAction(() -> {
             RepositoryEntity repositoryEntity = new RepositoryEntity();
+            repositoryEntity.setId(itemModel.getId());
             repositoryEntity.setOwnerUser(itemModel.getOwnerUser());
             repositoryEntity.setDescription(itemModel.getDescription());
             repositoryEntity.setRepositoryName(itemModel.getRepositoryName());

app/src/main/java/com/android/gitapi/presentation/details/DetailsFragment.java

@@ -48,8 +48,8 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
     }
 
     @Override
-    public void onStart() {
-        super.onStart();
+    public void onResume() {
+        super.onResume();
         TabLayoutRepository.getInstance().setIsShowTabLayoutEvent(false);
     }
 

app/src/main/java/com/android/gitapi/presentation/di/ViewModelModule.java

@@ -1,6 +1,7 @@
 package com.android.gitapi.presentation.di;
 
 import com.android.gitapi.domain.di.UseCaseModule;
+import com.android.gitapi.domain.repository.DataBaseRepository;
 import com.android.gitapi.domain.usecase.AddFavouriteUseCase;
 import com.android.gitapi.domain.usecase.DeleteFavouriteUseCase;
 import com.android.gitapi.domain.usecase.GetFavouritesUseCase;
@@ -44,8 +45,8 @@ public DetailsViewModel provideDetailsViewModel() {
     }
 
     @Provides
-    public FavouritesViewModel provideFavouritesViewModel(GetFavouritesUseCase getFavouritesUseCase) {
-        return new FavouritesViewModel(getFavouritesUseCase);
+    public FavouritesViewModel provideFavouritesViewModel(GetFavouritesUseCase getFavouritesUseCase, DataBaseRepository dataBaseRepository) {
+        return new FavouritesViewModel(getFavouritesUseCase, dataBaseRepository);
     }
 
 }

app/src/main/java/com/android/gitapi/presentation/favourites/FavouritesFragment.java

@@ -84,7 +84,7 @@ protected void setObservers() {
 
     @Override
     public void onFavouriteClick(ProjectItemModel projectItemModel) {
-
+        viewModel.onFavouriteClick(projectItemModel);
     }
 
     @Override

app/src/main/java/com/android/gitapi/presentation/favourites/FavouritesViewModel.java

@@ -6,6 +6,7 @@
 
 import com.android.gitapi.domain.database.entity.RepositoryEntity;
 import com.android.gitapi.domain.model.ProjectItemModel;
+import com.android.gitapi.domain.repository.DataBaseRepository;
 import com.android.gitapi.domain.usecase.GetFavouritesUseCase;
 
 import java.util.ArrayList;
@@ -15,6 +16,8 @@
 
 public class FavouritesViewModel extends ViewModel {
     GetFavouritesUseCase favouritesUseCase;
+    DataBaseRepository dataBaseRepository;
+
 
     private final MutableLiveData<List<ProjectItemModel>> items = new MutableLiveData<>();
     private final ObservableBoolean observableBooleanProgress = new ObservableBoolean(false);
@@ -33,8 +36,9 @@ public ObservableBoolean getObservableBooleanProgress() {
     }
 
     @Inject
-    public FavouritesViewModel(GetFavouritesUseCase favouritesUseCase) {
+    public FavouritesViewModel(GetFavouritesUseCase favouritesUseCase, DataBaseRepository dataBaseRepository) {
         this.favouritesUseCase = favouritesUseCase;
+        this.dataBaseRepository = dataBaseRepository;
     }
 
     void fetchFavourites() {
@@ -51,13 +55,30 @@ void fetchFavourites() {
     }
 
     private void setObservableBooleanEmptyList(int listSize) {
-        if (listSize > 0) {
-            observableBooleanEmptyList.set(false);
-        } else {
-            observableBooleanEmptyList.set(true);
+        observableBooleanEmptyList.set(listSize <= 0);
+    }
+
+    void onFavouriteClick(ProjectItemModel projectItemModel) {
+        String repositoryNameToMatch = projectItemModel.getRepositoryName();
+
+        List<RepositoryEntity> favorites = favouritesUseCase.execute(null);
+
+        RepositoryEntity itemToRemove = null;
+        for (RepositoryEntity item : favorites) {
+            if (repositoryNameToMatch.equals(item.getRepositoryName())) {
+                itemToRemove = item;
+                break;
+            }
+        }
+
+        if (itemToRemove != null) {
+            favorites.remove(itemToRemove);
+            dataBaseRepository.deleteRepository(repositoryNameToMatch);
+            fetchFavourites();
         }
     }
 
+
     private ProjectItemModel parseFavourites(RepositoryEntity itemModel) {
         ProjectItemModel projectItemModel = new ProjectItemModel();
         projectItemModel.setOwnerUser(itemModel.getOwnerUser());

app/src/main/java/com/android/gitapi/presentation/repositorylist/RepositoryListViewModel.java

@@ -172,7 +172,6 @@ public void onFavouriteClick(ProjectItemModel itemModel) {
                     .subscribe(
                             () -> {
                                 repositoryEntities = getFavouritesUseCase.execute(null);
-                                Log.e("showInfo", repositoryEntities.toString());
                             },
                             error -> {
                                 Log.e("addError", Objects.requireNonNull(error.getMessage()));