Add rating field to Book #66

592363789 · 2018-03-12T15:34:00Z

the simple structure of rate

…ETEST

…kTest, BookBuilder, AddCommandSystemTst.java

…struction of book

…ebook

takuyakanbr

Rename Rate to Rating and update all instances of rate to rating. It doesn't make sense to say "the book's rate".

Rating should store an integer between -1 and 5 (both inclusive). Make sure to check its validity in the constructor.

You also should not be adding fields to BookDeserializer and BookShelfDeserializer.

takuyakanbr · 2018-03-17T10:32:33Z

src/main/java/seedu/address/model/book/Rate.java

+ * Represents a book's rate.
+ * Guarantees: immutable.
+ */
+public class Rate {


Rename this class to Rating. (Shift+F6 or Refactor -> Rename)
Don't forget to change variables and descriptions to rating.

takuyakanbr · 2018-03-17T10:33:13Z

src/main/java/seedu/address/model/book/Rate.java

+ */
+public class Rate {
+
+    public final String rate;


This should be an int between -1 to 5 (both inclusive).

takuyakanbr · 2018-03-17T10:35:49Z

src/main/java/seedu/address/model/book/Rate.java

+     *
+     * @param rate A book rate.
+     */
+    public Rate(String rate) {


This should take in an int rating.
Check the validity of the input using AppUtil.checkArgument, in a similar way to this.

takuyakanbr · 2018-03-17T10:37:56Z

src/main/java/seedu/address/network/api/google/BookDeserializer.java

@@ -100,6 +101,7 @@ public void setVolumeInfo(JsonVolumeInfo volumeInfo) {
        private String publisher = "";
        private String publishedDate = "";
        private String description = "";
+        private String rate = "";


Remove this field.

takuyakanbr · 2018-03-17T10:38:06Z

src/main/java/seedu/address/network/api/google/BookDeserializer.java

@@ -46,7 +46,8 @@ public Book deserialize(JsonParser jp, DeserializationContext ctxt) throws IOExc
        return new Book(new Gid(root.id), isbn,
                BookDataUtil.getAuthorSet(volumeInfo.authors), new Title(volumeInfo.title),
                getCategorySet(volumeInfo.categories), getDescription(volumeInfo.description),
-                new Publisher(volumeInfo.publisher), new PublicationDate(volumeInfo.publishedDate));
+                new Rate(volumeInfo.rate), new Publisher(volumeInfo.publisher),


Use the default rating instead.

takuyakanbr · 2018-03-17T10:40:02Z

src/test/data/BookShelfDeserializerTest/ValidResponseDuplicateBooks.json

@@ -56,6 +57,7 @@
        "publisher": "ABC Publishing House",
        "publishedDate": "2018-03-10",
        "description": "This is a valid description.",
+        "rate": "-1",


Remove this line.

takuyakanbr · 2018-03-17T10:40:06Z

src/test/data/BookShelfDeserializerTest/ValidResponseDuplicateBooks.json

@@ -97,6 +99,7 @@
        "publisher": "ABC Publishing House",
        "publishedDate": "2018-03-10",
        "description": "This is a valid description.",
+        "rate": "-1",


Remove this line.

takuyakanbr · 2018-03-17T10:40:09Z

src/test/data/BookShelfDeserializerTest/ValidResponseNoDesc.json

@@ -14,6 +14,7 @@
        ],
        "publisher": "ABC Publishing House",
        "publishedDate": "2018-03-10",
+        "rate": "-1",


Remove this line.

takuyakanbr · 2018-03-17T10:40:14Z

src/test/data/BookShelfDeserializerTest/ValidResponseNoDesc.json

@@ -54,6 +55,7 @@
        ],
        "publisher": "ABC Publishing House",
        "publishedDate": "2018-04-10",
+        "rate": "-1",


Remove this line.

takuyakanbr · 2018-03-17T10:40:44Z

src/test/data/XmlBookShelfStorageTest/invalidAndValidBookBookShelf.xml

@@ -4,6 +4,7 @@
    <books>
        <title>Artemis</title>
        <description>This is Artemis.</description>
+        <rate>Rate</rate>>


Remove the extra > at the end of the line. Do the same for the other .xml files you modified.

takuyakanbr · 2018-03-18T16:56:12Z

docs/DeveloperGuide.adoc

@@ -978,18 +978,18 @@ Use case ends.

 1. User obtains a list of books by listing (<<Use case: UC1 - View my reading list, *UC1*>>)
 or searching (<<Use case: UC2 - Search for books,*UC2*>>).
-2. User requests to give a rating to a specific book in the list.
+2. User requests to give a rate to a specific book in the list.


Revert this change.

takuyakanbr · 2018-03-18T16:56:16Z

docs/DeveloperGuide.adoc

 3. Bibliotek shows a success message.
 +
 Use case ends.

 *Extensions*

 [none]
-* 2a. The given rating is out of range.
+* 2a. The given rate is out of range.


Revert this change.

takuyakanbr · 2018-03-18T16:56:19Z

docs/DeveloperGuide.adoc

 +
 [none]
-** 2a1. Bibliotek says that the rating is invalid and asks user to try again.
+** 2a1. Bibliotek says that the rate is invalid and asks user to try again.


Revert this change.

takuyakanbr · 2018-03-18T16:56:30Z

src/main/java/seedu/address/logic/parser/ParserUtil.java

@@ -125,4 +126,23 @@ public static Description parseDescription(String description) {
        return description.isPresent() ? Optional.of(parseDescription(description.get())) : Optional.empty();
    }

+    /**
+     * Parses a {@code String rate} into a {@code Rating}.


Parses a {@code String rating} into a {@code Rating}.

takuyakanbr · 2018-03-18T16:57:12Z

src/main/java/seedu/address/logic/parser/ParserUtil.java

+    }
+
+    /**
+     * Parses a {@code Optional<String> rate} into an {@code Optional<Rating>}


rate -> rating

takuyakanbr · 2018-03-18T16:57:31Z

src/main/java/seedu/address/model/book/Rating.java

+import static java.util.Objects.requireNonNull;
+
+/**
+ * Represents a book's rate.


rate -> rating

takuyakanbr · 2018-03-18T16:57:42Z

src/main/java/seedu/address/model/book/Rating.java

+    public final Integer rating;
+
+    /**
+     * Constructs a {@code Description}.


Description -> Rating

takuyakanbr · 2018-03-18T16:58:56Z

src/test/java/seedu/address/logic/commands/CommandTestUtil.java

    public static final String VALID_ISBN_ARTEMIS = "234910247";
    public static final String VALID_ISBN_BABYLON = "907161513";

+


Remove this extra newline.

takuyakanbr · 2018-03-18T16:59:01Z

src/test/java/seedu/address/logic/commands/CommandTestUtil.java

    public static final String ISBN_DESC_ARTEMIS = " " + PREFIX_ISBN + VALID_ISBN_ARTEMIS;
    public static final String ISBN_DESC_BABYLON = " " + PREFIX_ISBN + VALID_ISBN_BABYLON;

+


Remove this extra newline.

takuyakanbr · 2018-03-19T15:42:02Z

src/test/java/seedu/address/logic/commands/CommandTestUtil.java

@@ -34,6 +35,8 @@
    public static final String VALID_CATEGORY_BABYLON = "Fiction";
    public static final String VALID_DESCRIPTION_ARTEMIS = "This is Artemis.";
    public static final String VALID_DESCRIPTION_BABYLON = "This is Babylon's Ashes.";
+    public static final String VALID_RATING_ARTEMIS = "This is Artemis.";


public static final int VALID_RATING_ARTEMIS = 5; public static final int VALID_RATING_BABYLON = 4;

takuyakanbr · 2018-03-19T15:43:51Z

src/main/java/seedu/address/model/book/Rating.java

+ */
+public class Rating {
+
+    public final Integer rating;


Use an int instead?

takuyakanbr · 2018-03-19T15:43:57Z

src/main/java/seedu/address/model/book/Rating.java

+     *
+     * @param rating A book rating.
+     */
+    public Rating(Integer rating) {


Use an int instead?

Using int will cause some error in the following override methods, so I changed to Integer

takuyakanbr · 2018-03-19T15:44:17Z

src/main/java/seedu/address/storage/XmlAdaptedBook.java

@@ -34,6 +35,8 @@
    @XmlElement(required = true)
    private String description;
    @XmlElement(required = true)
+    private Integer rating;


Use an int instead, if possible.

592363789 added 7 commits March 12, 2018 21:14

add rate class into model

8e0a684

add rate into BookBuilder, Book in model

84909f0

add rate into XmlAdatpedBook.java in model

82546f8

ADD RATE INTO CLISYNTAX, COMMANDTESTUTIL, ADDCOMMANDPASERTEST AND RAT…

ac8d146

…ETEST

add rate attribute into BookDeserializer and BookShelfDeserializer.java

0e68d9f

ADD IN rate to ParserUtil, XmlUtilTest, ParserUtilTest, XmlAdaptedBoo…

83fca9d

…kTest, BookBuilder, AddCommandSystemTst.java

delete ratecommand

af67199

592363789 added the status.in_progress Currently being worked on label Mar 12, 2018

592363789 added this to the v1.1 milestone Mar 12, 2018

592363789 and others added 12 commits March 13, 2018 19:07

add default value(string , have not change to int yet) as "-1" in con…

3e6147c

…struction of book

fix the error of the constuctor of book

62bd703

fix bugs in testing(still string testing)

6fda165

fix checkstyle errors

bae8ffd

fix some checkstyle errors

c0cb498

fix problem about checkstyle

5a7ef36

FIX SOME CHECKSTYLE ERRORS

4284230

CHECKSTYLE FIX

74575d6

fix PR Quality Review

7ffb8fd

Merge branch 'master' into ratebook

1649f25

add some coverage

a050ee5

Merge branch 'ratebook' of https://github.com/592363789/main into rat…

102bd98

…ebook

takuyakanbr removed this from the v1.1 milestone Mar 15, 2018

592363789 and others added 5 commits March 16, 2018 15:33

Merge branch 'master' into ratebook

5737e1f

Update Book.java

0b6ff00

resolve conflicits

cb99b1b

clear the checkstyle

f3cc484

add converage

554862e

592363789 added status.completed Ready to be reviewed and removed status.completed Ready to be reviewed labels Mar 16, 2018

592363789 removed the status.in_progress Currently being worked on label Mar 17, 2018

592363789 changed the title ~~Ratebook~~ Ratebook for add attribute Mar 17, 2018

takuyakanbr requested changes Mar 17, 2018

View reviewed changes

takuyakanbr changed the title ~~Ratebook for add attribute~~ Add rating field to Book Mar 17, 2018

592363789 added 5 commits March 17, 2018 21:01

improve rate to rating without changing to int

2734a71

change rating issues

4b7e9d2

solve the string into integer problem and checkstyle

c29416c

fix rate to rating

f643581

delete two lines of rate -1

a7275c5

takuyakanbr requested changes Mar 18, 2018

View reviewed changes

fix some grammar mistakes

2da4498

takuyakanbr requested changes Mar 19, 2018

View reviewed changes

fix some bugs

b66d010

takuyakanbr approved these changes Mar 20, 2018

View reviewed changes

takuyakanbr merged commit cf155e6 into CS2103JAN2018-F14-B4:master Mar 20, 2018

takuyakanbr added type.task Something that the developer can do status.accepted Accepted and removed status.completed Ready to be reviewed labels Mar 20, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add rating field to Book #66

Add rating field to Book #66

592363789 commented Mar 12, 2018

takuyakanbr left a comment •

edited

takuyakanbr Mar 17, 2018

takuyakanbr Mar 17, 2018 •

edited

takuyakanbr Mar 17, 2018

takuyakanbr Mar 17, 2018

takuyakanbr Mar 17, 2018

takuyakanbr Mar 17, 2018

takuyakanbr Mar 17, 2018

takuyakanbr Mar 17, 2018

takuyakanbr Mar 17, 2018

takuyakanbr Mar 17, 2018

takuyakanbr Mar 18, 2018

takuyakanbr Mar 18, 2018

takuyakanbr Mar 18, 2018

takuyakanbr Mar 18, 2018

takuyakanbr Mar 18, 2018

takuyakanbr Mar 18, 2018

takuyakanbr Mar 18, 2018

takuyakanbr Mar 18, 2018

takuyakanbr Mar 18, 2018

takuyakanbr Mar 19, 2018

takuyakanbr Mar 19, 2018

takuyakanbr Mar 19, 2018

592363789 Mar 20, 2018

takuyakanbr Mar 19, 2018

		public static final String VALID_ISBN_ARTEMIS = "234910247";
		public static final String VALID_ISBN_BABYLON = "907161513";

		public static final String ISBN_DESC_ARTEMIS = " " + PREFIX_ISBN + VALID_ISBN_ARTEMIS;
		public static final String ISBN_DESC_BABYLON = " " + PREFIX_ISBN + VALID_ISBN_BABYLON;

Add rating field to Book #66

Add rating field to Book #66

Conversation

592363789 commented Mar 12, 2018

takuyakanbr left a comment • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

takuyakanbr Mar 17, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

takuyakanbr left a comment •

edited

takuyakanbr Mar 17, 2018 •

edited