From c1803bc34b2d81feb1bfe27b985d6d53566eaa9f Mon Sep 17 00:00:00 2001
From: tmnaqeesha <tmnaqeesha@users.noreply.github.com>
Date: Tue, 6 May 2025 01:28:14 +0200
Subject: [PATCH] fix: Modify code for addItemBook
---
.../opinion/Member.class | Bin 1315 -> 1313 bytes
.../opinion/SocialNetwork.class | Bin 5026 -> 5762 bytes
src/opinion/Book.java | 59 +++---
src/opinion/SocialNetwork.java | 175 ++++++++++++------
src/tests/AddItemBookTest.java | 6 +-
5 files changed, 144 insertions(+), 96 deletions(-)
diff --git a/out/production/infrastructureLogicielleClient/opinion/Member.class b/out/production/infrastructureLogicielleClient/opinion/Member.class
index 824d8034b28d2b0bec55038626bb054a9d641a83..634aa10b77e3bd83e05c4609611987517fba92d4 100644
GIT binary patch
delta 80
zcmZ3?wUBEAKa;44Pkwr4o`RJEBUeCCep+Tus+9ucW;LeijDnI3EDTZ%oD9+od<-%S
k!VI#L&oM_as!Y~ov0>DioW^3qXgYZ@iz}n;<d-Z~0OoWO7ytkO
delta 90
zcmZ3;wU}!IKa;qaPkwr4o`RJEqe4JYep+Tus+9sGm%?Thrs<4=q6{nyVho%N;tYHY
r5)8r&l9SIcM=@$nUdSRk*@i`((Fn|{WKn0dp1hF7mC=3ja~3NAsTLIR
diff --git a/out/production/infrastructureLogicielleClient/opinion/SocialNetwork.class b/out/production/infrastructureLogicielleClient/opinion/SocialNetwork.class
index 31b85354a7afa51719a2d6b71378b0a18e67e509..3b11728184a05dad4c2b5ade53362ab5c3de7a85 100644
GIT binary patch
literal 5762
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
delta 2723
zcmZqDU8K%+>ff$?3=9k|496yNEs_>yWZ=w8%1zBpN-Zj8WMK5<Vqj+w<zWzG5TE!#
zja!mIik(54he3uxcCsR)I)@~KJP(5cgW}`>Mg>OY$%Tx<97+tTJPc|K>XUmIRopch
zwAdN6c^GsU)EOBBvJ%S@^>Y&Q()EK&iZb)k85y`s@<R&>Qj44ui&ME6G#T`G81z9(
zSxSmBb3p=zJPbw*#*>dQDN1uOC^4AwFqnblxzkfi0uqah%kzs;xEM4i^D<4X=U{MU
zWDqOKEXhe#$ShXKE6vGK$S+bz%`GUY<YeGxaOYw0VBlwD;K<1=E^*4w&t_-vVr1aS
zFUZWx%+J#YiGY;(@G$r?_%SlDB<1I4Gcxe`AS<xuV(?@L;9&>^If5fSwIl>&9S1`&
zBg14vW>q0RNXP}Hre_wHq!uwUh)#Co5@CsAXNa7<npuZ8f`OTfftw+Qhar|BZgL2-
zHMbH&0uKW#Ln0%C<zz(;^T~27Y;4Iq3@Hq$leJhB_|th9G8l{*8JH7OQrH=?Cb25n
z<}flygk)qEE0h+e7Ad6Urxq*Z<(DX=R%8~Ja4}>uIDl-(=V2&d2xnyADND@BOi3(B
z1^I@Zp=h!@tDZn1$Q7Opr67yT7#XZU7HfEFhH)@dFfuTJ!nulvp&IPPl6**12{AA*
z)bcRYG1N~sV3T3An5@X5I=Prll(BJgCtJ;AS@t87Kd`T!yp&@Z<C4ifoQoM(PyWEE
zwpf9SQDP?}12ZEd7e5=rZZ3vB413ub_JIuAKiQi5GUK7i{5)DLM;IC8CNJO?pIpby
zJ~^64sJ?-Lm4S(YkAa_ok)er!fq{vknSluuC}6e_gD{x(K$34^U;@P(0|Qu$m4S_c
zk)f4=fx(-BnSqgkfk9MjI|HNEZU*+q?F^h-8Mw5Vw=xK91RK-Fz`!8Hz{0@5AjiPM
zAkV<hP_Mus!l1;^&cMLH1JTXU!O+RTz`)4R#b5<BS)YLsEXS&~g+X8q+$5023=HZ>
znpxqRyWyI3pqiPO(RJ!Fv@_Jh>}7&$?IA*|DUziKonZ{&P#14vU;=wHKx+#F*ER+b
zU!9!{5{wKp860$WGRQG99AHrL)7{3PvaOy$V;h66_BJrJjlp0hgN*Jr1``M$S(ue&
z&GP?y!G2(70EMF%11kdqgC&DBgB61jgAIcxgDrzMg9F%M3JlB)(hLR+y$q=g%nS?+
z0Z`9@SbYrr42%pD7#JA%7?}TvGH|dnNd9JU`o+M+zzE7K3``8IlbiS)>p_-CF|dJ4
zEG7n520jKi1_=fa1{DTR20aEputi#6UmC!TH(-Dm&%j{7Fp;63fr){ML62b)!(;|#
zu$7z)EPojI7&*B)8Ky8WFt9K%GFUS(f-(@uS_TG&3k=L)e}yvF+iD+U;MU&8V9v6b
zfp<59b)=BXb_V<XT3Z<0wlRqK=|V$PR~H(ho>nZ-0MpvS;JuB(9}<Y*KxJjIUH<=q
z3@8OaLQjc-gMon|h=GYAn1PQWgh7HKjKPE<oWYMFf+2t*iXoVxJ{s;r69yTEsSJK#
zzlOs78p<#Y9F!m<Kt5yw`%sX973{-54D9R-lKP-vMfT}*hD4}O_cO484fN4H4)tCT
z*n8UB7(!+;aPO{Xh=|<I5Vc=RTW1?X^h^eIt=$Ytk=i=C+Zp1wG9-Z#mev-Aq-_jo
z;aZVf7z9`npxF%KK{W<W1_p*C1{Q{720n&V1~G;-204Zd26cu^22+MC21kZ$25*K!
zxE~o9eBeIw0mWiHILrA!qY)%MgP|W9jjRmJeEd4#C}d+`Vz6e2U;riVSx~QCXJBVw
zXJBCPg1OyU3*@U=Ab(~?3T1C+$lb4{yNw|a<WGje$n6Zp`?Yp6ct+|<vPiOuvTbK5
z*~(Dw4T@<<RHlW4$`6RgATd|Yz{ya-AjnY3Ak9$2pv+Lqpv}<0V9U_R;K|Se_LK+2
z32;w&fjkBFlNa1iUf?JM<q$81*$n;Q`0!$w!_d#b3Mv`A80InvGq8c<m6d^6nqL;|
zWex^r25W{)hC&8LhItJ0p`I>eU;w8nMvzmPz*!VhK=p#169kcjJBJbO97ecv7~#%g
zWSCtKbq^!M0<e2PMdCt+esG3lWLU%?%)pM~n#Bx^3`-f7L0uEazz9~!#Jvu!yqpGh
zjvYi6?i?n#bC{scsRz{spcD=Y9wvt63@gCF!^E%>>>N;{h6Thb21ZaN1}*z0K+8To
zp>iKkDn%~-q!GoRw(d5D%3TaK3=BTY|3A{+z`(!&iC{><Hmjb2nPE1A9K#$2O@_G)
zIt=r`?go`?atz$?l1&fl17-$ohBe^q2r1c^{xWd0Gib6iNd96_U|?ieOGL=50NVfy
z8GlGU1PTRMnFb3QkQnhHvyNds12aSG<nyAE;4&4GD%OE56JuZkCmWbu9N-kd2##1t
z;RvadH!yHAY-HF34Pk9?{m8(8k<_+>4TV&sj0~F@wtxe5D>wygW7y6h4N9Vn47(T@
W8FnxnU;wp17#R*S9A-GmAPE3YWXePU
diff --git a/src/opinion/Book.java b/src/opinion/Book.java
index e9e4890..cb0efbc 100644
--- a/src/opinion/Book.java
+++ b/src/opinion/Book.java
@@ -1,7 +1,5 @@
package opinion;
-import java.util.LinkedList;
-
/**
* This class allows us to create books and to register new books
*/
@@ -12,14 +10,12 @@ public class Book {
private int nbPages;
private float mark;
-
-
/**
- * Initialization of private class variables by the constructor
- * @param title
- * @param kind
- * @param author
- * @param nbPages
+ * Initialization of private variables with constructor
+ * @param title The title of the book
+ * @param kind The type of the book
+ * @param author The author of the book
+ * @param nbPages The number of pages of the book
*/
public Book(String title, String kind, String author, int nbPages) {
this.title = title;
@@ -28,62 +24,51 @@ public class Book {
this.nbPages = nbPages;
}
-
/**
- * String function to retrieve the book's title
- * @return
+ * Return the title of the book
+ * @return book's title
*/
public String getTitle() {
return this.title;
}
-
/**
- * String function to retrieve the book's kind
- * @return the kind of the book
+ * Return the kind of the book
+ * @return book's kind
*/
public String getKind() {
return this.kind;
}
-
/**
- * String function to retrieve the book's author
- * @return the author
+ * Retrieve the author of the book
+ * @return book's author
*/
public String getAuthor() {
return this.author;
}
-
/**
- * Integer function to retrieve the book's number of pages
- * @return the number of pages
+ * Return the number of pages of the book
+ * @return book's page number
*/
public int getNbPages() {
return this.nbPages;
}
-
-
/**
- * Boolean function to know if the book is already present in the database
- * @param title
- * @return true or false
+ * Identify if the current book's title is similar as another book
+ * @param title2 other's book's title
+ * @return true if same, false if different
*/
- public boolean isCalled(String title) {
- String titleUpperCase = this.title.toUpperCase().trim();
- if(titleUpperCase.equals(title.toUpperCase().trim())) {
- return true;
- }
- return false;
+ public boolean compareTitle(String title2) {
+ String formattedTitle = this.title.toUpperCase().trim();
+ String formattedTitle2 = title2.toUpperCase().trim();
+ return formattedTitle.equals(formattedTitle2);
}
-
-
-
/**
- * String function to didsplay the values of a book
- * @return the values
+ * String function to display the details of a book
+ * @return the book's details
*/
public String toString() {
return "Book : "+getTitle()+"\nKind : "+getKind()+"\nAuthor : "+getAuthor()+"\nNumber of pages : "+getNbPages();
diff --git a/src/opinion/SocialNetwork.java b/src/opinion/SocialNetwork.java
index bd05cc5..c54cf3c 100644
--- a/src/opinion/SocialNetwork.java
+++ b/src/opinion/SocialNetwork.java
@@ -32,9 +32,9 @@ public class SocialNetwork implements ISocialNetwork {
*/
public SocialNetwork() {
listMember = new LinkedList<Member>();
- nbmembers=0;
- nbbooks=0;
-
+ listBook = new LinkedList<Book>();
+ nbmembers = 0;
+ nbbooks = 0;
}
/**
@@ -49,6 +49,7 @@ public class SocialNetwork implements ISocialNetwork {
/**
* Returns number of films.
+ * @return 0
*/
@Override
public int nbFilms() {
@@ -58,54 +59,85 @@ public class SocialNetwork implements ISocialNetwork {
/**
* Returns number of books.
+ * @return number of books
*/
@Override
public int nbBooks() {
// TODO Auto-generated method stub
- return 0;
+ return nbbooks;
}
/**
* Checks whether a member already exists.
- * @param login the login to check
+ * @param login the login to be checked
* @return true if login exists, else return false
*/
public boolean memberRegister(String login) {
- for(Member m : listMember) {
- if(m.getLogin().toUpperCase().trim().equals(login.toUpperCase().trim())) {
-
- if (m.getPassword().toUpperCase().trim().equals(login.toUpperCase().trim())) {
- return true;
- }
+ for (Member m : listMember) {
+ if (m.getLogin().trim().equalsIgnoreCase(login.trim())) {
+ return true;
}
- }return false;
+ }
+ return false;
}
+ /**
+ * Validates the format of a user's login and password (not empty or too short)
+ * @param login the login to be validated
+ * @param password the password to be validated
+ * @return true if login and password are valid
+ * @throws BadEntryException if either login or password is invalid
+ */
public boolean validateuser(String login, String password) throws BadEntryException{
boolean result = false;
- if(login==null || login.length()<=1 ){
+ if(login == null || login.length() <= 1){
throw new BadEntryException("login is null or empty");
}
- if(password==null || password.length()<=1 ){
+ if(password == null || password.length() <= 1 ){
throw new BadEntryException("password is null or empty");
}
+ return true;
+ }
-
- else
- return true;
+ /**
+ * Authenticates a user's login and password
+ * @param login the login of the user
+ * @param password the password of the user
+ * @return true if password corresponds to registered login, false if wrong password
+ */
+ private boolean authenticateUser(String login, String password) {
+ for (Member m : listMember) {
+ if (m.getLogin().trim().equalsIgnoreCase(login.trim()) &&
+ m.getPassword().trim().equals(password.trim())) {
+ return true;
+ }
+ }
+ return false;
}
+ /**
+ * Checks if a book title is valid (not empty or too short) and if the book already exists
+ * @param title the title of the book to be validated
+ * @return true if book does not exist yet in system, false if already exists
+ * @throws BadEntryException if title is empty or too short
+ */
public boolean validatebook(String title) throws BadEntryException {
boolean result = false;
- if(title==null || title.length()<=1 ){
+ if(title == null || title.length() <= 1 ){
throw new BadEntryException("title is null or empty");
}
- for(Book b : listBook) {
- if(title.toUpperCase().trim().equals(book.getTitle().toUpperCase().trim())) {
- result = true;
+// for(Book b : listBook) {
+// if(title.toUpperCase().trim().equals(book.getTitle().toUpperCase().trim())) {
+// result = true;
+// }
+// }
+// return result;
+ for (Book b : listBook) {
+ if (b.compareTitle(title)) {
+ return true;
}
}
- return result;
+ return false;
}
/**
@@ -118,48 +150,71 @@ public class SocialNetwork implements ISocialNetwork {
*/
@Override
public void addMember(String login, String password, String profile) throws BadEntryException, MemberAlreadyExistsException{
- if (profile==null){
+ if (profile == null){
throw new BadEntryException("profile is null or empty");
}
+ validateuser(login, password);
if (memberRegister(login)) {
throw new MemberAlreadyExistsException();
}
- if(validateuser(login, password) ){
- member = new Member(login, password, profile);
- listMember.add(member);
- nbmembers++;
- }
-
- if(validateuser(login, password) ){
- member = new Member(login, password, profile);
- listMember.add(member);
- nbmembers++;
- }
-
-
-
-
+ member = new Member(login.trim(), password.trim(), profile.trim());
+ listMember.add(member);
+ nbmembers++;
}
+ /**
+ * Adds a new book to the social network.
+ * @param login login of the member adding the book
+ * @param password password of the member adding the book
+ * @param title the new book's title
+ * @param kind the new book's kind
+ * @param author the new book's author
+ * @param nbPages number of pages of the new book's
+ * @throws BadEntryException if any input is invalid (empty or number pages equal or less than 0)
+ * @throws NotMemberException if login or password is wrong
+ * @throws ItemBookAlreadyExistsException if book already exists in system
+ */
@Override
- public void addItemBook(String login, String password, String title,
- String kind, String author, int nbPages) throws BadEntryException,
- NotMemberException, ItemBookAlreadyExistsException {
- if (validateuser(login,password)){
- if (!memberRegister(login)) {
- throw new NotMemberException("This user does not exist");
-
- }
- if (validatebook(title)) {
+ public void addItemBook(String login, String password, String title, String kind, String author, int nbPages) throws BadEntryException, NotMemberException, ItemBookAlreadyExistsException {
+ validateuser(login, password);
+ if (title == null || title.trim().isEmpty())
+ throw new BadEntryException("Error: Invalid title.");
+ if (kind == null || kind.trim().isEmpty())
+ throw new BadEntryException("Error: Invalid kind.");
+ if (author == null || author.trim().isEmpty())
+ throw new BadEntryException("Error: Invalid author.");
+ if (nbPages <= 0)
+ throw new BadEntryException("Error: Invalid number of pages.");
+ if (!authenticateUser(login, password))
+ throw new NotMemberException("Error: User doesn't exist");
+ for (Book b : listBook) {
+ if (b.compareTitle(title)) {
throw new ItemBookAlreadyExistsException();
}
- else{
- book = new Book(title, kind, author, nbPages);
- listBook.add(book);
- }
}
+ Book newBook = new Book(title.trim(), kind.trim(), author.trim(), nbPages);
+ listBook.add(newBook);
+ nbbooks++;
}
+// public void addItemBook(String login, String password, String title,
+// String kind, String author, int nbPages) throws BadEntryException,
+// NotMemberException, ItemBookAlreadyExistsException {
+// if (validateuser(login,password)){
+// if (!memberRegister(login)) {
+// throw new NotMemberException("This user does not exist");
+//
+// }
+// if (validatebook(title)) {
+// throw new ItemBookAlreadyExistsException();
+// }
+// else{
+// book = new Book(title, kind, author, nbPages);
+// listBook.add(book);
+// }
+// }
+// }
+
@Override
public void addItemFilm(String login, String password, String title, String kind, String director, String scriptwriter, int duration)
throws BadEntryException, NotMemberException, ItemFilmAlreadyExistsException {
@@ -172,14 +227,22 @@ public class SocialNetwork implements ISocialNetwork {
return 0;
}
+ /**
+ * Displays a whole list of registered members
+ * @return list of registered members
+ */
public String toString(){
- String ret = "";
- for (Member m : listMember) {
- ret += m.toString() + "\n";
+ if (listMember.isEmpty()) {
+ return "There are currently no registered members :(";
}
- return ret;
+ String ret = "\nRegistered members:\n";
+ int counter = 1;
+ for (Member m : listMember) {
+ ret += counter + ". " + m.toString() + "\n";
+ counter++;
+ }
+ return ret.trim();
//return (listMember.toString());
-
}
@Override
diff --git a/src/tests/AddItemBookTest.java b/src/tests/AddItemBookTest.java
index 282be8f..2b559e2 100644
--- a/src/tests/AddItemBookTest.java
+++ b/src/tests/AddItemBookTest.java
@@ -272,9 +272,9 @@ public class AddItemBookTest {
// exception
//populate 'sn' with 3 members
- nbErrors += addMemberOKTest(sn,"Paul","paul","","1.0a");
- nbErrors += addMemberOKTest(sn,"Antoine","antoine","", "1.0b");
- nbErrors += addMemberOKTest(sn,"Alice", "alice","", "1.0c");
+ nbErrors += addMemberOKTest(sn,"Paul","paul","Student","1.0a");
+ nbErrors += addMemberOKTest(sn,"Antoine","antoine","Philosopher", "1.0b");
+ nbErrors += addMemberOKTest(sn,"Alice", "alice","F1 driver", "1.0c");
nbTests++;
--
GitLab