From 72aa6d743affe138c1540d37db01b9cf11b35919 Mon Sep 17 00:00:00 2001 From: Yas Hassan Pour Date: Thu, 16 May 2024 10:17:30 +0330 Subject: [PATCH 01/11] Start --- .../Yas_HasssanPour_40231712003/.gitignore | 38 +++++++++++++++++++ .../.idea/.gitignore | 3 ++ .../.idea/encodings.xml | 7 ++++ .../.idea/misc.xml | 14 +++++++ .../Yas_HasssanPour_40231712003/.idea/vcs.xml | 6 +++ Answers/Yas_HasssanPour_40231712003/pom.xml | 17 +++++++++ .../src/main/java/org/example/MyApp.java | 7 ++++ 7 files changed, 92 insertions(+) create mode 100644 Answers/Yas_HasssanPour_40231712003/.gitignore create mode 100644 Answers/Yas_HasssanPour_40231712003/.idea/.gitignore create mode 100644 Answers/Yas_HasssanPour_40231712003/.idea/encodings.xml create mode 100644 Answers/Yas_HasssanPour_40231712003/.idea/misc.xml create mode 100644 Answers/Yas_HasssanPour_40231712003/.idea/vcs.xml create mode 100644 Answers/Yas_HasssanPour_40231712003/pom.xml create mode 100644 Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/MyApp.java diff --git a/Answers/Yas_HasssanPour_40231712003/.gitignore b/Answers/Yas_HasssanPour_40231712003/.gitignore new file mode 100644 index 0000000..5ff6309 --- /dev/null +++ b/Answers/Yas_HasssanPour_40231712003/.gitignore @@ -0,0 +1,38 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/Answers/Yas_HasssanPour_40231712003/.idea/.gitignore b/Answers/Yas_HasssanPour_40231712003/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/Answers/Yas_HasssanPour_40231712003/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/Answers/Yas_HasssanPour_40231712003/.idea/encodings.xml b/Answers/Yas_HasssanPour_40231712003/.idea/encodings.xml new file mode 100644 index 0000000..aa00ffa --- /dev/null +++ b/Answers/Yas_HasssanPour_40231712003/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Answers/Yas_HasssanPour_40231712003/.idea/misc.xml b/Answers/Yas_HasssanPour_40231712003/.idea/misc.xml new file mode 100644 index 0000000..f346f33 --- /dev/null +++ b/Answers/Yas_HasssanPour_40231712003/.idea/misc.xml @@ -0,0 +1,14 @@ + + + + + + + + + + \ No newline at end of file diff --git a/Answers/Yas_HasssanPour_40231712003/.idea/vcs.xml b/Answers/Yas_HasssanPour_40231712003/.idea/vcs.xml new file mode 100644 index 0000000..b2bdec2 --- /dev/null +++ b/Answers/Yas_HasssanPour_40231712003/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Answers/Yas_HasssanPour_40231712003/pom.xml b/Answers/Yas_HasssanPour_40231712003/pom.xml new file mode 100644 index 0000000..ba51b4a --- /dev/null +++ b/Answers/Yas_HasssanPour_40231712003/pom.xml @@ -0,0 +1,17 @@ + + + 4.0.0 + + org.example + Yas_HasssanPour_40231712003 + 1.0-SNAPSHOT + + + 22 + 22 + UTF-8 + + + \ No newline at end of file diff --git a/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/MyApp.java b/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/MyApp.java new file mode 100644 index 0000000..f454a5a --- /dev/null +++ b/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/MyApp.java @@ -0,0 +1,7 @@ +package org.example; + +public class MyApp { + public static void main(String[] args) { + System.out.println("Hello world!"); + } +} \ No newline at end of file From 9b3b11b8f6adb96139d6bda237e1bd32f57247ba Mon Sep 17 00:00:00 2001 From: Yas Hassan Pour Date: Thu, 16 May 2024 10:19:29 +0330 Subject: [PATCH 02/11] Book class --- .../src/main/java/org/example/Book.java | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/Book.java diff --git a/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/Book.java b/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/Book.java new file mode 100644 index 0000000..f21a1d3 --- /dev/null +++ b/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/Book.java @@ -0,0 +1,53 @@ +package org.example; + +import java.util.HashMap; + +public class Book { + private int Unique_bookID; + private String title; + private String author; + private boolean Availability_status; + String Description; + + public int getUnique_bookID() { + return Unique_bookID; + } + + public void setUnique_bookID(int unique_bookID) { + Unique_bookID = unique_bookID; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getAuthor() { + return author; + } + + public void setAuthor(String author) { + this.author = author; + } + + public boolean isAvailability_status() { + return Availability_status; + } + + public void setAvailability_status(boolean availability_status) { + Availability_status = availability_status; + } + + + public Book (int bookID, String title, String author, String description) { + Unique_bookID = bookID; + this.title = title; + this.author = author; + this.Availability_status = true; + this.Description= description; + } +} + From 6a637ec27f8070c561e5af32046fa15115cc1634 Mon Sep 17 00:00:00 2001 From: Yas Hassan Pour Date: Thu, 16 May 2024 10:21:04 +0330 Subject: [PATCH 03/11] User class --- .../src/main/java/org/example/User.java | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/User.java diff --git a/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/User.java b/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/User.java new file mode 100644 index 0000000..25dce4b --- /dev/null +++ b/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/User.java @@ -0,0 +1,41 @@ +package org.example; + +import java.util.HashMap; + +public class User { + private String name; + private int ID; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getID() { + return ID; + } + + public void setID(int ID) { + this.ID = ID; + } + + public int getPhoneNum() { + return phoneNum; + } + + public void setPhoneNum(int phoneNum) { + this.phoneNum = phoneNum; + } + + private int phoneNum; + public User(String name, int ID, int PhoneNum) { + this.name = name; + this.ID = ID; + this.phoneNum = phoneNum; + } + +} + From c22fbbdd18effc1b737edc263636212154b18616 Mon Sep 17 00:00:00 2001 From: Yas Hassan Pour Date: Thu, 16 May 2024 10:21:59 +0330 Subject: [PATCH 04/11] Normal User class --- .../src/main/java/org/example/NormalUser.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/NormalUser.java diff --git a/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/NormalUser.java b/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/NormalUser.java new file mode 100644 index 0000000..2cbe9c8 --- /dev/null +++ b/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/NormalUser.java @@ -0,0 +1,21 @@ +package org.example; + +import java.util.Date; + +public class NormalUser extends User{ + private Date registrationDate; + + public Date getRegistrationDate() { + return registrationDate; + } + + public void setRegistrationDate(Date registrationDate) { + this.registrationDate = registrationDate; + } + + public NormalUser(String name, int ID, int phoneNum, Date registrationDate) + { + super(name,ID,phoneNum); + this.registrationDate= registrationDate; + } +} From d84b4adc87db275a2ca8c0aa956efcc442a609e0 Mon Sep 17 00:00:00 2001 From: Yas Hassan Pour Date: Thu, 16 May 2024 10:22:34 +0330 Subject: [PATCH 05/11] Admin class --- .../src/main/java/org/example/Admin.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/Admin.java diff --git a/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/Admin.java b/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/Admin.java new file mode 100644 index 0000000..5c27414 --- /dev/null +++ b/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/Admin.java @@ -0,0 +1,19 @@ +package org.example; + +public class Admin extends User{ + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + private String password; + public Admin (String name, int ID, int phoneNuM, String password) + { + super(name, ID, phoneNuM); + this.password= password; + } + +} From fbd8cccb94dbe50bc2b53052855967a0659156ff Mon Sep 17 00:00:00 2001 From: Yas Hassan Pour Date: Thu, 16 May 2024 10:23:08 +0330 Subject: [PATCH 06/11] Rent class --- .../src/main/java/org/example/Rent.java | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/Rent.java diff --git a/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/Rent.java b/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/Rent.java new file mode 100644 index 0000000..0bee890 --- /dev/null +++ b/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/Rent.java @@ -0,0 +1,46 @@ +package org.example; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class Library { + private String LibraryName; + private int capacity; + private int operatingHours; + private ListbookRepo; + private ListuserRegistries; + private ListrentalRegistries; + public Library (String LibraryName,int capacity, int operatingHours) + { + this.LibraryName= LibraryName; + this.capacity= capacity; + this.operatingHours= operatingHours; + this.bookRepo= new ArrayList<>(); + this.userRegistries= new ArrayList<>(); + this.rentalRegistries= new ArrayList<>(); + } + public void addBook(Book book) + { + bookRepo.add(book); + } + public void addUser(User user) + { + userRegistries.add(user); + } + public void rentBook(Book book, NormalUser user, int rentalID, Date rentalDate) + { + Rent rent = new Rent(book, user, rentalID, rentalDate); + rentalRegistries.add(rent); + book.setAvailability_status(false); + } + public void returnBook(Book book) + { + book.setAvailability_status(true); + } + public void removeUser (User user) + { + userRegistries.remove(user); + } + +} From b1cb90723f353a1bfb8211d7a6dbffe5bf2f6714 Mon Sep 17 00:00:00 2001 From: Yas Hassan Pour Date: Thu, 16 May 2024 10:24:21 +0330 Subject: [PATCH 07/11] Edited version for Rent class --- .../src/main/java/org/example/Rent.java | 78 ++++++++++--------- 1 file changed, 43 insertions(+), 35 deletions(-) diff --git a/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/Rent.java b/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/Rent.java index 0bee890..f84756f 100644 --- a/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/Rent.java +++ b/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/Rent.java @@ -1,46 +1,54 @@ package org.example; -import java.util.ArrayList; import java.util.Date; -import java.util.List; - -public class Library { - private String LibraryName; - private int capacity; - private int operatingHours; - private ListbookRepo; - private ListuserRegistries; - private ListrentalRegistries; - public Library (String LibraryName,int capacity, int operatingHours) - { - this.LibraryName= LibraryName; - this.capacity= capacity; - this.operatingHours= operatingHours; - this.bookRepo= new ArrayList<>(); - this.userRegistries= new ArrayList<>(); - this.rentalRegistries= new ArrayList<>(); - } - public void addBook(Book book) - { - bookRepo.add(book); + +public class Rent { + public void setBook(Book book) { + this.book = book; } - public void addUser(User user) - { - userRegistries.add(user); + + public void setNormalUser(NormalUser normalUser) { + this.normalUser = normalUser; } - public void rentBook(Book book, NormalUser user, int rentalID, Date rentalDate) - { - Rent rent = new Rent(book, user, rentalID, rentalDate); - rentalRegistries.add(rent); - book.setAvailability_status(false); + + public void setRentalID(int rentalID) { + this.rentalID = rentalID; } - public void returnBook(Book book) - { - book.setAvailability_status(true); + + public void setRentalDate(Date rentalDate) { + this.rentalDate = rentalDate; + } + + private Book book; + private NormalUser normalUser; + private int rentalID; + + public Book getBook() { + return book; + } + + public NormalUser getNormalUser() { + return normalUser; } - public void removeUser (User user) + + public int getRentalID() { + return rentalID; + } + + public Date getRentalDate() { + return rentalDate; + } + + private Date rentalDate; + public Rent (Book book, NormalUser normalUser, int rentalID, Date rentalDate) { - userRegistries.remove(user); + this.book = book; + this.normalUser= normalUser; + this.rentalID = rentalID; + this.rentalDate= rentalDate; } + + + } From f1c56a8238fb4e61d41e4b26f94e3422a9ca5dc1 Mon Sep 17 00:00:00 2001 From: Yas Hassan Pour Date: Thu, 16 May 2024 10:27:01 +0330 Subject: [PATCH 08/11] Library class --- .../src/main/java/org/example/Library.java | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/Library.java diff --git a/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/Library.java b/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/Library.java new file mode 100644 index 0000000..0bee890 --- /dev/null +++ b/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/Library.java @@ -0,0 +1,46 @@ +package org.example; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class Library { + private String LibraryName; + private int capacity; + private int operatingHours; + private ListbookRepo; + private ListuserRegistries; + private ListrentalRegistries; + public Library (String LibraryName,int capacity, int operatingHours) + { + this.LibraryName= LibraryName; + this.capacity= capacity; + this.operatingHours= operatingHours; + this.bookRepo= new ArrayList<>(); + this.userRegistries= new ArrayList<>(); + this.rentalRegistries= new ArrayList<>(); + } + public void addBook(Book book) + { + bookRepo.add(book); + } + public void addUser(User user) + { + userRegistries.add(user); + } + public void rentBook(Book book, NormalUser user, int rentalID, Date rentalDate) + { + Rent rent = new Rent(book, user, rentalID, rentalDate); + rentalRegistries.add(rent); + book.setAvailability_status(false); + } + public void returnBook(Book book) + { + book.setAvailability_status(true); + } + public void removeUser (User user) + { + userRegistries.remove(user); + } + +} From 94f845a52a76992a1738d06cbc5751f0c6f6c8ce Mon Sep 17 00:00:00 2001 From: Yas Hassan Pour Date: Thu, 16 May 2024 11:04:39 +0330 Subject: [PATCH 09/11] implementing CLI class --- .../src/main/java/org/example/CLI.java | 10 ++++++++++ .../src/main/java/org/example/MyApp.java | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/CLI.java diff --git a/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/CLI.java b/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/CLI.java new file mode 100644 index 0000000..dec135b --- /dev/null +++ b/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/CLI.java @@ -0,0 +1,10 @@ +package org.example; + +import java.util.Scanner; + +public class CLI { + Scanner scanner = new Scanner(System.in); + System.out.println("Welcom to our library! What can we do for you?\n lib add book: add a new book to the library\n lib get hrs: Retrieve library opening hours\n lib rent: Rent a book from the library\nlib add member : Add a new member to the library (admin privilege requered\n "); + String input = scanner.nextLine(); + +} diff --git a/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/MyApp.java b/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/MyApp.java index f454a5a..920f8b4 100644 --- a/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/MyApp.java +++ b/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/MyApp.java @@ -2,6 +2,8 @@ public class MyApp { public static void main(String[] args) { - System.out.println("Hello world!"); + Library library = new Library("My library", 350, 9_5); + System.out.println("Welcom to our library! What can we help you with? "); + } } \ No newline at end of file From fc5a9fee41d72f3a003c8f30d72134b17ee03606 Mon Sep 17 00:00:00 2001 From: Yas Hassan Pour Date: Thu, 16 May 2024 22:38:35 +0330 Subject: [PATCH 10/11] CLI class kinda failed --- .../src/main/java/org/example/Book.java | 2 +- .../src/main/java/org/example/CLI.java | 6 ++++- .../src/main/java/org/example/Library.java | 26 ++++++++++++++++++- .../src/main/java/org/example/MyApp.java | 24 ++++++++++++++--- .../src/main/java/org/example/NormalUser.java | 2 +- .../src/main/java/org/example/User.java | 8 +++--- 6 files changed, 56 insertions(+), 12 deletions(-) diff --git a/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/Book.java b/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/Book.java index f21a1d3..9baefe1 100644 --- a/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/Book.java +++ b/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/Book.java @@ -42,7 +42,7 @@ public void setAvailability_status(boolean availability_status) { } - public Book (int bookID, String title, String author, String description) { + public Book (String title, int bookID, String author, String description) { Unique_bookID = bookID; this.title = title; this.author = author; diff --git a/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/CLI.java b/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/CLI.java index dec135b..152e7ef 100644 --- a/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/CLI.java +++ b/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/CLI.java @@ -4,7 +4,11 @@ public class CLI { Scanner scanner = new Scanner(System.in); - System.out.println("Welcom to our library! What can we do for you?\n lib add book: add a new book to the library\n lib get hrs: Retrieve library opening hours\n lib rent: Rent a book from the library\nlib add member : Add a new member to the library (admin privilege requered\n "); + System.out.println("Welcom to our library! What can we do for you?\n lib add book: add a new book to the library\n lib get hrs: Retrieve library opening hours\n lib rent: Rent a book from the library\nlib add member : Add a new member to the library (admin privilege reqiuered\nlib rent "); String input = scanner.nextLine(); + while (true) { + System.out.println("Enter a command (type 'help' for available commands):"); + String command = scanner.nextLine(); } + diff --git a/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/Library.java b/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/Library.java index 0bee890..968b70b 100644 --- a/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/Library.java +++ b/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/Library.java @@ -5,10 +5,34 @@ import java.util.List; public class Library { + public String getLibraryName() { + return LibraryName; + } + + public void setLibraryName(String libraryName) { + LibraryName = libraryName; + } + + public int getCapacity() { + return capacity; + } + + public void setCapacity(int capacity) { + this.capacity = capacity; + } + + public int getOperatingHours() { + return operatingHours; + } + + public void setOperatingHours(int operatingHours) { + this.operatingHours = operatingHours; + } + private String LibraryName; private int capacity; private int operatingHours; - private ListbookRepo; + private ArrayListbookRepo; private ListuserRegistries; private ListrentalRegistries; public Library (String LibraryName,int capacity, int operatingHours) diff --git a/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/MyApp.java b/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/MyApp.java index 920f8b4..be9dd05 100644 --- a/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/MyApp.java +++ b/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/MyApp.java @@ -1,9 +1,25 @@ package org.example; +import java.util.Date; + public class MyApp { - public static void main(String[] args) { - Library library = new Library("My library", 350, 9_5); - System.out.println("Welcom to our library! What can we help you with? "); + public static void main(String[] args) { + // Initialize some sample data + Library library = new Library("My Library", 100, 9_5); + + Book book1 = new Book("Book2", 82734,"author1", "Description1"); + Book book2 = new Book("Book2", 23984,"author2", "Description2"); + library.addBook(book1); + library.addBook(book2); + + NormalUser user1 = new NormalUser("User1", 1234567890,"09112143646", new Date()); + library.addUser(user1); + + // Example commands + library.rentBook(book1, user1, 1, new Date()); + library.returnBook(book1); + library.removeUser(user1); + } + } -} \ No newline at end of file diff --git a/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/NormalUser.java b/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/NormalUser.java index 2cbe9c8..7f0d310 100644 --- a/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/NormalUser.java +++ b/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/NormalUser.java @@ -13,7 +13,7 @@ public void setRegistrationDate(Date registrationDate) { this.registrationDate = registrationDate; } - public NormalUser(String name, int ID, int phoneNum, Date registrationDate) + public NormalUser(String name, int ID, String phoneNum, Date registrationDate) { super(name,ID,phoneNum); this.registrationDate= registrationDate; diff --git a/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/User.java b/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/User.java index 25dce4b..331700f 100644 --- a/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/User.java +++ b/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/User.java @@ -22,16 +22,16 @@ public void setID(int ID) { this.ID = ID; } - public int getPhoneNum() { + public String getPhoneNum() { return phoneNum; } - public void setPhoneNum(int phoneNum) { + public void setPhoneNum(String phoneNum) { this.phoneNum = phoneNum; } - private int phoneNum; - public User(String name, int ID, int PhoneNum) { + private String phoneNum; + public User(String name, int ID, String PhoneNum) { this.name = name; this.ID = ID; this.phoneNum = phoneNum; From c8a90de86dd315a060fe8d835c8f258762d727bb Mon Sep 17 00:00:00 2001 From: Yas Hassan Pour Date: Thu, 16 May 2024 23:08:21 +0330 Subject: [PATCH 11/11] edited --- .../src/main/java/org/example/MyApp.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/MyApp.java b/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/MyApp.java index be9dd05..6752680 100644 --- a/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/MyApp.java +++ b/Answers/Yas_HasssanPour_40231712003/src/main/java/org/example/MyApp.java @@ -4,7 +4,7 @@ public class MyApp { public static void main(String[] args) { - // Initialize some sample data + Library library = new Library("My Library", 100, 9_5); Book book1 = new Book("Book2", 82734,"author1", "Description1"); @@ -15,7 +15,7 @@ public static void main(String[] args) { NormalUser user1 = new NormalUser("User1", 1234567890,"09112143646", new Date()); library.addUser(user1); - // Example commands + library.rentBook(book1, user1, 1, new Date()); library.returnBook(book1); library.removeUser(user1);