Convert Entry

Author: Gabi Scardine Silva

app/src/main/java/io/intrepid/contest/models/Entry.java

@@ -0,0 +1,42 @@
+package io.intrepid.contest.models
+
+import android.support.v4.util.SparseArrayCompat
+import java.util.*
+
+open class Entry {
+    var id: UUID
+    var title: String? = null
+    var createdAt: Date? = null
+    var updatedAt: Date? = null
+    var photoUrl: String? = null
+    @Transient private val mapOfIndexToScore = SparseArrayCompat<Int>()
+    @Transient private var categoriesSize: Int = 0
+
+    init {
+        id = UUID.randomUUID()
+    }
+
+    val isCompletelyScored: Boolean
+        get() = mapOfIndexToScore.size() == categoriesSize
+
+    val ratingAverage: Int
+        get() {
+            var sum = 0
+            for (index in 0..mapOfIndexToScore.size() - 1) {
+                sum += mapOfIndexToScore.get(index)
+            }
+            return sum / categoriesSize
+        }
+
+    fun getScoreAt(categoryIndex: Int): Int {
+        return mapOfIndexToScore.get(categoryIndex)
+    }
+
+    fun setCategoriesSize(categoriesSize: Int) {
+        this.categoriesSize = categoriesSize
+    }
+
+    fun acceptScore(position: Int, newRating: Int) {
+        mapOfIndexToScore.put(position, newRating)
+    }
+}

app/src/main/java/io/intrepid/contest/models/Entry.kt

