Alexander Niklasson

src/main/java/com/booleanuk/core/Article.java

@@ -1,35 +1,27 @@
 package com.booleanuk.core;
 
-public class Article {
-    String title;
+public class Article extends Item{
 
-    boolean onLoan = false;
+    private Author author;
 
-    public Article(String title) {
-        this.title = title;
-    }
-
-    public boolean isOnLoan() {
-        return onLoan;
-    }
-
-    public String checkIn() {
-        if (!this.isOnLoan()) {
-            return "item is not currently on loan";
+    public String getAuthorInformation() {
+        if(author != null){
+            return "Author: " + author.getName() +
+                    "\nContact Information: " + author.getContactInformation() +
+                    "\nWebsite: " + author.getWebsite();
         }
-
-        this.onLoan = false;
-
-        return "item has been checked in";
-    }
-
-    public String checkOut() {
-        if (this.isOnLoan()) {
-            return "item is currently on loan";
+        else{
+            return "No author information added";
         }
 
-        this.onLoan = true;
+    }
 
-        return "item has been checked out";
+    public Article(String title){
+        super(title);
     }
+    public Article(String title, Author author) {
+        super(title);
+        this.author = author;
+    }
+
 }

src/main/java/com/booleanuk/core/Author.java

@@ -0,0 +1,27 @@
+package com.booleanuk.core;
+
+public class Author {
+    private final String name;
+    private final String website;
+    private final String contactInformation;
+
+
+    public Author(String name, String website, String contactInformation){
+        this.name = name;
+        this.website = website;
+        this.contactInformation = contactInformation;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public String getWebsite() {
+        return website;
+    }
+
+    public String getContactInformation() {
+        return contactInformation;
+    }
+
+
+}

src/main/java/com/booleanuk/core/Book.java

@@ -1,35 +1,26 @@
 package com.booleanuk.core;
 
-public class Book {
-    String title;
-
-    boolean onLoan = false;
+public class Book extends Item {
+    private Author author;
+
+    public String getAuthorInformation() {
+        if(author != null){
+            return "Author: " + author.getName() +
+                    "\nContact Information: " + author.getContactInformation() +
+                    "\nWebsite: " + author.getWebsite();
+        }
+        else{
+            return "No author information added";
+        }
 
-    public Book(String title) {
-        this.title = title;
     }
 
-    public boolean isOnLoan() {
-        return onLoan;
+    public Book(String title){
+        super(title);
     }
-
-    public String checkIn() {
-        if (!this.isOnLoan()) {
-            return "item is not currently on loan";
-        }
-
-        this.onLoan = false;
-
-        return "item has been checked in";
+    public Book(String title, Author author) {
+        super(title);
+        this.author = author;
     }
 
-    public String checkOut() {
-        if (this.isOnLoan()) {
-            return "item is currently on loan";
-        }
-
-        this.onLoan = true;
-
-        return "item has been checked out";
-    }
 }

src/main/java/com/booleanuk/core/Item.java

@@ -0,0 +1,42 @@
+package com.booleanuk.core;
+
+public abstract class Item {
+    protected String title;
+
+    protected boolean onLoan = false;
+
+    public Item(String title) {
+        this.title = title;
+    }
+
+    public boolean isOnLoan() {
+        return onLoan;
+    }
+
+    public String checkIn() {
+        if (!this.isOnLoan()) {
+            return "item is not currently on loan";
+        }
+
+        this.onLoan = false;
+
+        return "item has been checked in";
+    }
+    public String getTitle(){
+        return this.title;
+    }
+
+    public String checkOut() {
+        if (this.isOnLoan()) {
+            return "item is currently on loan";
+        }
+
+        this.onLoan = true;
+
+        return "item has been checked out";
+    }
+    public String getAuthorInformation() {
+        return "No author specified";
+
+    }
+}

src/main/java/com/booleanuk/core/Library.java

@@ -1,95 +1,54 @@
 package com.booleanuk.core;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class Library {
-    List<Article> articles;
-    List<Book> books;
-    List<Newspaper> newspapers;
+    List<Item> items;
 
-    public void addToStock(Article item) {
-        this.articles.add(item);
+    public Library(){
+        items = new ArrayList<>();
     }
-
-    public void addToStock(Book item) {
-        this.books.add(item);
-    }
-
-    public void addToStock(Newspaper item) {
-        this.newspapers.add(item);
+    public void addToStock(Item item) {
+        this.items.add(item);
     }
 
     // The following methods may contain code that you are unfamiliar with. The strange syntax of article -> something
     // is called a lambda expression (https://www.w3schools.com/java/java_lambda.asp)
-    public String checkInArticle(String title) {
-        List<Article> filtered = this.articles.stream()
-                .filter(article -> article.title.equals(title))
-                .toList();
-
-        if (filtered.size() < 1) {
+    public String checkInItem(String title) {
+        try {
+            List<Item> filtered = this.items.stream()
+                    .filter(item -> item.title.equals(title))
+                    .toList();
+
+            return filtered.get(0).checkIn();
+        } catch (Exception e){
             return "item is not part of the library's collection";
         }
-
-        return filtered.get(0).checkIn();
     }
 
-    public String checkOutArticle(String title) {
-        List<Article> filtered = this.articles.stream()
-                .filter(article -> article.title.equals(title))
-                .toList();
-
-        if (filtered.size() < 1) {
+    public String checkOutItem(String title) {
+        try {
+            List<Item> filtered = this.items.stream()
+                    .filter(item -> item.getTitle().equals(title))
+                    .toList();
+            return filtered.get(0).checkOut();
+        } catch (Exception e){
             return "item is not part of the library's collection";
         }
-
-        return filtered.get(0).checkOut();
     }
-
-    public String checkInBook(String title) {
-        List<Book> filtered = this.books.stream()
-                .filter(book -> book.title.equals(title))
-                .toList();
-
-        if (filtered.size() < 1) {
-            return "item is not part of the library's collection";
+    public Item getItemFromName(String title) {
+        try{
+            for(Item i : items){
+                if(i.getTitle().equals(title)){
+                    return i;
+                }
+            }
+        } catch (Exception e){
+            return null;
         }
-
-        return filtered.get(0).checkIn();
+        return null;
     }
 
-    public String checkOutBook(String title) {
-        List<Book> filtered = this.books.stream()
-                .filter(book -> book.title.equals(title))
-                .toList();
-
-        if (filtered.size() < 1) {
-            return "item is not part of the library's collection";
-        }
 
-        return filtered.get(0).checkOut();
-    }
-
-    public String checkInNewspaper(String title) {
-        List<Newspaper> filtered = this.newspapers.stream()
-                .filter(newspaper -> newspaper.title.equals(title))
-                .toList();
-
-        if (filtered.size() < 1) {
-            return "item is not part of the library's collection";
-        }
-
-        return filtered.get(0).checkIn();
-    }
-
-    public String checkOutNewspaper(String title) {
-        List<Newspaper> filtered = this.newspapers.stream()
-                .filter(newspaper -> newspaper.title.equals(title))
-                .toList();
-
-        if (filtered.size() < 1) {
-            return "item is not part of the library's collection";
-        }
-
-        return filtered.get(0).checkOut();
-    }
 }

src/main/java/com/booleanuk/core/Newspaper.java

@@ -1,23 +1,24 @@
 package com.booleanuk.core;
 
-public class Newspaper {
-    String title;
-
-    boolean onLoan = false;
+public class Newspaper extends Item{
 
     public Newspaper(String title) {
-        this.title = title;
-    }
-
-    public boolean isOnLoan() {
-        return onLoan;
+        super(title);
     }
 
+    @Override
     public String checkIn() {
         return "newspapers are not available for loan";
     }
-
+    @Override
     public String checkOut() {
         return "newspapers are not available for loan";
     }
+
+    public String getAuthorInformation() {
+        return "Can't provide author on a newspaper";
+
+    }
 }
+
+

src/test/java/com/booleanuk/core/AuthorTest.java

@@ -0,0 +1,16 @@
+package com.booleanuk.core;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+public class AuthorTest {
+
+    @Test
+    public void testGetters() {
+        Author author = new Author("John Doe", "http://www.johndoe.com", "[email protected]");
+
+        Assertions.assertEquals("John Doe", author.getName());
+        Assertions.assertEquals("http://www.johndoe.com", author.getWebsite());
+        Assertions.assertEquals("[email protected]", author.getContactInformation());
+    }
+
+}