@@ -222,8 +222,8 @@ private List<Entry> makeListOfEntries() {
         List<Entry> entries = new ArrayList<>();
         for (int i = 0; i < 3; i++) {
             Entry entry = new Entry();
-            entry.title = "Test Entry " + i;
-            entry.photoUrl = TEST_ENTRY_IMAGE;
+            entry.setTitle("Test Entry " + i);
+            entry.setPhotoUrl(TEST_ENTRY_IMAGE);
             entries.add(entry);
         }
         return entries;

app/src/main/java/io/intrepid/contest/rest/MockRestApi.java

@@ -32,8 +32,8 @@ private static View inflateView(ViewGroup parent) {
 
     public void bind(Entry entry) {
         Picasso.with(itemView.getContext())
-                .load(entry.photoUrl).resizeDimen(R.dimen.entry_review_row_size, R.dimen.entry_review_row_size)
+                .load(entry.getPhotoUrl()).resizeDimen(R.dimen.entry_review_row_size, R.dimen.entry_review_row_size)
                 .into(entryThumbnail);
-        entryTitleTextView.setText(entry.title);
+        entryTitleTextView.setText(entry.getTitle());
     }
 }

app/src/main/java/io/intrepid/contest/screens/adminstatus/EntryReviewViewHolder.java

@@ -45,13 +45,13 @@ void onEntryClick() {
 
     void bindEntry(Entry entry) {
         this.entry = entry;
-        submissionTitleField.setText(entry.title);
+        submissionTitleField.setText(entry.getTitle());
         if (entry.isCompletelyScored()) {
             checkMarkIcon.setVisibility(View.VISIBLE);
         }
         scoreField.setText(String.valueOf(entry.getRatingAverage()));
         Picasso.with(itemView.getContext())
-                .load(entry.photoUrl)
+                .load(entry.getPhotoUrl())
                 .placeholder(R.drawable.default_entry_icon)
                 .into(entryThumbnail);
     }

app/src/main/java/io/intrepid/contest/screens/contestjudging/EntryViewHolder.java

@@ -49,7 +49,7 @@ private void fetchEntriesForContest() {
                     entryBallots.clear();
                     for (Entry entry : entries) {
                         entry.setCategoriesSize(categories.size());
-                        EntryBallot ballot = new EntryBallot(entry.id);
+                        EntryBallot ballot = new EntryBallot(entry.getId());
                         for(Category category : categories){
                             ballot.addScore(new Score(category, 0));
                         }

app/src/main/java/io/intrepid/contest/screens/contestjudging/scoreentries/ScoreEntriesPresenter.java

@@ -48,7 +48,7 @@ private static View inflateView(ViewGroup parent) {
 
     void bindEntry(Entry entry) {
         setupCategoriesList(entry);
-        String photoUrl = entry.photoUrl;
+        String photoUrl = entry.getPhotoUrl();
         int imageWidth = (int) itemView.getResources().getDimension(R.dimen.rating_image_card_width);
         int imageHeight = (int) itemView.getResources().getDimension(R.dimen.rating_image_card_height);
         Picasso.with(itemView.getContext()).load(photoUrl).resize(imageWidth, imageHeight).into(topImageCard);

app/src/main/java/io/intrepid/contest/screens/contestjudging/scoreentries/entrydetail/EntryPageViewHolder.java

@@ -82,7 +82,7 @@ public void onEntrySubmitted() {
     }
 
     private void showResult(EntryResponse response) {
-        if ((response.getEntry() == null) || (response.getEntry().id == null)) {
+        if ((response.getEntry() == null) || (response.getEntry().getId() == null)) {
             Timber.d("Entry was not created.");
             getView().showInvalidEntryErrorMessage();
             return;

app/src/main/java/io/intrepid/contest/screens/entrysubmission/entryimage/EntryImagePresenter.java

@@ -21,39 +21,33 @@ import java.util.*
 class EntriesListPresenterTest : BasePresenterTest<EntriesListPresenter>() {
     @Mock
     private lateinit var mockView: View
-    @Mock
-    private lateinit var mockEntries: List<Entry>
-    @Mock
-    private lateinit var mockEntry: Entry
-    @Mock
-    private lateinit var mockEntryIterator: Iterator<Entry>
+
+    private lateinit var entries: List<Entry>
 
     @Before
     fun setup() {
+        entries = mutableListOf(Entry(), Entry())
         `when`(mockPersistentSettings.currentContestId).thenReturn(UUID.randomUUID())
-        `when`(mockView.entries).thenReturn(mockEntries)
-        `when`(mockEntryIterator.hasNext()).thenReturn(true, true, false)
-        `when`(mockEntryIterator.next()).thenReturn(mockEntry).thenReturn(mockEntry)
-        `when`(mockEntries.iterator()).thenReturn(mockEntryIterator)
+        `when`(mockView.entries).thenReturn(entries)
         presenter = EntriesListPresenter(mockView, testConfiguration)
     }
 
     @Test
-    fun onViewCreatedShouldTriggerViewToShowEntriesList() {
+    fun onViewCreatedShouldTriggerViewToShowEntriesListWhenEntriesAreNotCompletelyRated() {
+        entries[0].setCategoriesSize(1)
         presenter.onViewCreated()
         verify<View>(mockView).showEntriesList(false)
     }
 
     @Test
     fun onViewCreatedShouldShowSubmitButtonWhenEntriesAreCompletelyRated() {
-        `when`(mockEntry.isCompletelyScored).thenReturn(true)
         presenter.onViewCreated()
         verify<View>(mockView).showSubmitButton(true)
     }
 
     @Test
     fun onViewCreatedShouldHideSubmitButtonWhenEntriesAreNotCompletelyRated() {
-        `when`(mockEntry.isCompletelyScored).thenReturn(false)
+        entries[0].setCategoriesSize(1)
         presenter.onViewCreated()
         verify<View>(mockView).showSubmitButton(false)
     }

app/src/test/java/io/intrepid/contest/screens/contestjudging/scoreentries/entrieslist/EntriesListPresenterTest.kt

@@ -18,16 +18,18 @@ class EntryDetailPresenterTest : BasePresenterTest<EntryDetailPresenter>() {
     @Mock
     private lateinit var mockView: View
     @Mock
-    private lateinit var mockEntry: Entry
-    @Mock
     private lateinit var mockBallot: EntryBallot
     @Mock
     private lateinit var mockCategory: Category
 
+    private lateinit var entry: Entry
+
     @Before
     fun setup() {
-        mockEntry.id = UUID.randomUUID()
-        `when`(mockView.entryToRate).thenReturn(mockEntry)
+        entry = Entry().apply {
+            id = UUID.randomUUID()
+        }
+        `when`(mockView.entryToRate).thenReturn(entry)
         presenter = EntryDetailPresenter(mockView, testConfiguration)
     }
 
@@ -37,26 +39,6 @@ class EntryDetailPresenterTest : BasePresenterTest<EntryDetailPresenter>() {
         verify<View>(mockView).showEntries(anyList<Entry>())
     }
 
-    private fun makeCompletedBallot() {
-        val completeBallot = EntryBallot(UUID.randomUUID())
-        `when`(mockView.entryBallot).thenReturn(completeBallot)
-        completeBallot.addScore(Score(mockCategory, 1))
-
-        val completedBallots = ArrayList<EntryBallot>()
-        completedBallots.add(completeBallot)
-        `when`(mockView.allBallots).thenReturn(completedBallots)
-    }
-
-    private fun makeIncompleteBallots() {
-        val incompleteBallot = EntryBallot(UUID.randomUUID()).apply {
-            addScore(Score(Category("TEST", "TEST"), 0))
-            addScore(Score(Category("TESTER", "TEST"), 0))
-        }
-
-        `when`(mockView.entryBallot).thenReturn(incompleteBallot)
-        `when`(mockView.allBallots).thenReturn(listOf(incompleteBallot))
-    }
-
     @Test
     fun onPageSwipedShouldCauseViewToUpdateToolbarTitle() {
         `when`(mockView.allEntries).thenReturn(listOf(Entry(), Entry()))
@@ -95,16 +77,35 @@ class EntryDetailPresenterTest : BasePresenterTest<EntryDetailPresenter>() {
     }
 
     @Test
-    fun onPageScrolledShouldCauseViewToSetNextInvisible() {
-        `when`(mockEntry.isCompletelyScored).thenReturn(false)
+    fun onPageScrolledShouldCauseViewToSetNextInvisibleWhenEntriesAreNotCompletelyScored() {
+        entry.setCategoriesSize(1)
         presenter.onPageScrolled()
         verify<View>(mockView).setNextEnabled(false)
     }
 
     @Test
-    fun onPageScrolledShouldCauseViewToSetNextVisibleWhenBallotIsScored() {
-        `when`(mockEntry.isCompletelyScored).thenReturn(true)
+    fun onPageScrolledShouldCauseViewToSetNextVisibleWhenEntriesAreCompletelyScored() {
         presenter.onPageScrolled()
         verify<View>(mockView).setNextEnabled(true)
     }
+
+    private fun makeCompletedBallot() {
+        val completeBallot = EntryBallot(UUID.randomUUID())
+        `when`(mockView.entryBallot).thenReturn(completeBallot)
+        completeBallot.addScore(Score(mockCategory, 1))
+
+        val completedBallots = ArrayList<EntryBallot>()
+        completedBallots.add(completeBallot)
+        `when`(mockView.allBallots).thenReturn(completedBallots)
+    }
+
+    private fun makeIncompleteBallots() {
+        val incompleteBallot = EntryBallot(UUID.randomUUID()).apply {
+            addScore(Score(Category("TEST", "TEST"), 0))
+            addScore(Score(Category("TESTER", "TEST"), 0))
+        }
+
+        `when`(mockView.entryBallot).thenReturn(incompleteBallot)
+        `when`(mockView.allBallots).thenReturn(listOf(incompleteBallot))
+    }
 }

app/src/test/java/io/intrepid/contest/screens/contestjudging/scoreentries/entrydetail/EntryDetailPresenterTest.kt

@@ -1,34 +1,27 @@
 package io.intrepid.contest.screens.contestoverview
 
-import org.junit.Before
-import org.junit.Test
-import org.mockito.Mock
-
-import java.util.ArrayList
-import java.util.UUID
-
 import io.intrepid.contest.R
 import io.intrepid.contest.models.Category
 import io.intrepid.contest.models.Contest
-import io.intrepid.contest.models.Entry
 import io.intrepid.contest.models.ScoreWeight
 import io.intrepid.contest.rest.ContestWrapper
 import io.intrepid.contest.screens.contestoverview.ContestOverviewContract.View
 import io.intrepid.contest.testutils.BasePresenterTest
 import io.reactivex.Observable
-
 import io.reactivex.Observable.error
-import org.mockito.ArgumentMatchers.any
-import org.mockito.ArgumentMatchers.anyInt
-import org.mockito.ArgumentMatchers.anyList
-import org.mockito.Mockito.verify
+import org.junit.Before
+import org.junit.Test
+import org.mockito.ArgumentMatchers.*
+import org.mockito.Mock
 import org.mockito.Mockito.`when`
+import org.mockito.Mockito.verify
+import java.util.*
 
 class ContestOverviewPresenterTest : BasePresenterTest<ContestOverviewPresenter>() {
     @Mock
     private lateinit var mockView: View
-    @Mock
-    private lateinit var mockContest: Contest
+
+    private var contest: Contest = Contest()
 
     @Before
     fun setup() {
@@ -37,15 +30,6 @@ class ContestOverviewPresenterTest : BasePresenterTest<ContestOverviewPresenter>
         `when`(mockPersistentSettings.currentContestId).thenReturn(UUID.randomUUID())
     }
 
-    private fun setupSuccessfulContestDetailsCall() {
-        val response = ContestWrapper(mockContest)
-        `when`(mockRestApi.getContestDetails(any<String>())).thenReturn(Observable.just(response))
-    }
-
-    private fun setupFailedContestDetailsCall() {
-        `when`(mockRestApi.getContestDetails(any<String>())).thenReturn(error<ContestWrapper>(Throwable()))
-    }
-
     @Test
     fun onViewCreatedShouldShowErrorOnContestDetailCallFailure() {
         setupFailedContestDetailsCall()
@@ -91,7 +75,6 @@ class ContestOverviewPresenterTest : BasePresenterTest<ContestOverviewPresenter>
 
     @Test
     fun onViewCreatedShouldCauseVIewToShowContestTitle() {
-        `when`<List<Entry>>(mockContest.entries).thenReturn(ArrayList<Entry>())
         setupSuccessfulContestDetailsCall()
 
         presenter.onViewCreated()
@@ -133,4 +116,14 @@ class ContestOverviewPresenterTest : BasePresenterTest<ContestOverviewPresenter>
         presenter.onBackPressed()
         verify<View>(mockView).returnToSplashScreen()
     }
+
+    private fun setupSuccessfulContestDetailsCall() {
+        contest.entries = mutableListOf()
+        val response = ContestWrapper(contest)
+        `when`(mockRestApi.getContestDetails(any<String>())).thenReturn(Observable.just(response))
+    }
+
+    private fun setupFailedContestDetailsCall() {
+        `when`(mockRestApi.getContestDetails(any<String>())).thenReturn(error<ContestWrapper>(Throwable()))
+    }
 }