+
Add Loan for Book
+
+
+
+ {{msg}}
-
-
-
+
+ {{errorMsg}}
-
-
-
-
-
-
-
-
- {{msg}}
-
-
- {{errorMsg}}
-
-
\ No newline at end of file
+
diff --git a/FrontEnd/src/app/user/check-out/checkOutBook.component.ts b/FrontEnd/src/app/user/check-out/checkOutBook.component.ts
index fadc2e8..1f0615a 100644
--- a/FrontEnd/src/app/user/check-out/checkOutBook.component.ts
+++ b/FrontEnd/src/app/user/check-out/checkOutBook.component.ts
@@ -1,11 +1,12 @@
/**
* Created by asdha on 3/15/2017.
*/
-import { Component, OnInit } from '@angular/core';
-import { BookLoan } from '../../model/book-loan';
-import { LibraryService } from '../../services/library.services';
-import { ActivatedRoute, Params } from '@angular/router';
-import 'rxjs/add/operator/switchMap';
+import {Component, OnInit} from '@angular/core';
+import {BookLoan} from '../../model/book-loan';
+import {LibraryService} from '../../services/library.services';
+import {ActivatedRoute, Params} from '@angular/router';
+import {FormBuilder, FormGroup, Validators} from "@angular/forms";
+
@Component({
selector: 'checkout-book',
templateUrl: './checkOutBook.component.html',
@@ -19,22 +20,25 @@ export class CheckOutBookComponent implements OnInit {
errorMsg: string;
success: boolean;
submitted: boolean;
+ addLoanForm: FormGroup;
+
constructor(private route: ActivatedRoute,
- private libraryService: LibraryService) {
+ private libraryService: LibraryService,
+ private formBuilder: FormBuilder) {
}
ngOnInit(): void {
-
+ this.addLoanForm = this.formBuilder.group({
+ borrowerId: ['', Validators.required]
+ });
this.route.params.subscribe((params: Params) => this.isbn = params['isbn']);
- console.log(this.isbn);
-
}
addLoan(): void {
this.submitted = false;
this.bookLoan.isbn = this.isbn;
-
+ this.bookLoan.borrowerId = this.addLoanForm.value.borrowerId;
this.libraryService.addLoan(this.bookLoan).subscribe(x => {
this.submitted = true;
this.success = true;
diff --git a/FrontEnd/src/app/user/user.module.ts b/FrontEnd/src/app/user/user.module.ts
index 08d599a..e1d960d 100644
--- a/FrontEnd/src/app/user/user.module.ts
+++ b/FrontEnd/src/app/user/user.module.ts
@@ -2,9 +2,11 @@ import {NgModule} from "@angular/core";
import {CheckInBookComponent} from "./check-in/CheckInBook.component";
import {CheckOutBookComponent} from "./check-out/checkOutBook.component";
import {SharedModule} from "../shared/shared.module";
+import {MatInputModule} from "@angular/material/input";
+import {MatButtonModule} from "@angular/material/button";
@NgModule({
- imports: [SharedModule],
+ imports: [SharedModule, MatInputModule, MatButtonModule],
declarations: [CheckInBookComponent, CheckOutBookComponent]
})
diff --git a/FrontEnd/src/environments/environment.prod.ts b/FrontEnd/src/environments/environment.prod.ts
index 3612073..a40154b 100644
--- a/FrontEnd/src/environments/environment.prod.ts
+++ b/FrontEnd/src/environments/environment.prod.ts
@@ -1,3 +1,4 @@
export const environment = {
- production: true
+ production: true,
+ apiUrl: 'http://localhost:8080/'
};
diff --git a/FrontEnd/src/environments/environment.ts b/FrontEnd/src/environments/environment.ts
index dfced65..2aad5a1 100644
--- a/FrontEnd/src/environments/environment.ts
+++ b/FrontEnd/src/environments/environment.ts
@@ -3,7 +3,8 @@
// The list of file replacements can be found in `angular.json`.
export const environment = {
- production: false
+ production: false,
+ apiUrl: 'http://localhost:8080/'
};
/*
diff --git a/FrontEnd/src/index.html b/FrontEnd/src/index.html
index e54b0b5..45061d0 100644
--- a/FrontEnd/src/index.html
+++ b/FrontEnd/src/index.html
@@ -1,15 +1,16 @@
-
-
Angular QuickStart
-
-
-
-
-
-
-
-
-
-
+
+
Angular QuickStart
+
+
+
+
+
+
+
+
+
+
+
diff --git a/FrontEnd/src/main.ts b/FrontEnd/src/main.ts
index 00ca40d..0a62114 100644
--- a/FrontEnd/src/main.ts
+++ b/FrontEnd/src/main.ts
@@ -1,14 +1,6 @@
-import { enableProdMode } from '@angular/core';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { AppModule } from './app/app.module';
-import { environment } from './environments/environment';
-if (environment.production) {
- enableProdMode();
-}
-
-document.addEventListener('DOMContentLoaded', () => {
- platformBrowserDynamic().bootstrapModule(AppModule)
- .catch(err => console.error(err));
-});
+platformBrowserDynamic().bootstrapModule(AppModule)
+ .catch(err => console.error(err));
diff --git a/FrontEnd/src/polyfills.ts b/FrontEnd/src/polyfills.ts
deleted file mode 100644
index a5b8c7f..0000000
--- a/FrontEnd/src/polyfills.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * This file includes polyfills needed by Angular and is loaded before the app.
- * You can add your own extra polyfills to this file.
- *
- * This file is divided into 2 sections:
- * 1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers.
- * 2. Application imports. Files imported after ZoneJS that should be loaded before your main
- * file.
- *
- * The current setup is for so-called "evergreen" browsers; the last versions of browsers that
- * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
- * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
- *
- * Learn more in https://angular.io/guide/browser-support
- */
-
-/***************************************************************************************************
- * BROWSER POLYFILLS
- */
-
-/** IE9, IE10 and IE11 requires all of the following polyfills. **/
-// import 'core-js/es6/symbol';
-// import 'core-js/es6/object';
-// import 'core-js/es6/function';
-// import 'core-js/es6/parse-int';
-// import 'core-js/es6/parse-float';
-// import 'core-js/es6/number';
-// import 'core-js/es6/math';
-// import 'core-js/es6/string';
-// import 'core-js/es6/date';
-// import 'core-js/es6/array';
-// import 'core-js/es6/regexp';
-// import 'core-js/es6/map';
-// import 'core-js/es6/weak-map';
-// import 'core-js/es6/set';
-
-/**
- * If the application will be indexed by Google Search, the following is required.
- * Googlebot uses a renderer based on Chrome 41.
- * https://developers.google.com/search/docs/guides/rendering
- **/
-// import 'core-js/es6/array';
-
-/** IE10 and IE11 requires the following for NgClass support on SVG elements */
-// import 'classlist.js'; // Run `npm install --save classlist.js`.
-
-/** IE10 and IE11 requires the following for the Reflect API. */
-// import 'core-js/es6/reflect';
-
-/**
- * Web Animations `@angular/platform-browser/animations`
- * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
- * Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
- **/
-// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
-
-/**
- * By default, zone.js will patch all possible macroTask and DomEvents
- * user can disable parts of macroTask/DomEvents patch by setting following flags
- * because those flags need to be set before `zone.js` being loaded, and webpack
- * will put import in the top of bundle, so user need to create a separate file
- * in this directory (for example: zone-flags.ts), and put the following flags
- * into that file, and then add the following code before importing zone.js.
- * import './zone-flags.ts';
- *
- * The flags allowed in zone-flags.ts are listed here.
- *
- * The following flags will work for all browsers.
- *
- * (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
- * (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
- * (window as any).__zone_symbol__BLACK_LISTED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
- *
- * in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js
- * with the following flag, it will bypass `zone.js` patch for IE/Edge
- *
- * (window as any).__Zone_enable_cross_context_check = true;
- *
- */
-
-/***************************************************************************************************
- * Zone JS is required by default for Angular itself.
- */
-import 'zone.js/dist/zone'; // Included with Angular CLI.
-
-
-/***************************************************************************************************
- * APPLICATION IMPORTS
- */
diff --git a/FrontEnd/src/styles.css b/FrontEnd/src/styles.css
index 1386886..4abbce5 100644
--- a/FrontEnd/src/styles.css
+++ b/FrontEnd/src/styles.css
@@ -1,268 +1,2 @@
/* Master Styles */
-@import "~bootstrap/dist/css/bootstrap.css";
-
-h1 {
- color: #369;
- font-family: Arial, Helvetica, sans-serif;
- font-size: 250%;
-}
-h2, h3 {
- color: #444;
- font-family: Arial, Helvetica, sans-serif;
- font-weight: lighter;
-}
-body {
- margin: 2em;
-}
-body, input[text], button {
- color: #888;
- font-family: Cambria, Georgia;
-}
-a {
- cursor: pointer;
- cursor: hand;
-}
-button {
- font-family: Arial;
- background-color: #eee;
- border: none;
- padding: 5px 10px;
- border-radius: 4px;
- cursor: pointer;
- cursor: hand;
-}
-button:hover {
- background-color: #cfd8dc;
-}
-button:disabled {
- background-color: #eee;
- color: #aaa;
- cursor: auto;
-}
-
-/* Navigation link styles */
-nav a {
- padding: 5px 10px;
- text-decoration: none;
- margin-right: 10px;
- margin-top: 10px;
- display: inline-block;
- background-color: #eee;
- border-radius: 4px;
-}
-nav a:visited, a:link {
- color: #607D8B;
-}
-nav a:hover {
- color: #039be5;
- background-color: #CFD8DC;
-}
-nav a.active {
- color: #039be5;
-}
-
-/* items class */
-.items {
- margin: 0 0 2em 0;
- list-style-type: none;
- padding: 0;
- width: 24em;
-}
-.items li {
- cursor: pointer;
- position: relative;
- left: 0;
- background-color: #EEE;
- margin: .5em;
- padding: .3em 0;
- height: 1.6em;
- border-radius: 4px;
-}
-.items li:hover {
- color: #607D8B;
- background-color: #DDD;
- left: .1em;
-}
-.items li.selected {
- background-color: #CFD8DC;
- color: white;
-}
-.items li.selected:hover {
- background-color: #BBD8DC;
-}
-.items .text {
- position: relative;
- top: -3px;
-}
-.items .badge {
- display: inline-block;
- font-size: small;
- color: white;
- padding: 0.8em 0.7em 0 0.7em;
- background-color: #607D8B;
- line-height: 1em;
- position: relative;
- left: -1px;
- top: -4px;
- height: 1.8em;
- margin-right: .8em;
- border-radius: 4px 0 0 4px;
-}
-/* everywhere else */
-* {
- font-family: Arial, Helvetica, sans-serif;
-}
-
-
-/*
-Copyright 2017 Google Inc. All Rights Reserved.
-Use of this source code is governed by an MIT-style license that
-can be found in the LICENSE file at http://angular.io/license
-*/
-
-
-label {
- display: inline-block;
- width: 8em;
- margin: .5em 0;
- color: #607D8B;
- font-weight: bold;
-}
-input {
- height: 2em;
- font-size: 1em;
- padding-left: .4em;
-}
-button {
- margin-top: 20px;
- font-family: Arial;
- background-color: #eee;
- border: none;
- padding: 5px 10px;
- border-radius: 4px;
- cursor: pointer; cursor: hand;
-}
-button:hover {
- background-color: #cfd8dc;
-}
-button:disabled {
- background-color: #eee;
- color: #ccc;
- cursor: auto;
-}
-.selected {
- background-color: #CFD8DC !important;
- color: white;
-}
-.heroes {
- margin: 0 0 2em 0;
- list-style-type: none;
- padding: 0;
- width: 70em;
-}
-.heroes li {
- cursor: pointer;
- position: relative;
- left: 0;
- background-color: #EEE;
- margin: .5em;
- padding: .3em 0;
-
- border-radius: 23px;
-}
-.heroes li:hover {
- color: #607D8B;
- background-color: #DDD;
- left: .1em;
-}
-.heroes li.selected:hover {
- background-color: #BBD8DC !important;
- color: white;
-}
-.heroes .text {
- position: relative;
- top: -3px;
-}
-.heroes .badge {
- display: inline-block;
- font-size: small;
- color: white;
- padding: 0.8em 0.7em 0 0.7em;
- background-color: #607D8B;
- line-height: 1em;
- position: relative;
- left: 120px;
- top: -90px;
- height: 1.8em;
- margin-right: .8em;
- border-radius: 4px 4px 4px 4px;
-}
-
-.heroes img {
- padding: 14px;
- width:88px;
- height: 124px;
-}
-
-.heroes .avail{
- background-color: chartreuse;
- color: white;
- font-size: small;
- display: inline-block;
- padding: 0.8em 0.7em 0 0.7em;
- line-height: 1em;
- position: relative;
- left: 120px;
- top: -90px;
- height: 1.8em;
- margin-right: .8em;
- border-radius: 4px 4px 4px 4px;
-}
-
-.heroes .notAvail{
- background-color: crimson;
- color: white;
- font-size: small;
- display: inline-block;
- padding: 0.8em 0.7em 0 0.7em;
- line-height: 1em;
- position: relative;
- left: 120px;
- top: -90px;
- height: 1.8em;
- margin-right: .8em;
- border-radius: 4px 4px 4px 4px;
-}
-.heroes button{
-
- font-family: Arial;
- background-color: crimson;
- border: none;
- padding: 14px 21px;
- border-radius: 4px;
- color: white;
- position: absolute;
- top:98px;
- left:119px;
- right:279px
-
-}
-table, th, td {
-
- top:10px;
- position:relative;
-}
-@media print
-{
- thead {display: table-header-group;}
-}
-.selectedtab{
- position: relative;
- padding: 10px;
-}
-/*
-Copyright 2017 Google Inc. All Rights Reserved.
-Use of this source code is governed by an MIT-style license that
-can be found in the LICENSE file at http://angular.io/license
-*/
-
+@import "bootstrap";
diff --git a/FrontEnd/src/test.ts b/FrontEnd/src/test.ts
deleted file mode 100644
index 1631789..0000000
--- a/FrontEnd/src/test.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// This file is required by karma.conf.js and loads recursively all the .spec and framework files
-
-import 'zone.js/dist/zone-testing';
-import { getTestBed } from '@angular/core/testing';
-import {
- BrowserDynamicTestingModule,
- platformBrowserDynamicTesting
-} from '@angular/platform-browser-dynamic/testing';
-
-declare const require: any;
-
-// First, initialize the Angular testing environment.
-getTestBed().initTestEnvironment(
- BrowserDynamicTestingModule,
- platformBrowserDynamicTesting()
-);
-// Then we find all the tests.
-const context = require.context('./', true, /\.spec\.ts$/);
-// And load the modules.
-context.keys().map(context);
diff --git a/FrontEnd/src/theme.scss b/FrontEnd/src/theme.scss
new file mode 100644
index 0000000..0c113ae
--- /dev/null
+++ b/FrontEnd/src/theme.scss
@@ -0,0 +1,11 @@
+@use "@angular/material" as mat;
+@import "@angular/material/theming";
+@include mat.core();
+
+$app-primary: mat.define-palette(mat.$pink-palette);
+$app-accent: mat.define-palette(mat.$light-blue-palette);
+$app-warn: mat.define-palette(mat.$red-palette);
+
+$theme-dark: mat.define-dark-theme($app-primary, $app-accent, $app-warn);
+$theme-light: mat.define-light-theme($app-primary, $app-accent, $app-warn);
+@include mat.all-component-themes($theme-light);
diff --git a/FrontEnd/src/tsconfig.app.json b/FrontEnd/src/tsconfig.app.json
deleted file mode 100644
index 190fd30..0000000
--- a/FrontEnd/src/tsconfig.app.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "extends": "../tsconfig.json",
- "compilerOptions": {
- "outDir": "../out-tsc/app",
- "types": []
- },
- "exclude": [
- "test.ts",
- "**/*.spec.ts"
- ]
-}
diff --git a/FrontEnd/src/tsconfig.spec.json b/FrontEnd/src/tsconfig.spec.json
deleted file mode 100644
index de77336..0000000
--- a/FrontEnd/src/tsconfig.spec.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "extends": "../tsconfig.json",
- "compilerOptions": {
- "outDir": "../out-tsc/spec",
- "types": [
- "jasmine",
- "node"
- ]
- },
- "files": [
- "test.ts",
- "polyfills.ts"
- ],
- "include": [
- "**/*.spec.ts",
- "**/*.d.ts"
- ]
-}
diff --git a/FrontEnd/tsconfig.app.json b/FrontEnd/tsconfig.app.json
new file mode 100644
index 0000000..8b29399
--- /dev/null
+++ b/FrontEnd/tsconfig.app.json
@@ -0,0 +1,30 @@
+/* To learn more about this file see: https://angular.io/guide/typescript-configuration. */
+{
+ "extends": "./tsconfig.json",
+ "compilerOptions": {
+ "outDir": "./out-tsc/app",
+ "types": []
+ },
+ "files": [
+ "src/main.ts"
+ ],
+ "include": [
+ "src/**/*.d.ts"
+ ],
+ "exclude": [
+ "src/test.ts",
+ "src/**/*.spec.ts",
+ "src/**/*-specs.ts",
+ "src/**/*.avoid.ts",
+ "src/**/*.0.ts",
+ "src/**/*.1.ts",
+ "src/**/*.1b.ts",
+ "src/**/*.2.ts",
+ "src/**/*.3.ts",
+ "src/**/*.4.ts",
+ "src/**/*.5.ts",
+ "src/**/*.6.ts",
+ "src/**/*.7.ts",
+ "src/**/testing"
+ ]
+}
diff --git a/FrontEnd/tsconfig.json b/FrontEnd/tsconfig.json
index 98ffd7f..eb6ec57 100644
--- a/FrontEnd/tsconfig.json
+++ b/FrontEnd/tsconfig.json
@@ -3,21 +3,32 @@
"compilerOptions": {
"baseUrl": "./",
"outDir": "./dist/out-tsc",
+ "strictPropertyInitialization": false,
+ "forceConsistentCasingInFileNames": true,
+ "strict": true,
+ "noImplicitOverride": true,
+ "noPropertyAccessFromIndexSignature": true,
+ "noImplicitReturns": true,
+ "noImplicitAny": false,
+ "noFallthroughCasesInSwitch": true,
"sourceMap": true,
"declaration": false,
- "module": "es2015",
- "moduleResolution": "node",
- "emitDecoratorMetadata": true,
+ "downlevelIteration": true,
"experimentalDecorators": true,
- "allowJs": true,
+ "moduleResolution": "node",
"importHelpers": true,
- "target": "es5",
- "typeRoots": [
- "node_modules/@types"
- ],
+ "useDefineForClassFields": false,
+ "target": "ES2022",
+ "module": "ES2022",
"lib": [
- "es2018",
+ "ES2022",
"dom"
]
+ },
+ "angularCompilerOptions": {
+ "enableI18nLegacyMessageIdFormat": false,
+ "strictInjectionParameters": true,
+ "strictInputAccessModifiers": true,
+ "strictTemplates": true
}
-}
\ No newline at end of file
+}
diff --git a/FrontEnd/tsconfig.spec.json b/FrontEnd/tsconfig.spec.json
new file mode 100644
index 0000000..b18619f
--- /dev/null
+++ b/FrontEnd/tsconfig.spec.json
@@ -0,0 +1,13 @@
+{
+ "extends": "./tsconfig.json",
+ "compilerOptions": {
+ "outDir": "./out-tsc/spec",
+ "types": [
+ "jasmine"
+ ]
+ },
+ "include": [
+ "src/**/*.spec.ts",
+ "src/**/*.d.ts"
+ ]
+}
diff --git a/README.md b/README.md
index fe60570..b71a61b 100644
--- a/README.md
+++ b/README.md
@@ -1,25 +1,21 @@
# Library Management Project
-Prerequisites:
+###Prerequisites
-Create schema with name of 'librarymanagement' in MySql. Run the following command in mysql command line
-
- - create schema librarymanagement
- - git clone https://github.com/asdhammu/Library.git
+- Node 16+
+- Java 17+
+- Create schema with name of 'librarymanagement' in MySql
-# For Services.:
-
- - update password value of 'spring.datasource.password' in the application-dev.properties if different from 'admin'
-
- - cd services
-
- - mvn spring-boot: run ( On first run, load will be inserted to database. This may be take from 15 - 30 minutes)
-
-
-# For Front end:
+### Service
- - cd FrontEnd
+- update username and password value of 'spring.datasource.username' and 'spring.datasource.password' in the application-dev.properties
+- cd services
+- mvn spring-boot: run
+ - Data will load from books-lite.csv in the resources folder.
+ - For full data change file name to book.csv in the InitialLoad. This can take around 30 minutes.
- - npm install
- - npm run start
+### Front end:
+- cd FrontEnd
+- npm install
+- npm run start
diff --git a/Services/pom.xml b/Services/pom.xml
index a8fe687..1b699c8 100644
--- a/Services/pom.xml
+++ b/Services/pom.xml
@@ -8,12 +8,12 @@
LibraryManagement Maven Webapp
http://maven.apache.org
- 1.8
+ 17
org.springframework.boot
spring-boot-starter-parent
- 2.1.4.RELEASE
+ 3.1.0
@@ -28,6 +28,10 @@
org.springframework.boot
spring-boot-starter-data-rest
+
+ org.springframework.boot
+ spring-boot-starter-validation
+
org.springframework.boot
spring-boot-starter-test
@@ -42,6 +46,7 @@
mysql
mysql-connector-java
+ 8.0.31
com.googlecode.json-simple
@@ -51,7 +56,7 @@
edu.stanford.nlp
stanford-corenlp
- 4.4.0
+ 4.5.4
com.fasterxml.jackson.core
@@ -60,7 +65,7 @@
org.apache.poi
poi-ooxml
- 3.7
+ 5.2.3
commons-dbcp
diff --git a/Services/src/main/java/com/library/App.java b/Services/src/main/java/com/library/App.java
index 75b7766..66b7a2c 100644
--- a/Services/src/main/java/com/library/App.java
+++ b/Services/src/main/java/com/library/App.java
@@ -11,7 +11,7 @@
public class App {
public static void main(String[] args) {
- ConfigurableApplicationContext context = SpringApplication.run(App.class, args);
- context.getBean(InitialLoad.class).load();
+ ConfigurableApplicationContext context = SpringApplication.run(App.class, args);
+ context.getBean(InitialLoad.class).load();
}
}
diff --git a/Services/src/main/java/com/library/config/CustomizedResponseEntityExceptionHandler.java b/Services/src/main/java/com/library/config/CustomizedResponseEntityExceptionHandler.java
index e1ac3e5..9c6f762 100644
--- a/Services/src/main/java/com/library/config/CustomizedResponseEntityExceptionHandler.java
+++ b/Services/src/main/java/com/library/config/CustomizedResponseEntityExceptionHandler.java
@@ -1,7 +1,7 @@
package com.library.config;
-import com.library.error.*;
+import com.library.exception.*;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.ControllerAdvice;
diff --git a/Services/src/main/java/com/library/controller/BorrowerController.java b/Services/src/main/java/com/library/controller/BorrowerController.java
new file mode 100644
index 0000000..37a1a16
--- /dev/null
+++ b/Services/src/main/java/com/library/controller/BorrowerController.java
@@ -0,0 +1,39 @@
+package com.library.controller;
+
+import com.library.requests.BookLoanRequest;
+import com.library.requests.CheckInBookRequest;
+import com.library.requests.CreateBorrowerRequest;
+import com.library.services.BorrowerService;
+import jakarta.validation.Valid;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+public class BorrowerController {
+
+ final BorrowerService borrowerService;
+
+ public BorrowerController(BorrowerService borrowerService) {
+ this.borrowerService = borrowerService;
+ }
+
+ @PostMapping(value = "/borrower")
+ public ResponseEntity addBorrower(@Valid @RequestBody CreateBorrowerRequest createBorrowerRequest) {
+ return ResponseEntity.ok(borrowerService.addBorrower(createBorrowerRequest));
+ }
+
+ @PostMapping(value = "/borrower/checkout")
+ public ResponseEntity checkoutBook(@Valid @RequestBody BookLoanRequest bookLoanRequest) {
+ return ResponseEntity.ok(borrowerService.addBookLoan(bookLoanRequest));
+ }
+
+
+
+ @PostMapping(value = "/borrower/checkIn")
+ public ResponseEntity checkInBook(@Valid @RequestBody CheckInBookRequest book) {
+ return ResponseEntity.ok(borrowerService.checkInBook(book));
+ }
+
+
+
+}
diff --git a/Services/src/main/java/com/library/controller/FineController.java b/Services/src/main/java/com/library/controller/FineController.java
new file mode 100644
index 0000000..b20cea4
--- /dev/null
+++ b/Services/src/main/java/com/library/controller/FineController.java
@@ -0,0 +1,36 @@
+package com.library.controller;
+
+import com.library.requests.PayFineRequest;
+import com.library.services.FineService;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+public class FineController {
+
+ private final FineService libraryService;
+
+ public FineController(FineService libraryService) {
+ this.libraryService = libraryService;
+ }
+
+ @PostMapping(value = "/fine/calculate")
+ public ResponseEntity addOrUpdateFine() {
+ return ResponseEntity.ok(libraryService.calculateFines());
+ }
+
+ @GetMapping(value = "/fines")
+ public ResponseEntity getAllFines() {
+ return ResponseEntity.ok(libraryService.getAllFines());
+ }
+
+ @PostMapping(value = "/fine")
+ public ResponseEntity payFine(@RequestBody PayFineRequest payFineRequest) {
+ return ResponseEntity.ok(libraryService.payFine(payFineRequest.getCardId()));
+ }
+
+ @GetMapping(value = "/fine")
+ public ResponseEntity getFineForCardId(@RequestParam("cardId") int cardId) {
+ return ResponseEntity.ok(libraryService.getFineForCardId(cardId));
+ }
+}
diff --git a/Services/src/main/java/com/library/controller/LibraryController.java b/Services/src/main/java/com/library/controller/LibraryController.java
deleted file mode 100644
index 627952d..0000000
--- a/Services/src/main/java/com/library/controller/LibraryController.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.library.controller;
-
-import com.library.entity.Borrower;
-import com.library.modal.*;
-import com.library.services.LibraryServices;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-@RestController
-public class LibraryController {
-
- @Autowired
- LibraryServices libraryServices;
-
- @PostMapping(value = "/borrower")
- public ResponseEntity addBorrower(@RequestBody BorrowerData borrowerData) {
-
- Borrower borrower = new Borrower();
- borrower.setbName(borrowerData.getName());
- borrower.setAddress(borrowerData.getAddress());
- borrower.setPhone(borrowerData.getPhone());
- borrower.setSsn(borrowerData.getSsn());
- return ResponseEntity.ok(libraryServices.addBorrower(borrower));
- }
-
- @PostMapping(value = "/checkoutBook")
- public ResponseEntity checkoutBook(@RequestBody BookLoanRequest bookLoanRequest) {
- return ResponseEntity.ok(libraryServices.addBookLoan(bookLoanRequest));
- }
-
- @GetMapping("/search")
- public ResponseEntity search(@RequestParam(name = "q") String query, @RequestParam(name = "p") int page, @RequestParam(name = "s") int size) {
- return ResponseEntity.ok(libraryServices.searchBooks(query, page, size));
- }
-
- @GetMapping(value = "/searchCheckedInBooks")
- public ResponseEntity searchToCheckIn(String name, int cardId, String isbn) {
- return ResponseEntity.ok(libraryServices.searchBooksForBorrower(name, cardId, isbn));
- }
-
- @PostMapping(value = "/checkInBook")
- public ResponseEntity checkInBook(@RequestBody CheckInBook book) {
- return ResponseEntity.ok(libraryServices.checkInBook(book));
- }
-
- @PostMapping(value = "/addOrUpdateFine")
- public ResponseEntity addOrUpdateFine() {
- return ResponseEntity.ok(libraryServices.calculateFines());
- }
-
- @GetMapping(value = "/fines")
- public ResponseEntity getAllFines() {
- return ResponseEntity.ok(libraryServices.getAllFines());
- }
-
- @PostMapping(value = "/payFine")
- public ResponseEntity payFine(@RequestBody FineRequest fineRequest) {
- return ResponseEntity.ok(libraryServices.payFine(fineRequest.getCardId()));
- }
-
- @GetMapping(value = "/getFineForCardId")
- public ResponseEntity getFineForCardId(@RequestParam("cardId") int cardId) {
- return ResponseEntity.ok(libraryServices.getFineForCardId(cardId));
- }
-
-}
diff --git a/Services/src/main/java/com/library/controller/SearchController.java b/Services/src/main/java/com/library/controller/SearchController.java
new file mode 100644
index 0000000..60520ea
--- /dev/null
+++ b/Services/src/main/java/com/library/controller/SearchController.java
@@ -0,0 +1,30 @@
+package com.library.controller;
+
+import com.library.dto.BookPaginatedDTO;
+import com.library.services.SearchService;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.web.PageableDefault;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class SearchController {
+
+ private final SearchService searchService;
+
+ public SearchController(SearchService searchService) {
+ this.searchService = searchService;
+ }
+
+ @GetMapping("/search/books")
+ public ResponseEntity search(@RequestParam(name = "q") String query, @PageableDefault(size = 20) final Pageable pageable) {
+ return ResponseEntity.ok(searchService.searchBooks(query, pageable));
+ }
+
+ @GetMapping(value = "/search/borrower")
+ public ResponseEntity searchToCheckIn(String name, int cardId, String isbn, @PageableDefault(size = 20) final Pageable pageable) {
+ return ResponseEntity.ok(searchService.searchBooksForBorrower(name, cardId, isbn, pageable));
+ }
+}
diff --git a/Services/src/main/java/com/library/dto/Author.java b/Services/src/main/java/com/library/dto/AuthorDTO.java
similarity index 88%
rename from Services/src/main/java/com/library/dto/Author.java
rename to Services/src/main/java/com/library/dto/AuthorDTO.java
index c0fa346..b2d12cb 100644
--- a/Services/src/main/java/com/library/dto/Author.java
+++ b/Services/src/main/java/com/library/dto/AuthorDTO.java
@@ -1,6 +1,6 @@
package com.library.dto;
-public class Author {
+public class AuthorDTO {
private String name;
diff --git a/Services/src/main/java/com/library/dto/Book.java b/Services/src/main/java/com/library/dto/BookDTO.java
similarity index 72%
rename from Services/src/main/java/com/library/dto/Book.java
rename to Services/src/main/java/com/library/dto/BookDTO.java
index 31a26dc..e1dfa75 100644
--- a/Services/src/main/java/com/library/dto/Book.java
+++ b/Services/src/main/java/com/library/dto/BookDTO.java
@@ -2,7 +2,7 @@
import java.util.List;
-public class Book {
+public class BookDTO {
private String ISBN;
@@ -16,16 +16,16 @@ public class Book {
private boolean available;
- private List author;
+ private List authorDTOS;
- private Borrower borrower;
+ private BorrowerDTO borrowerDTO;
- public Borrower getBorrower() {
- return borrower;
+ public BorrowerDTO getBorrower() {
+ return borrowerDTO;
}
- public void setBorrower(Borrower borrower) {
- this.borrower = borrower;
+ public void setBorrower(BorrowerDTO borrowerDTO) {
+ this.borrowerDTO = borrowerDTO;
}
public String getISBN() {
@@ -76,11 +76,11 @@ public void setAvailable(boolean available) {
this.available = available;
}
- public List getAuthor() {
- return author;
+ public List getAuthors() {
+ return authorDTOS;
}
- public void setAuthor(List author) {
- this.author = author;
+ public void setAuthors(List authorDTOS) {
+ this.authorDTOS = authorDTOS;
}
}
diff --git a/Services/src/main/java/com/library/dto/BookPaginatedDTO.java b/Services/src/main/java/com/library/dto/BookPaginatedDTO.java
new file mode 100644
index 0000000..b81968a
--- /dev/null
+++ b/Services/src/main/java/com/library/dto/BookPaginatedDTO.java
@@ -0,0 +1,6 @@
+package com.library.dto;
+
+import java.util.List;
+
+public record BookPaginatedDTO(PaginatedDTO pagination, List books) {
+}
diff --git a/Services/src/main/java/com/library/dto/Borrower.java b/Services/src/main/java/com/library/dto/BorrowerDTO.java
similarity index 95%
rename from Services/src/main/java/com/library/dto/Borrower.java
rename to Services/src/main/java/com/library/dto/BorrowerDTO.java
index 3417372..444197a 100644
--- a/Services/src/main/java/com/library/dto/Borrower.java
+++ b/Services/src/main/java/com/library/dto/BorrowerDTO.java
@@ -1,6 +1,6 @@
package com.library.dto;
-public class Borrower {
+public class BorrowerDTO {
private String name;
private int cardId;
private String address;
diff --git a/Services/src/main/java/com/library/dto/Fine.java b/Services/src/main/java/com/library/dto/FineDTO.java
similarity index 65%
rename from Services/src/main/java/com/library/dto/Fine.java
rename to Services/src/main/java/com/library/dto/FineDTO.java
index 680605f..2cab42f 100644
--- a/Services/src/main/java/com/library/dto/Fine.java
+++ b/Services/src/main/java/com/library/dto/FineDTO.java
@@ -1,11 +1,11 @@
package com.library.dto;
-public class Fine {
+public class FineDTO {
int cardId;
- long totalFine;
+ float totalFine;
- public Fine(int cardId, long totalFine){
+ public FineDTO(int cardId, float totalFine){
this.cardId = cardId;
this.totalFine = totalFine;
}
@@ -18,11 +18,11 @@ public void setCardId(int cardId) {
this.cardId = cardId;
}
- public long getTotalFine() {
+ public float getTotalFine() {
return totalFine;
}
- public void setTotalFine(long totalFine) {
+ public void setTotalFine(float totalFine) {
this.totalFine = totalFine;
}
}
diff --git a/Services/src/main/java/com/library/dto/PaginatedDTO.java b/Services/src/main/java/com/library/dto/PaginatedDTO.java
new file mode 100644
index 0000000..7aa084f
--- /dev/null
+++ b/Services/src/main/java/com/library/dto/PaginatedDTO.java
@@ -0,0 +1,4 @@
+package com.library.dto;
+
+public record PaginatedDTO(int totalPages, int page, int size, long totalCount) {
+}
diff --git a/Services/src/main/java/com/library/dto/Response.java b/Services/src/main/java/com/library/dto/ResponseDTO.java
similarity index 69%
rename from Services/src/main/java/com/library/dto/Response.java
rename to Services/src/main/java/com/library/dto/ResponseDTO.java
index 18cbfe1..b15d336 100644
--- a/Services/src/main/java/com/library/dto/Response.java
+++ b/Services/src/main/java/com/library/dto/ResponseDTO.java
@@ -1,12 +1,10 @@
package com.library.dto;
-public class Response {
+public class ResponseDTO {
String message;
-
- public Response(String msg){
+ public ResponseDTO(String msg){
this.message = msg;
}
-
public String getMessage() {
return message;
}
diff --git a/Services/src/main/java/com/library/entity/Author.java b/Services/src/main/java/com/library/entity/Author.java
index 5c886f7..1c644fd 100644
--- a/Services/src/main/java/com/library/entity/Author.java
+++ b/Services/src/main/java/com/library/entity/Author.java
@@ -1,19 +1,8 @@
package com.library.entity;
-import org.hibernate.annotations.LazyCollection;
-import org.hibernate.annotations.LazyCollectionOption;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.NotNull;
+
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@@ -33,7 +22,6 @@ public class Author implements Serializable {
@Column(name = "name")
private String name;
- @LazyCollection(LazyCollectionOption.FALSE)
@ManyToMany
@JoinTable(name = "author_book", joinColumns = {@JoinColumn(name = "authorId")}, inverseJoinColumns = {@JoinColumn(name = "isbn")})
List books = new ArrayList<>();
diff --git a/Services/src/main/java/com/library/entity/Book.java b/Services/src/main/java/com/library/entity/Book.java
index aa86a87..e675851 100644
--- a/Services/src/main/java/com/library/entity/Book.java
+++ b/Services/src/main/java/com/library/entity/Book.java
@@ -1,16 +1,9 @@
package com.library.entity;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
+
+import jakarta.persistence.*;
+import jakarta.validation.constraints.NotNull;
+
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@@ -45,13 +38,10 @@ public class Book implements Serializable {
@ManyToMany(fetch = FetchType.LAZY, mappedBy = "books")
List authors = new ArrayList<>();
- /*@ManyToMany(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE, CascadeType.PERSIST}, mappedBy = "borrowers")
- List borrowers = new ArrayList<>();*/
-
@OneToMany(mappedBy = "book", cascade = CascadeType.ALL)
private List bookLoan = new ArrayList<>();
- public Book(){
+ public Book() {
}
diff --git a/Services/src/main/java/com/library/entity/BookLoan.java b/Services/src/main/java/com/library/entity/BookLoan.java
index 773987a..9ee28b1 100644
--- a/Services/src/main/java/com/library/entity/BookLoan.java
+++ b/Services/src/main/java/com/library/entity/BookLoan.java
@@ -1,6 +1,7 @@
package com.library.entity;
-import javax.persistence.*;
+import jakarta.persistence.*;
+
import java.time.LocalDateTime;
@Entity
diff --git a/Services/src/main/java/com/library/entity/Borrower.java b/Services/src/main/java/com/library/entity/Borrower.java
index 9ced9f1..844bedd 100644
--- a/Services/src/main/java/com/library/entity/Borrower.java
+++ b/Services/src/main/java/com/library/entity/Borrower.java
@@ -1,6 +1,8 @@
package com.library.entity;
-import javax.persistence.*;
+
+import jakarta.persistence.*;
+
import java.util.ArrayList;
import java.util.List;
diff --git a/Services/src/main/java/com/library/entity/Configuration.java b/Services/src/main/java/com/library/entity/Configuration.java
index 9d0e26f..e62352d 100644
--- a/Services/src/main/java/com/library/entity/Configuration.java
+++ b/Services/src/main/java/com/library/entity/Configuration.java
@@ -2,15 +2,8 @@
import com.library.modal.Status;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
+import jakarta.persistence.*;
+import jakarta.validation.constraints.NotNull;
@Entity
@Table(name = "configuration")
diff --git a/Services/src/main/java/com/library/entity/Fine.java b/Services/src/main/java/com/library/entity/Fine.java
index 2a3baeb..b750198 100644
--- a/Services/src/main/java/com/library/entity/Fine.java
+++ b/Services/src/main/java/com/library/entity/Fine.java
@@ -1,6 +1,7 @@
package com.library.entity;
-import javax.persistence.*;
+import com.library.dto.FineDTO;
+import jakarta.persistence.*;
@Entity
@@ -8,7 +9,7 @@
@SqlResultSetMapping(
name = "resultMapper",
classes = {
- @ConstructorResult(targetClass = com.library.dto.Fine.class,
+ @ConstructorResult(targetClass = FineDTO.class,
columns = {
@ColumnResult(name = "cardId", type = Integer.class),
@ColumnResult(name = "totalFine", type = Long.class)
@@ -26,7 +27,7 @@ public class Fine {
private BookLoan bookLoan;
@Column(name = "fine_amt")
- private String fineAmount;
+ private float fineAmount;
@Column(name = "paid")
private boolean paid;
@@ -46,11 +47,11 @@ public void setFineId(int fineId) {
this.fineId = fineId;
}
- public String getFineAmount() {
+ public float getFineAmount() {
return fineAmount;
}
- public void setFineAmount(String fineAmount) {
+ public void setFineAmount(float fineAmount) {
this.fineAmount = fineAmount;
}
diff --git a/Services/src/main/java/com/library/error/BookNotAvailableException.java b/Services/src/main/java/com/library/exception/BookNotAvailableException.java
similarity index 83%
rename from Services/src/main/java/com/library/error/BookNotAvailableException.java
rename to Services/src/main/java/com/library/exception/BookNotAvailableException.java
index fce0b14..ec5c4ca 100644
--- a/Services/src/main/java/com/library/error/BookNotAvailableException.java
+++ b/Services/src/main/java/com/library/exception/BookNotAvailableException.java
@@ -1,4 +1,4 @@
-package com.library.error;
+package com.library.exception;
public class BookNotAvailableException extends RuntimeException{
public BookNotAvailableException(String message){
diff --git a/Services/src/main/java/com/library/error/BorrowerExistsException.java b/Services/src/main/java/com/library/exception/BorrowerExistsException.java
similarity index 82%
rename from Services/src/main/java/com/library/error/BorrowerExistsException.java
rename to Services/src/main/java/com/library/exception/BorrowerExistsException.java
index e9c4f31..0bbc147 100644
--- a/Services/src/main/java/com/library/error/BorrowerExistsException.java
+++ b/Services/src/main/java/com/library/exception/BorrowerExistsException.java
@@ -1,4 +1,4 @@
-package com.library.error;
+package com.library.exception;
public class BorrowerExistsException extends RuntimeException {
public BorrowerExistsException(String msg) {
diff --git a/Services/src/main/java/com/library/error/BorrowerThresholdException.java b/Services/src/main/java/com/library/exception/BorrowerThresholdException.java
similarity index 83%
rename from Services/src/main/java/com/library/error/BorrowerThresholdException.java
rename to Services/src/main/java/com/library/exception/BorrowerThresholdException.java
index dc2ef66..bd197d7 100644
--- a/Services/src/main/java/com/library/error/BorrowerThresholdException.java
+++ b/Services/src/main/java/com/library/exception/BorrowerThresholdException.java
@@ -1,4 +1,4 @@
-package com.library.error;
+package com.library.exception;
public class BorrowerThresholdException extends RuntimeException{
public BorrowerThresholdException(String message){
diff --git a/Services/src/main/java/com/library/exception/NoSuchBookException.java b/Services/src/main/java/com/library/exception/NoSuchBookException.java
new file mode 100644
index 0000000..1d0ee47
--- /dev/null
+++ b/Services/src/main/java/com/library/exception/NoSuchBookException.java
@@ -0,0 +1,7 @@
+package com.library.exception;
+
+public class NoSuchBookException extends RuntimeException {
+ public NoSuchBookException(String message){
+ super(message);
+ }
+}
diff --git a/Services/src/main/java/com/library/error/NoSuchBookLoanException.java b/Services/src/main/java/com/library/exception/NoSuchBookLoanException.java
similarity index 82%
rename from Services/src/main/java/com/library/error/NoSuchBookLoanException.java
rename to Services/src/main/java/com/library/exception/NoSuchBookLoanException.java
index 71685e8..ff38c85 100644
--- a/Services/src/main/java/com/library/error/NoSuchBookLoanException.java
+++ b/Services/src/main/java/com/library/exception/NoSuchBookLoanException.java
@@ -1,4 +1,4 @@
-package com.library.error;
+package com.library.exception;
public class NoSuchBookLoanException extends RuntimeException {
public NoSuchBookLoanException(String msg) {
diff --git a/Services/src/main/java/com/library/error/NoSuchBorrowerException.java b/Services/src/main/java/com/library/exception/NoSuchBorrowerException.java
similarity index 82%
rename from Services/src/main/java/com/library/error/NoSuchBorrowerException.java
rename to Services/src/main/java/com/library/exception/NoSuchBorrowerException.java
index 0f45172..97c92e3 100644
--- a/Services/src/main/java/com/library/error/NoSuchBorrowerException.java
+++ b/Services/src/main/java/com/library/exception/NoSuchBorrowerException.java
@@ -1,4 +1,4 @@
-package com.library.error;
+package com.library.exception;
public class NoSuchBorrowerException extends RuntimeException{
public NoSuchBorrowerException(String message){
diff --git a/Services/src/main/java/com/library/initial/InitialLoad.java b/Services/src/main/java/com/library/initial/InitialLoad.java
index 92b207a..907b7d7 100644
--- a/Services/src/main/java/com/library/initial/InitialLoad.java
+++ b/Services/src/main/java/com/library/initial/InitialLoad.java
@@ -7,40 +7,41 @@
import com.library.repository.AuthorRepository;
import com.library.repository.BookRepository;
import com.library.repository.ConfigurationRepository;
+import jakarta.transaction.Transactional;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import javax.annotation.PostConstruct;
-import javax.transaction.Transactional;
import java.io.BufferedReader;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
@Service
+@Transactional
public class InitialLoad {
-
private static final Logger LOGGER = LogManager.getLogger(InitialLoad.class);
- @Autowired
+ final
BookRepository bookRepository;
- @Autowired
+ final
ConfigurationRepository configurationRepository;
- @Autowired
+ final
AuthorRepository authorRepository;
+ public InitialLoad(BookRepository bookRepository, ConfigurationRepository configurationRepository, AuthorRepository authorRepository) {
+ this.bookRepository = bookRepository;
+ this.configurationRepository = configurationRepository;
+ this.authorRepository = authorRepository;
+ }
+
public void load() {
- if(configurationRepository.findAll().size() > 0 && configurationRepository.findAll().get(0).getStatus().equals(Status.COMPLETED)){
+ if (!configurationRepository.findAll().isEmpty() && configurationRepository.findAll().get(0).getStatus().equals(Status.COMPLETED)) {
LOGGER.info("Data has been loaded");
return;
}
@@ -51,7 +52,7 @@ public void load() {
String line;
try {
ClassLoader classLoader = InitialLoad.class.getClassLoader();
- bufferedReader = new BufferedReader(new FileReader(classLoader.getResource("books.csv").getFile()));
+ bufferedReader = new BufferedReader(new FileReader(classLoader.getResource("books-lite.csv").getFile()));
Configuration configuration = new Configuration();
configuration.setStatus(Status.COMPLETED);
configurationRepository.save(configuration);
@@ -81,15 +82,12 @@ private void addBook(String[] bookData) {
book.setCover(bookData[4]);
book.setPublisher(bookData[5]);
book.setPages(bookData[6]);
+ book.setAvailable(true);
book = bookRepository.saveAndFlush(book);
String[] names = bookData[3].split(",");
Set set = new HashSet<>();
-
- for (String s : names) {
- set.add(s);
- }
-
+ Collections.addAll(set, names);
try {
List authorList = new ArrayList<>();
@@ -107,8 +105,7 @@ private void addBook(String[] bookData) {
}
authorRepository.saveAll(authorList);
} catch (Exception e) {
- System.out.println("Book name" + book.getIsbn() + " - " + book.getTitle());
- System.out.println(book.getAuthors());
+ LOGGER.error("Book name" + book.getIsbn() + " - " + book.getTitle());
throw e;
}
}
diff --git a/Services/src/main/java/com/library/nlp/StanfordQuery.java b/Services/src/main/java/com/library/nlp/StanfordQuery.java
index 7bc31a2..924c4f4 100644
--- a/Services/src/main/java/com/library/nlp/StanfordQuery.java
+++ b/Services/src/main/java/com/library/nlp/StanfordQuery.java
@@ -1,6 +1,6 @@
package com.library.nlp;
-import com.library.services.LibraryServicesImpl;
+import com.library.services.BorrowerServiceImpl;
import edu.stanford.nlp.ie.AbstractSequenceClassifier;
import edu.stanford.nlp.ie.crf.CRFClassifier;
import edu.stanford.nlp.ling.CoreLabel;
@@ -20,7 +20,7 @@ public class StanfordQuery implements NLPQuery {
public StanfordQuery() {
try {
LOGGER.debug("Classifier loading started");
- ClassLoader classLoader = LibraryServicesImpl.class.getClassLoader();
+ ClassLoader classLoader = BorrowerServiceImpl.class.getClassLoader();
File file = new File(classLoader.getResource("nlp/english.all.3class.distsim.crf.ser.gz").getFile());
this.classifier = CRFClassifier.getClassifier(file);
LOGGER.debug("Classifier loaded successfully");
diff --git a/Services/src/main/java/com/library/repository/AuthorRepository.java b/Services/src/main/java/com/library/repository/AuthorRepository.java
index 6126c7b..f22fc4c 100644
--- a/Services/src/main/java/com/library/repository/AuthorRepository.java
+++ b/Services/src/main/java/com/library/repository/AuthorRepository.java
@@ -10,7 +10,6 @@
public interface AuthorRepository extends JpaRepository {
List findByName(String name);
-
List findByNameIgnoreCaseContaining(String name);
}
diff --git a/Services/src/main/java/com/library/repository/BookLoanRepository.java b/Services/src/main/java/com/library/repository/BookLoanRepository.java
index f2ae55c..eec211f 100644
--- a/Services/src/main/java/com/library/repository/BookLoanRepository.java
+++ b/Services/src/main/java/com/library/repository/BookLoanRepository.java
@@ -3,6 +3,8 @@
import com.library.entity.Book;
import com.library.entity.BookLoan;
import com.library.entity.Borrower;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
@@ -17,4 +19,6 @@ public interface BookLoanRepository extends JpaRepository {
List findByBorrowerAndBook(Borrower borrower, Book book);
+ Page findAllByBorrowerAndDateInIsNull(Borrower borrower, Pageable pageable);
+
}
diff --git a/Services/src/main/java/com/library/repository/BookRepository.java b/Services/src/main/java/com/library/repository/BookRepository.java
index 9b07675..97e6f3c 100644
--- a/Services/src/main/java/com/library/repository/BookRepository.java
+++ b/Services/src/main/java/com/library/repository/BookRepository.java
@@ -1,5 +1,6 @@
package com.library.repository;
+import com.library.entity.Author;
import com.library.entity.Book;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
@@ -14,4 +15,6 @@ public interface BookRepository extends JpaRepository {
Optional findById(String isbn);
Page findByTitleIgnoreCaseContaining(String title, Pageable pageable);
+
+ Page findAllByAuthorsIn(List authors, Pageable pageable);
}
diff --git a/Services/src/main/java/com/library/repository/BorrowerRepository.java b/Services/src/main/java/com/library/repository/BorrowerRepository.java
index 474af2f..c354115 100644
--- a/Services/src/main/java/com/library/repository/BorrowerRepository.java
+++ b/Services/src/main/java/com/library/repository/BorrowerRepository.java
@@ -14,8 +14,4 @@ public interface BorrowerRepository extends JpaRepository {
Optional findByCardId(int cardId);
- List findByCardIdOrBNameIgnoreCaseContaining(int cardId, String name);
-
- List findByBNameIgnoreCaseContaining(String name);
-
}
diff --git a/Services/src/main/java/com/library/repository/FineRepositoryCustom.java b/Services/src/main/java/com/library/repository/FineRepositoryCustom.java
index 62bb4c5..db54b1d 100644
--- a/Services/src/main/java/com/library/repository/FineRepositoryCustom.java
+++ b/Services/src/main/java/com/library/repository/FineRepositoryCustom.java
@@ -1,10 +1,10 @@
package com.library.repository;
-import com.library.dto.Fine;
+import com.library.dto.FineDTO;
import java.util.List;
public interface FineRepositoryCustom {
- List findAllFinesWithSum();
+ List findAllFinesWithSum();
}
diff --git a/Services/src/main/java/com/library/repository/FineRepositoryCustomImpl.java b/Services/src/main/java/com/library/repository/FineRepositoryCustomImpl.java
index 1ffb740..e0b5494 100644
--- a/Services/src/main/java/com/library/repository/FineRepositoryCustomImpl.java
+++ b/Services/src/main/java/com/library/repository/FineRepositoryCustomImpl.java
@@ -1,10 +1,11 @@
package com.library.repository;
-import com.library.dto.Fine;
+import com.library.dto.FineDTO;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
+
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
import java.util.List;
public class FineRepositoryCustomImpl implements FineRepositoryCustom{
@@ -13,12 +14,12 @@ public class FineRepositoryCustomImpl implements FineRepositoryCustom{
private EntityManager entityManager;
@Override
- public List findAllFinesWithSum() {
+ public List findAllFinesWithSum() {
Query query = entityManager.createNativeQuery("select b.card_id as cardId, sum(fine_amt) as totalFine from fine f ,book_loan b " +
"where b.book_loan_id= f.loan_id and f.paid=0 group by b.card_id", "resultMapper");
- List fines = query.getResultList();
- return fines;
+ List fineDTOS = query.getResultList();
+ return fineDTOS;
}
diff --git a/Services/src/main/java/com/library/modal/BookLoanRequest.java b/Services/src/main/java/com/library/requests/BookLoanRequest.java
similarity index 92%
rename from Services/src/main/java/com/library/modal/BookLoanRequest.java
rename to Services/src/main/java/com/library/requests/BookLoanRequest.java
index fa35e77..71812f6 100644
--- a/Services/src/main/java/com/library/modal/BookLoanRequest.java
+++ b/Services/src/main/java/com/library/requests/BookLoanRequest.java
@@ -1,4 +1,4 @@
-package com.library.modal;
+package com.library.requests;
public class BookLoanRequest {
diff --git a/Services/src/main/java/com/library/modal/CheckInBook.java b/Services/src/main/java/com/library/requests/CheckInBookRequest.java
similarity index 88%
rename from Services/src/main/java/com/library/modal/CheckInBook.java
rename to Services/src/main/java/com/library/requests/CheckInBookRequest.java
index 2c77a2c..7e1c0d0 100644
--- a/Services/src/main/java/com/library/modal/CheckInBook.java
+++ b/Services/src/main/java/com/library/requests/CheckInBookRequest.java
@@ -1,7 +1,6 @@
-package com.library.modal;
-
-public class CheckInBook {
+package com.library.requests;
+public class CheckInBookRequest {
public int cardId;
public String isbn;
public String name;
diff --git a/Services/src/main/java/com/library/modal/BorrowerData.java b/Services/src/main/java/com/library/requests/CreateBorrowerRequest.java
similarity index 69%
rename from Services/src/main/java/com/library/modal/BorrowerData.java
rename to Services/src/main/java/com/library/requests/CreateBorrowerRequest.java
index a3db7ba..0280820 100644
--- a/Services/src/main/java/com/library/modal/BorrowerData.java
+++ b/Services/src/main/java/com/library/requests/CreateBorrowerRequest.java
@@ -1,10 +1,16 @@
-package com.library.modal;
+package com.library.requests;
-public class BorrowerData {
+import jakarta.validation.constraints.NotNull;
+public class CreateBorrowerRequest {
+
+ @NotNull(message = "name is required")
private String name;
+ @NotNull(message = "address is required")
private String address;
+ @NotNull(message = "phone is required")
private String phone;
+ @NotNull(message = "ssn is required")
private String ssn;
public String getName() {
diff --git a/Services/src/main/java/com/library/modal/FineRequest.java b/Services/src/main/java/com/library/requests/PayFineRequest.java
similarity index 72%
rename from Services/src/main/java/com/library/modal/FineRequest.java
rename to Services/src/main/java/com/library/requests/PayFineRequest.java
index ccb12c2..278babb 100644
--- a/Services/src/main/java/com/library/modal/FineRequest.java
+++ b/Services/src/main/java/com/library/requests/PayFineRequest.java
@@ -1,12 +1,10 @@
-package com.library.modal;
+package com.library.requests;
-public class FineRequest {
+public class PayFineRequest {
private int cardId;
-
public int getCardId() {
return cardId;
}
-
public void setCardId(int cardId) {
this.cardId = cardId;
}
diff --git a/Services/src/main/java/com/library/services/BorrowerService.java b/Services/src/main/java/com/library/services/BorrowerService.java
new file mode 100644
index 0000000..32e068f
--- /dev/null
+++ b/Services/src/main/java/com/library/services/BorrowerService.java
@@ -0,0 +1,14 @@
+package com.library.services;
+
+import com.library.dto.BorrowerDTO;
+import com.library.dto.ResponseDTO;
+import com.library.requests.BookLoanRequest;
+import com.library.requests.CheckInBookRequest;
+import com.library.requests.CreateBorrowerRequest;
+
+public interface BorrowerService {
+
+ BorrowerDTO addBorrower(CreateBorrowerRequest createBorrowerRequest);
+ ResponseDTO addBookLoan(BookLoanRequest bookLoanRequest);
+ ResponseDTO checkInBook(CheckInBookRequest book);
+}
diff --git a/Services/src/main/java/com/library/services/BorrowerServiceImpl.java b/Services/src/main/java/com/library/services/BorrowerServiceImpl.java
new file mode 100644
index 0000000..679b2d6
--- /dev/null
+++ b/Services/src/main/java/com/library/services/BorrowerServiceImpl.java
@@ -0,0 +1,123 @@
+package com.library.services;
+
+import com.library.dto.BorrowerDTO;
+import com.library.dto.ResponseDTO;
+import com.library.entity.Book;
+import com.library.entity.BookLoan;
+import com.library.entity.Borrower;
+import com.library.exception.*;
+import com.library.repository.*;
+import com.library.requests.BookLoanRequest;
+import com.library.requests.CheckInBookRequest;
+import com.library.requests.CreateBorrowerRequest;
+import jakarta.transaction.Transactional;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Optional;
+
+@Service
+@Transactional
+public class BorrowerServiceImpl implements BorrowerService {
+
+ final BorrowerRepository borrowerRepository;
+ final BookLoanRepository bookLoanRepository;
+ final FineRepository fineRepository;
+ final BookRepository bookRepository;
+ final AuthorRepository authorRepository;
+
+ public BorrowerServiceImpl(BorrowerRepository borrowerRepository,
+ BookLoanRepository bookLoanRepository,
+ FineRepository fineRepository,
+ BookRepository bookRepository,
+ AuthorRepository authorRepository) {
+ this.borrowerRepository = borrowerRepository;
+ this.bookLoanRepository = bookLoanRepository;
+ this.fineRepository = fineRepository;
+ this.bookRepository = bookRepository;
+ this.authorRepository = authorRepository;
+ }
+
+
+ /**
+ * Add Borrower
+ */
+ public BorrowerDTO addBorrower(CreateBorrowerRequest createBorrowerRequest) {
+
+ if (borrowerRepository.findBySsn(createBorrowerRequest.getSsn()).isPresent()) {
+ throw new BorrowerExistsException("Borrower exist with ssn number " + createBorrowerRequest.getSsn());
+ }
+
+ Borrower borrower = new Borrower();
+ borrower.setbName(createBorrowerRequest.getName());
+ borrower.setAddress(createBorrowerRequest.getAddress());
+ borrower.setPhone(createBorrowerRequest.getPhone());
+ borrower.setSsn(createBorrowerRequest.getSsn());
+
+ Borrower persistedBorrower = borrowerRepository.save(borrower);
+ BorrowerDTO borrowerDto = new BorrowerDTO();
+ borrowerDto.setName(persistedBorrower.getbName());
+ borrowerDto.setCardId(persistedBorrower.getCardId());
+ borrowerDto.setAddress(persistedBorrower.getAddress());
+ return borrowerDto;
+ }
+
+ @Override
+ public ResponseDTO checkInBook(CheckInBookRequest checkInBookRequest) {
+ Optional bookOptional = bookRepository.findById(checkInBookRequest.getIsbn());
+ if (bookOptional.isEmpty()) {
+ throw new NoSuchBookException("book doesn't exists");
+ }
+ Optional borrowerOptional = borrowerRepository.findByCardId(checkInBookRequest.getCardId());
+ if (borrowerOptional.isEmpty()) {
+ throw new NoSuchBorrowerException("Borrower doesn't exists");
+ }
+
+ Book book = bookOptional.get();
+ Borrower borrower = borrowerOptional.get();
+ BookLoan bookLoan = bookLoanRepository.findByBorrowerAndBook(borrower, book).get(0);
+ bookLoan.setDateIn(LocalDateTime.now());
+ book.setAvailable(true);
+ bookRepository.save(book);
+ bookLoanRepository.save(bookLoan);
+ return new ResponseDTO("Book Checked In");
+
+ }
+
+ @Override
+ public ResponseDTO addBookLoan(BookLoanRequest bookLoanRequest) {
+
+ String isbn = bookLoanRequest.getIsbn();
+ int borrowerId = bookLoanRequest.getBorrowerId();
+
+ Optional borrowerOptional = borrowerRepository.findByCardId(borrowerId);
+
+ if (borrowerOptional.isEmpty()) {
+ throw new NoSuchBorrowerException("No such borrower");
+ }
+
+ List bookLoans = bookLoanRepository.findByBorrower(borrowerOptional.get()).stream().filter(x -> x.getDateIn() == null)
+ .toList();
+ if (bookLoans.size() > 2) {
+ throw new BorrowerThresholdException("3 Book have been issued to the borrower");
+ }
+
+ Optional bookOptional = bookRepository.findById(isbn);
+ if (bookOptional.isEmpty() || !bookOptional.get().isAvailable()) {
+ throw new BookNotAvailableException("Book is not available. All books have been checked out");
+ }
+
+ Book book = bookOptional.get();
+ Borrower borrower = borrowerOptional.get();
+ Book book1 = bookOptional.get();
+ BookLoan bookLoan = new BookLoan(borrower, book1);
+ bookLoan.setDateOut(LocalDateTime.now());
+ bookLoan.setDueDate(LocalDateTime.now().minusDays(-14));
+ bookLoan.setBorrower(borrower);
+ book.setAvailable(false);
+ bookLoanRepository.save(bookLoan);
+ bookRepository.save(book);
+ return new ResponseDTO("Book checked out");
+ }
+}
diff --git a/Services/src/main/java/com/library/services/FineService.java b/Services/src/main/java/com/library/services/FineService.java
new file mode 100644
index 0000000..b4b7e0a
--- /dev/null
+++ b/Services/src/main/java/com/library/services/FineService.java
@@ -0,0 +1,14 @@
+package com.library.services;
+
+import com.library.dto.FineDTO;
+import com.library.dto.ResponseDTO;
+
+import java.util.List;
+
+public interface FineService {
+
+ ResponseDTO calculateFines();
+ ResponseDTO payFine(int cardId);
+ List getAllFines();
+ List getFineForCardId(int cardId);
+}
diff --git a/Services/src/main/java/com/library/services/FineServiceImpl.java b/Services/src/main/java/com/library/services/FineServiceImpl.java
new file mode 100644
index 0000000..50f4591
--- /dev/null
+++ b/Services/src/main/java/com/library/services/FineServiceImpl.java
@@ -0,0 +1,96 @@
+package com.library.services;
+
+import com.library.dto.FineDTO;
+import com.library.dto.ResponseDTO;
+import com.library.entity.BookLoan;
+import com.library.entity.Borrower;
+import com.library.entity.Fine;
+import com.library.exception.NoSuchBookLoanException;
+import com.library.exception.NoSuchBorrowerException;
+import com.library.repository.BookLoanRepository;
+import com.library.repository.BorrowerRepository;
+import com.library.repository.FineRepository;
+import jakarta.transaction.Transactional;
+import org.springframework.stereotype.Service;
+
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+@Service
+@Transactional
+public class FineServiceImpl implements FineService {
+
+ private final BorrowerRepository borrowerRepository;
+ private final FineRepository fineRepository;
+ private final BookLoanRepository bookLoanRepository;
+
+ public FineServiceImpl(BorrowerRepository borrowerRepository, FineRepository fineRepository, BookLoanRepository bookLoanRepository) {
+ this.borrowerRepository = borrowerRepository;
+ this.fineRepository = fineRepository;
+ this.bookLoanRepository = bookLoanRepository;
+ }
+
+ public List getAllFines() {
+ return fineRepository.findAllFinesWithSum();
+ }
+
+ public ResponseDTO calculateFines() {
+ List bookLoans = bookLoanRepository.findAllByDateInIsNull();
+ Fine fine;
+ LocalDateTime date = LocalDateTime.now();
+ for (BookLoan bookLoan : bookLoans) {
+ if (bookLoan.getDueDate().isBefore(date)) {
+
+ if (bookLoan.getFine() == null) {
+ fine = new Fine(bookLoan);
+ } else {
+ fine = bookLoan.getFine();
+ }
+ long daysOverDue = Duration.between(bookLoan.getDueDate().toLocalDate().atStartOfDay(), date.toLocalDate().atStartOfDay()).toDays();
+ fine.setFineAmount(daysOverDue * 0.25f);
+ fineRepository.save(fine);
+ }
+ }
+
+ return new ResponseDTO("All fines calculated");
+ }
+
+
+ @Override
+ public ResponseDTO payFine(int cardId) {
+ Optional borrowerOptional = borrowerRepository.findByCardId(cardId);
+ if (borrowerOptional.isEmpty()) {
+ throw new NoSuchBorrowerException("No such borrower exists");
+ }
+
+ List bookLoans = borrowerOptional.get().getBookLoans();
+ if (bookLoans.isEmpty()) {
+ throw new NoSuchBookLoanException("No loans for this borrower");
+ }
+
+ for (BookLoan bookLoan : bookLoans) {
+ Optional fine = fineRepository.findByBookLoan(bookLoan);
+ if (fine.isPresent()) {
+ fine.get().setPaid(true);
+ fineRepository.save(fine.get());
+ }
+ }
+ return new ResponseDTO("Paid");
+ }
+
+ @Override
+ public List getFineForCardId(int cardId) {
+ Optional borrowerOptional = borrowerRepository.findByCardId(cardId);
+
+ if (borrowerOptional.isEmpty()) {
+ return new ArrayList<>();
+ }
+ Borrower borrower = borrowerOptional.get();
+ List bookLoans = borrower.getBookLoans();
+ return bookLoans.stream().map(x -> new FineDTO(x.getBorrower().getCardId(), x.getFine().getFineAmount())).collect(Collectors.toList());
+ }
+}
diff --git a/Services/src/main/java/com/library/services/LibraryServices.java b/Services/src/main/java/com/library/services/LibraryServices.java
deleted file mode 100644
index df2205e..0000000
--- a/Services/src/main/java/com/library/services/LibraryServices.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.library.services;
-
-import java.util.List;
-
-import com.library.dto.Book;
-import com.library.dto.Response;
-import com.library.entity.Borrower;
-import com.library.entity.Fine;
-import com.library.modal.BookLoanRequest;
-import com.library.modal.CheckInBook;
-
-public interface LibraryServices {
-
- com.library.dto.Borrower addBorrower(Borrower borrower);
-
- Response calculateFines();
-
- Response payFine(int cardId);
-
- Response addBookLoan(BookLoanRequest bookLoanRequest);
-
- Response checkInBook(CheckInBook book);
-
- List getAllFines();
-
- List getFineForCardId(int cardId);
-
- List searchBooks(String query, int page, int size);
-
- List searchBooksForBorrower(String borrowerName, int cardId, String isbn);
-
-}
diff --git a/Services/src/main/java/com/library/services/LibraryServicesImpl.java b/Services/src/main/java/com/library/services/LibraryServicesImpl.java
deleted file mode 100644
index b248a57..0000000
--- a/Services/src/main/java/com/library/services/LibraryServicesImpl.java
+++ /dev/null
@@ -1,254 +0,0 @@
-package com.library.services;
-
-import com.library.dto.Author;
-import com.library.dto.Response;
-import com.library.entity.Book;
-import com.library.entity.BookLoan;
-import com.library.entity.Borrower;
-import com.library.entity.Fine;
-import com.library.error.*;
-import com.library.modal.*;
-import com.library.nlp.*;
-import com.library.repository.*;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.hibernate.Query;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.stereotype.Service;
-
-import javax.swing.text.html.Option;
-import java.time.Duration;
-import java.time.LocalDateTime;
-import java.util.*;
-import java.util.stream.Collectors;
-
-@Service
-public class LibraryServicesImpl implements LibraryServices {
-
- private static final Logger LOGGER = LogManager.getLogger(LibraryServicesImpl.class);
-
- @Autowired
- BorrowerRepository borrowerRepository;
-
- @Autowired
- BookLoanRepository bookLoanRepository;
-
- @Autowired
- FineRepository fineRepository;
-
- @Autowired
- BookRepository bookRepository;
-
- @Autowired
- AuthorRepository authorRepository;
-
- NLPQuery nlpQuery;
-
- public LibraryServicesImpl() {
- nlpQuery = NLPFactory.getSource(NLPResource.STANFORD);
- }
-
-
- /**
- * Add Borrower
- */
- public com.library.dto.Borrower addBorrower(Borrower borrower) {
-
- if (borrowerRepository.findBySsn(borrower.getSsn()).isPresent()) {
- throw new BorrowerExistsException("Borrower exist with ssn number " + borrower.getSsn());
- }
-
- Borrower borrower1 = borrowerRepository.save(borrower);
-
- com.library.dto.Borrower borrowerDto = new com.library.dto.Borrower();
- borrowerDto.setName(borrower1.getbName());
- borrowerDto.setCardId(borrower1.getCardId());
- borrowerDto.setAddress(borrower1.getAddress());
- return borrowerDto;
- }
-
- public List getAllFines() {
- return fineRepository.findAllFinesWithSum();
- }
-
- public Response calculateFines() {
- List bookLoans = bookLoanRepository.findAllByDateInIsNull();
- Fine fine;
- LocalDateTime date = LocalDateTime.now();
- for (BookLoan bookLoan : bookLoans) {
- if (bookLoan.getDueDate().isBefore(date)) {
-
- if (bookLoan.getFine() == null) {
- fine = new Fine(bookLoan);
- } else {
- fine = bookLoan.getFine();
- }
- long daysOverDue = Duration.between(bookLoan.getDueDate().toLocalDate().atStartOfDay(), date.toLocalDate().atStartOfDay()).toDays();
- fine.setFineAmount(Double.toString(daysOverDue * 0.25));
- fineRepository.save(fine);
- }
- }
-
- return new Response("All fines calculated");
- }
-
- @Override
- public Response payFine(int cardId) {
- Borrower borrower = borrowerRepository.findByCardId(cardId).get();
- if (borrower == null) {
- throw new NoSuchBorrowerException("No such borrower exists");
- }
-
- List bookLoans = borrower.getBookLoans();
- if (bookLoans.isEmpty()) {
- throw new NoSuchBookLoanException("No loans for this borrower");
- }
-
- for (BookLoan bookLoan : bookLoans) {
- Optional fine = fineRepository.findByBookLoan(bookLoan);
- if (fine.isPresent()) {
- fine.get().setPaid(true);
- fineRepository.save(fine.get());
- }
- }
- return new Response("Paid");
- }
-
- @Override
- public Response checkInBook(CheckInBook book) {
- bookRepository.findById(book.getIsbn()).get();
- BookLoan bookLoan = bookLoanRepository.findByBorrowerAndBook(borrowerRepository.findByCardId(book.getCardId()).get(),
- bookRepository.findById(book.getIsbn()).get()).get(0);
- bookLoan.setDateIn(LocalDateTime.now());
- Book book1 = bookRepository.findById(book.getIsbn()).get();
- book1.setAvailable(true);
- bookRepository.save(book1);
- bookLoanRepository.save(bookLoan);
- return new Response("Book Checked In");
-
- }
-
- @Override
- public Response addBookLoan(BookLoanRequest bookLoanRequest) {
-
- String isbn = bookLoanRequest.getIsbn();
- int borrowerId = bookLoanRequest.getBorrowerId();
-
- if (!borrowerRepository.findByCardId(borrowerId).isPresent()) {
- throw new NoSuchBorrowerException("No such borrower");
- }
-
- List bookLoans = bookLoanRepository.findByBorrower(borrowerRepository.findByCardId(borrowerId).get()).stream().filter(x -> x.getDateIn() == null)
- .collect(Collectors.toList());
- if (bookLoans.size() > 2) {
- throw new BorrowerThresholdException("3 Book have been issued to the borrower");
- }
-
- Book book = bookRepository.findById(isbn).get();
- if (book == null || !book.isAvailable()) {
- throw new BookNotAvailableException("Book is not available. All books have been checked out");
- }
-
- Borrower borrower = borrowerRepository.findByCardId(borrowerId).get();
- Book book1 = bookRepository.findById(isbn).get();
- BookLoan bookLoan = new BookLoan(borrower, book1);
- bookLoan.setDateOut(LocalDateTime.now());
- bookLoan.setDueDate(LocalDateTime.now().minusDays(-14));
- bookLoan.setBorrower(borrower);
- book.setAvailable(false);
- bookLoanRepository.save(bookLoan);
- bookRepository.save(book);
-
- return new Response("Book checked out");
- }
-
-
- @Override
- public List getFineForCardId(int cardId) {
- Borrower borrower = borrowerRepository.findByCardId(cardId).get();
- List bookLoans = borrower.getBookLoans();
- return bookLoans.stream().map(x -> x.getFine()).collect(Collectors.toList());
- }
-
- @Override
- public List searchBooks(String query, int page, int size) {
-
- if (query.matches("^(\\d{13})?$")) {
- Book book = bookRepository.findById(query).get();
- List books = new ArrayList<>();
- books.add(book);
- return mapBooksToBooksDto(books);
- }
- Feature feature = this.nlpQuery.getQuery(query);
- LOGGER.info("Feature is " + feature);
- if (feature.getFeatureType() == FeatureType.AUTHOR) {
- List authors = authorRepository.findByNameIgnoreCaseContaining(feature.getQuery());
- List bookList = authors.stream().flatMap(x -> x.getBooks().stream()).collect(Collectors.toList());
- return mapBooksToBooksDto(bookList);
- } else {
- if (size > 100) {
- size = 100;
- }
- return mapBooksToBooksDto(bookRepository.findByTitleIgnoreCaseContaining(feature.getQuery(), PageRequest.of(page, size)).getContent());
- }
- }
-
- @Override
- public List searchBooksForBorrower(String borrowerName, int cardId, String isbn) {
-
- Optional borrower = borrowerRepository.findByCardId(cardId);
- if (!borrower.isPresent()) {
- throw new NoSuchBorrowerException("No borrower exists for this card Id");
- }
-
- List bookList = borrower.get().getBookLoans().stream().filter(y -> y.getDateIn() == null).map(x -> x.getBook()).collect(Collectors.toList());
-
- List list = mapBooksToBooksDto(bookList);
- list.stream().forEach(x -> {
- com.library.dto.Borrower borrower1 = new com.library.dto.Borrower();
- borrower1.setName(borrower.get().getbName());
- borrower1.setCardId(borrower.get().getCardId());
- x.setBorrower(borrower1);
- });
- return list;
- }
-
-
- /**
- * Map books to books DTO
- *
- * @param books
- * @return
- */
- private List mapBooksToBooksDto(List books) {
-
- List list = new ArrayList<>();
-
- books.forEach(x -> {
-
- com.library.dto.Book book = new com.library.dto.Book();
- book.setISBN(x.getIsbn());
- book.setTitle(x.getTitle());
- book.setCover(x.getCover());
- book.setPages(x.getPages());
- book.setAvailable(x.isAvailable());
- List author = new ArrayList<>();
- x.getAuthors().forEach(y -> {
- Author author1 = new Author();
- author1.setName(y.getName());
- author.add(author1);
- });
-
- book.setAuthor(author);
- list.add(book);
- });
-
-
- return list;
-
- }
-
-}
diff --git a/Services/src/main/java/com/library/services/SearchService.java b/Services/src/main/java/com/library/services/SearchService.java
new file mode 100644
index 0000000..c74171a
--- /dev/null
+++ b/Services/src/main/java/com/library/services/SearchService.java
@@ -0,0 +1,10 @@
+package com.library.services;
+
+import com.library.dto.BookPaginatedDTO;
+import org.springframework.data.domain.Pageable;
+
+public interface SearchService {
+ BookPaginatedDTO searchBooks(String query, Pageable pageable);
+
+ BookPaginatedDTO searchBooksForBorrower(String borrowerName, int cardId, String isbn, Pageable pageable);
+}
diff --git a/Services/src/main/java/com/library/services/SearchServiceImpl.java b/Services/src/main/java/com/library/services/SearchServiceImpl.java
new file mode 100644
index 0000000..c7c2944
--- /dev/null
+++ b/Services/src/main/java/com/library/services/SearchServiceImpl.java
@@ -0,0 +1,83 @@
+package com.library.services;
+
+import com.library.dto.BookDTO;
+import com.library.dto.BookPaginatedDTO;
+import com.library.dto.PaginatedDTO;
+import com.library.entity.Book;
+import com.library.entity.BookLoan;
+import com.library.entity.Borrower;
+import com.library.exception.NoSuchBorrowerException;
+import com.library.nlp.*;
+import com.library.repository.AuthorRepository;
+import com.library.repository.BookLoanRepository;
+import com.library.repository.BookRepository;
+import com.library.repository.BorrowerRepository;
+import com.library.utils.MapperUtils;
+import jakarta.transaction.Transactional;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+
+@Service
+@Transactional
+public class SearchServiceImpl implements SearchService {
+
+ private static final Logger LOGGER = LogManager.getLogger(BorrowerServiceImpl.class);
+ private final BookRepository bookRepository;
+ private final AuthorRepository authorRepository;
+
+ private final BorrowerRepository borrowerRepository;
+ private final BookLoanRepository bookLoanRepository;
+
+ NLPQuery nlpQuery;
+
+ public SearchServiceImpl(BookRepository bookRepository, AuthorRepository authorRepository, BorrowerRepository borrowerRepository, BookLoanRepository bookLoanRepository) {
+ this.bookRepository = bookRepository;
+ this.authorRepository = authorRepository;
+ this.borrowerRepository = borrowerRepository;
+ this.bookLoanRepository = bookLoanRepository;
+ nlpQuery = NLPFactory.getSource(NLPResource.STANFORD);
+ }
+
+ @Override
+ public BookPaginatedDTO searchBooks(String query, Pageable pageable) {
+
+ if (query.matches("^(\\d{13})?$")) {
+ Book book = bookRepository.findById(query).get();
+ List books = new ArrayList<>();
+ books.add(MapperUtils.mapBookToBookDTO(book, null));
+ return new BookPaginatedDTO(new PaginatedDTO(1, pageable.getPageNumber(), pageable.getPageSize(), 1), books);
+ }
+ Feature feature = this.nlpQuery.getQuery(query);
+ LOGGER.info("Feature is " + feature);
+ if (feature.getFeatureType() == FeatureType.AUTHOR) {
+ List authors = authorRepository.findByNameIgnoreCaseContaining(feature.getQuery());
+ Page bookList = bookRepository.findAllByAuthorsIn(authors, pageable);
+ return MapperUtils.mapBooksToBooksDto(bookList);
+ } else {
+ Page bookPage = bookRepository.findByTitleIgnoreCaseContaining(feature.getQuery(), pageable);
+ return MapperUtils.mapBooksToBooksDto(bookPage);
+ }
+ }
+
+ @Override
+ public BookPaginatedDTO searchBooksForBorrower(String borrowerName, int cardId, String isbn, Pageable pageable) {
+
+ Optional borrower = borrowerRepository.findByCardId(cardId);
+ if (borrower.isEmpty()) {
+ throw new NoSuchBorrowerException("No borrower exists for this card Id");
+ }
+
+ // List bookList = borrower.get().getBookLoans().stream().filter(y -> y.getDateIn() == null).map(BookLoan::getBook).collect(Collectors.toList());
+
+ Page bookLoans = bookLoanRepository.findAllByBorrowerAndDateInIsNull(borrower.get(), pageable);
+ return MapperUtils.mapBookLoansToBookDTO(bookLoans);
+ }
+}
diff --git a/Services/src/main/java/com/library/utils/MapperUtils.java b/Services/src/main/java/com/library/utils/MapperUtils.java
new file mode 100644
index 0000000..e9f05de
--- /dev/null
+++ b/Services/src/main/java/com/library/utils/MapperUtils.java
@@ -0,0 +1,65 @@
+package com.library.utils;
+
+import com.library.dto.*;
+import com.library.entity.Book;
+import com.library.entity.BookLoan;
+import com.library.entity.Borrower;
+import org.springframework.data.domain.Page;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MapperUtils {
+ /**
+ * Map books to books DTO
+ */
+ public static BookPaginatedDTO mapBooksToBooksDto(Page books) {
+ List bookDTOS = new ArrayList<>();
+ books.getContent().forEach(bo -> {
+ BookDTO bookDTO = mapBookToBookDTO(bo, null);
+ bookDTOS.add(bookDTO);
+ });
+
+ PaginatedDTO paginatedDTO = new PaginatedDTO(books.getTotalPages(), books.getNumber(), books.getSize(), books.getTotalElements());
+ return new BookPaginatedDTO(paginatedDTO, bookDTOS);
+ }
+
+ public static BookPaginatedDTO mapBookLoansToBookDTO(Page bookLoans) {
+
+ List books = new ArrayList<>();
+ bookLoans.getContent().forEach(bookLoan -> {
+ books.add(mapBookToBookDTO(bookLoan.getBook(), bookLoan.getBorrower()));
+ });
+ PaginatedDTO paginatedDTO = new PaginatedDTO(bookLoans.getTotalPages(), bookLoans.getNumber(), bookLoans.getSize(), bookLoans.getTotalElements());
+ return new BookPaginatedDTO(paginatedDTO, books);
+
+ }
+
+ public static BorrowerDTO mapBorrowerToBorrowerDTO(Borrower borrower) {
+ BorrowerDTO borrowerDTO = new BorrowerDTO();
+ borrowerDTO.setName(borrower.getbName());
+ borrowerDTO.setCardId(borrower.getCardId());
+ return borrowerDTO;
+ }
+
+ public static BookDTO mapBookToBookDTO(Book book, Borrower borrower) {
+ BookDTO bookDTO = new BookDTO();
+ bookDTO.setISBN(book.getIsbn());
+ bookDTO.setTitle(book.getTitle());
+ bookDTO.setCover(book.getCover());
+ bookDTO.setPages(book.getPages());
+ bookDTO.setAvailable(book.isAvailable());
+ List authorDTOS = new ArrayList<>();
+ book.getAuthors().forEach(y -> {
+ AuthorDTO authorDTO1 = new AuthorDTO();
+ authorDTO1.setName(y.getName());
+ authorDTOS.add(authorDTO1);
+ });
+ bookDTO.setAuthors(authorDTOS);
+
+ if (borrower != null) {
+ bookDTO.setBorrower(mapBorrowerToBorrowerDTO(borrower));
+ }
+ return bookDTO;
+ }
+}
diff --git a/Services/src/main/resources/application-dev.properties b/Services/src/main/resources/application-dev.properties
index cce58f7..f14bdb2 100644
--- a/Services/src/main/resources/application-dev.properties
+++ b/Services/src/main/resources/application-dev.properties
@@ -1,12 +1,12 @@
## Spring DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)
spring.datasource.url = jdbc:mysql://localhost:3306/libraryManagement?useSSL=false&useUnicode=true&character_set_server=utf8mb4&serverTimezone=UTC&allowPublicKeyRetrieval=true
spring.datasource.username = root
-spring.datasource.password = admin
+spring.datasource.password = Hello3193#
## Hibernate Properties
# The SQL dialect makes Hibernate generate better SQL for the chosen database
-spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDialect
+spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQLDialect
# Hibernate ddl auto (create, create-drop, validate, update)
spring.jpa.hibernate.ddl-auto = update
-spring.jpa.show-sql=true
+spring.jpa.show-sql=false
diff --git a/Services/src/main/resources/application.properties b/Services/src/main/resources/application.properties
index ff39c8d..1785bd5 100644
--- a/Services/src/main/resources/application.properties
+++ b/Services/src/main/resources/application.properties
@@ -4,7 +4,7 @@ spring.profiles.active=dev
server.port=8080
#logging information
-logging.level.root=warn
+logging.level.root=info
logging.level.com.library=debug
logging.level.org.springframework.web=info
logging.level.org.springframework.security=INFO
diff --git a/Services/src/main/resources/books-lite.csv b/Services/src/main/resources/books-lite.csv
new file mode 100644
index 0000000..52ed92d
--- /dev/null
+++ b/Services/src/main/resources/books-lite.csv
@@ -0,0 +1,101 @@
+ISBN10 ISBN13 Title Author Cover Publisher Pages
+0195153448 9780195153446 Classical Mythology Mark P. O. Morford,Robert J. Lenardon http://www.openisbn.com/cover/0195153448_72.jpg Oxford University Press, USA 844
+0002005018 9780002005012 Clara Callan: A Novel Richard Bruce Wright http://www.openisbn.com/cover/0002005018_72.jpg HarperFlamingoCanada 414
+0060973129 9780060973124 Decision In Normandy Carlo D'Este http://www.openisbn.com/cover/0060973129_72.jpg HarperPerennial 555
+0374157065 9780374157067 Flu: The Story Of The Great Influenza Pandemic Of 1918 And The Search For The Virus That Caused It Gina Kolata http://www.openisbn.com/cover/0374157065_72.jpg Farrar, Straus And Giroux 256
+0393045218 9780393045215 The Mummies Of Urumchi Elizabeth Wayland Barber,E. J. W. Barber http://www.openisbn.com/cover/0393045218_72.jpg W. W. Norton & Company 240
+0399135782 9780399135781 The Kitchen God's Wife Amy Tan http://www.openisbn.com/cover/0399135782_72.jpg G. P. Putnam's Sons 415
+0425176428 9780425176429 What If?: The World's Foremost Military Historians Imagine What Might Have Been Robert Cowley http://www.openisbn.com/cover/0425176428_72.jpg Berkley Trade 416
+0671870432 9780671870430 Pleading Guilty Scott Turow,Stacy Keach http://www.openisbn.com/cover/0671870432_72.jpg Simon & Schuster Audio 0
+0679425608 9780679425601 Under The Black Flag: The Romance And The Reality Of Life Among The Pirates David Cordingly http://www.openisbn.com/cover/0679425608_72.jpg Random House 296
+074322678X 9780743226783 Where You'll Find Me: And Other Stories Ann Beattie http://www.openisbn.com/cover/074322678X_72.jpg Scribner 208
+0771074670 9780771074677 Nights Below Station Street David Adams Richards http://www.openisbn.com/cover/0771074670_72.jpg Emblem Editions 225
+080652121X 9780806521213 Hitler's Secret Bankers: The Myth Of Swiss Neutrality During The Holocau: The Myth Of Swiss Neutrality During The Holocaust Kensington http://www.openisbn.com/cover/080652121X_72.jpg Citadel 293
+0887841740 9780887841743 The Middle Stories Sheila Heti http://www.openisbn.com/cover/0887841740_72.jpg House Of Anansi Press 160
+1552041778 9781552041772 Jane Doe J. R. Kaiser http://www.openisbn.com/cover/1552041778_72.jpg Mira Books 0
+1558746218 9781558746213 A Second Chicken Soup For The Woman's Soul (Chicken Soup For The Soul) Jack Canfield,Mark Victor Hansen,Jennifer Read Haw http://www.openisbn.com/cover/1558746218_72.jpg HCI 328
+1567407781 9781567407785 The Witchfinder (Amos Walker Series) Loren D. Estleman,John Kenneth http://www.openisbn.com/cover/1567407781_72.jpg Nova Audio Books 0
+1575663937 9781575663937 More Cunning Than Man: A Social History Of Rats And Man Robert Hendrickson http://www.openisbn.com/cover/1575663937_72.jpg Kensington 288
+1881320189 9781881320180 Goodbye To The Buttermilk Sky Julia Oliver http://www.openisbn.com/cover/1881320189_72.jpg River City Pub 191
+0440234743 9780440234746 The Testament John Grisham http://www.openisbn.com/cover/0440234743_72.jpg Dell 544
+0452264464 9780452264465 Beloved (Plume Contemporary Fiction) Toni Morrison http://www.openisbn.com/cover/0452264464_72.jpg Longman 275
+0609804618 9780609804612 Our Dumb Century: The Onion Presents 100 Years Of Headlines From America's Finest News Source The Onion,Scott Dikkers,Mike Loew http://www.openisbn.com/cover/0609804618_72.jpg Three Rivers Press 176
+1841721522 9781841721521 New Vegetarian: Bold And Beautiful Recipes For Every Occasion Celia Brooks Brown,Jane Noraika,Philip Webb http://www.openisbn.com/cover/1841721522_72.jpg Ryland Peters & Small 144
+1879384493 9781879384491 If I'd Known Then What I Know Now: Why Not Learn From The Mistakes Of Others? You Can't Afford To Make Them All Yourself! J. R. Parrish http://www.openisbn.com/cover/1879384493_72.jpg Cypress House 136
+0061076031 9780061076039 Mary-Kate & Ashley Switching Goals (Mary-Kate & Ashley Starring In) Mary-kate & Ashley Olsen http://www.openisbn.com/cover/0061076031_72.jpg HarperEntertainment 128
+0439095026 9780439095020 Tell Me This Isn't Happening Robynn Clairday http://www.openisbn.com/cover/0439095026_72.jpg Scholastic 144
+0689821166 9780689821165 Flood : Mississippi 1927 Kathleen Duey,Karen A. Bale,Bill Dodge http://www.openisbn.com/cover/0689821166_72.jpg Aladdin 176
+0971880107 9780971880108 Wild Animus: A Novel Rich Shapero http://www.openisbn.com/cover/0971880107_72.jpg Too Far Pub 315
+0345402871 9780345402875 Airframe Michael Crichton http://www.openisbn.com/cover/0345402871_72.jpg Ballantine Books 448
+0345417623 9780345417626 Timeline Michael Crichton http://www.openisbn.com/cover/0345417623_72.jpg Ballantine Books 512
+0684823802 9780684823805 Out Of The Silent Planet C.S. Lewis http://www.openisbn.com/cover/0684823802_72.jpg Scribner 160
+0375759778 9780375759772 Prague: A Novel Arthur Phillips http://www.openisbn.com/cover/0375759778_72.jpg Random House Trade Paperbacks 400
+0425163091 9780425163092 Chocolate Jesus Stephen Jaramillo http://www.openisbn.com/cover/0425163091_72.jpg Berkley Trade 249
+3404921038 9783404921034 Wie Barney Es Sieht. Roman Mordecai Richler,Michael Panofsky,Anette Grube http://www.openisbn.com/cover/3404921038_72.jpg Bastei Lübbe 574
+3442353866 9783442353866 Der Fluch Der Kaiserin Eleanor Cooney,Daniel Altieri http://www.openisbn.com/cover/3442353866_72.jpg Blanvalet 0
+3442410665 9783442410668 Die Sturmzeit-Trilogie: Sturmzeit: Roman: BD 1 Charlotte Link http://www.openisbn.com/cover/3442410665_72.jpg Goldmann Verlag 544
+3442446937 9783442446933 Tage Der Unschuld Richard North Patterson,Kristian Lutze http://www.openisbn.com/cover/3442446937_72.jpg Goldmann 575
+0375406328 9780375406324 Lying Awake Mark Salzman http://www.openisbn.com/cover/0375406328_72.jpg Alfred A. Knopf 181
+0446310786 9780446310789 To Kill A Mockingbird Harper Lee http://www.openisbn.com/cover/0446310786_72.jpg Grand Central Publishing 281
+0449005615 9780449005613 Seabiscuit: An American Legend Laura Hillenbrand http://www.openisbn.com/cover/0449005615_72.jpg Ballantine Books 399
+0060168013 9780060168018 Pigs In Heaven Barbara Kingsolver http://www.openisbn.com/cover/0060168013_72.jpg HarperCollins Publishers 288
+038078243X 9780380782437 Miss Zukas And The Raven's Dance (Miss Zukas Mysteries) Jo Dereske http://www.openisbn.com/cover/038078243X_72.jpg Avon 256
+055321215X 9780553212150 Pride And Prejudice Jane Austen http://www.openisbn.com/cover/055321215X_72.jpg Bantam Classics 0
+067176537X 9780671765378 The Therapeutic Touch: How To Use Your Hands To Help Or To Heal Dolores Krieger http://www.openisbn.com/cover/067176537X_72.jpg Touchstone 168
+0061099686 9780061099687 Downtown Anne Rivers Siddons http://www.openisbn.com/cover/0061099686_72.jpg HarperTorch 512
+0553582909 9780553582901 Icebound Dean Koontz http://www.openisbn.com/cover/0553582909_72.jpg Bantam 416
+0671888587 9780671888589 I'll Be Seeing You Mary Higgins Clark http://www.openisbn.com/cover/0671888587_72.jpg Pocket Books 320
+0553582747 9780553582741 From The Corner Of His Eye Dean Koontz http://www.openisbn.com/cover/0553582747_72.jpg Bantam 768
+0425182908 9780425182901 Isle Of Dogs (Andy Brazil) Patricia Cornwell http://www.openisbn.com/cover/0425182908_72.jpg Berkley 432
+042518630X 9780425186305 Purity In Death J.D. Robb http://www.openisbn.com/cover/042518630X_72.jpg Berkley 368
+0440223571 9780440223573 This Year It Will Be Different And Other Stories - A Christmas Treasury Maeve Binchy http://www.openisbn.com/cover/0440223571_72.jpg Dell 0
+0812523873 9780812523874 Proxies Laura J. Mixon http://www.openisbn.com/cover/0812523873_72.jpg Tor Books 480
+0842342702 9780842342704 Left Behind: A Novel Of The Earth's Last Days (Left Behind #1) Tim LaHaye,Jerry B. Jenkins http://www.openisbn.com/cover/0842342702_72.jpg Living Books 352
+0440225701 9780440225706 The Street Lawyer John Grisham http://www.openisbn.com/cover/0440225701_72.jpg Dell 464
+0060914068 9780060914066 Love, Medicine And Miracles Bernie S. Siegel M.D. http://www.openisbn.com/cover/0060914068_72.jpg HarperCollins Publishers 0
+0156047624 9780156047623 All The King's Men Robert Penn Warren http://www.openisbn.com/cover/0156047624_72.jpg Harcourt 438
+0245542957 9780245542954 Pacific Northwest Hans Johannes Hoefer http://www.openisbn.com/cover/0245542957_72.jpg Chambers 0
+0380715899 9780380715893 Soldier Of The Great War Mark Helprin http://www.openisbn.com/cover/0380715899_72.jpg Avon Books 736
+0553280333 9780553280333 Getting Well Again: The Bestselling Classic About The Simontons' Revolutionary Lifesaving Self- Awareness Techniques O. Carl Simonton M.D.,James Creighton Ph.D.,Stepha http://www.openisbn.com/cover/0553280333_72.jpg Bantam 304
+0961769947 9780961769949 Northwest Wines And Wineries Chuck Hill http://www.openisbn.com/cover/0961769947_72.jpg Speed Graphics 236
+0964778319 9780964778313 An Atmosphere Of Eternity: Stories Of India David Iglehart http://www.openisbn.com/cover/0964778319_72.jpg Sunflower Pub Co 157
+0671623249 9780671623241 Lonesome Dove Larry McMurtry http://www.openisbn.com/cover/0671623249_72.jpg Pocket Books 945
+0679810307 9780679810308 Shabanu: Daughter Of The Wind (Border Trilogy) Suzanne Fisher Staples http://www.openisbn.com/cover/0679810307_72.jpg Laurel Leaf 256
+0679865691 9780679865698 Haveli Suzanne Fisher Staples http://www.openisbn.com/cover/0679865691_72.jpg Laurel Leaf 336
+2070423204 9782070423200 Lieux Dits Michel Tournier http://www.openisbn.com/cover/2070423204_72.jpg Gallimard 125
+0345260317 9780345260314 The Dragons Of Eden: Speculations On The Evolution Of Human Intelligence Carl Sagan http://www.openisbn.com/cover/0345260317_72.jpg Ballantine Books 0
+0394743741 9780394743745 The Yawning Heights Aleksandr Zinoviev http://www.openisbn.com/cover/0394743741_72.jpg Random House 828
+042511774X 9780425117743 Breathing Lessons Anne Tyler http://www.openisbn.com/cover/042511774X_72.jpg Berkley 352
+0804106304 9780804106306 The Joy Luck Club Amy Tan http://www.openisbn.com/cover/0804106304_72.jpg Ballantine Books 352
+1853262404 9781853262401 Heart Of Darkness & Other Stories (Wordsworth Collection) Joseph Conrad http://www.openisbn.com/cover/1853262404_72.jpg Wordsworth Editions Ltd 240
+0312970242 9780312970246 Deepak Chopra's The Angel Is Near Deepak Chopra,Martin Greenberg http://www.openisbn.com/cover/0312970242_72.jpg St. Martin's Paperbacks 340
+1853260053 9781853260056 Tess Of The D'Urbervilles (Wadsworth Collection) Thomas Hardy http://www.openisbn.com/cover/1853260053_72.jpg Wordsworth Edition Ltd 384
+1414035004 9781414035000 The Adventures Of Drew And Ellie: The Magical Dress Charles Noland,Sherri Baker http://www.openisbn.com/cover/1414035004_72.jpg Authorhouse 76
+0060938412 9780060938413 The Accidental Virgin Valerie Frankel http://www.openisbn.com/cover/0060938412_72.jpg William Morrow Paperbacks 277
+0140067477 9780140067477 The Tao Of Pooh Benjamin Hoff http://www.openisbn.com/cover/0140067477_72.jpg Penguin (Non-Classics) 176
+0345465083 9780345465085 Seabiscuit: An American Legend Laura Hillenbrand http://www.openisbn.com/cover/0345465083_72.jpg Ballantine Books 453
+0451625889 9780451625885 The Prince (Mentor Series) Niccolo Machiavelli http://www.openisbn.com/cover/0451625889_72.jpg Signet 0
+1558531025 9781558531024 Life's Little Instruction Book: 511 Suggestions, Observations, And Reminders On How To Live A Happy And Rewarding Life H. Jackson Brown Jr. http://www.openisbn.com/cover/1558531025_72.jpg Rutledge Hill Press 160
+0441783589 9780441783588 Starship Troopers Robert A. Heinlein http://www.openisbn.com/cover/0441783589_72.jpg Ace 263
+0394895894 9780394895895 The Ruby In The Smoke (Sally Lockhart Trilogy, Book 1) Philip Pullman http://www.openisbn.com/cover/0394895894_72.jpg Laurel Leaf 230
+1569871213 9781569871218 Black Beauty (Illustrated Classics) http://www.openisbn.com/cover/1569871213_72.jpg Landoll 240
+0375410538 9780375410536 Anil's Ghost Michael Ondaatje http://www.openisbn.com/cover/0375410538_72.jpg Knopf 311
+0966986105 9780966986105 Prescription For Terror Sandra Levy Ceren http://www.openisbn.com/cover/0966986105_72.jpg Andrew Scott Pub 240
+087113375X 9780871133755 Modern Manners: An Etiquette Book For Rude People P. J. O'Rourke http://www.openisbn.com/cover/087113375X_72.jpg Atlantic Monthly Press 280
+0340767936 9780340767931 Turning Thirty Mike Gayle http://www.openisbn.com/cover/0340767936_72.jpg Flame 384
+0743403843 9780743403849 Decipher Stel Pavlou http://www.openisbn.com/cover/0743403843_72.jpg Simon & Schuster 816
+0060930365 9780060930363 My First Cousin Once Removed: Money, Madness, And The Family Of Robert Lowell Sarah Payne Stuart http://www.openisbn.com/cover/0060930365_72.jpg Harper Perennial 256
+0060177586 9780060177584 Standing Firm: Dan Quayle Dan Quayle http://www.openisbn.com/cover/0060177586_72.jpg HarperCollins 402
+0071416331 9780071416337 Team Bush : Leadership Lessons From The Bush White House Donald F. Kettl,Donald Kettl http://www.openisbn.com/cover/0071416331_72.jpg McGraw-Hill 224
+0375509038 9780375509032 The Right Man: The Surprise Presidency Of George W. Bush, An Inside Account David Frum http://www.openisbn.com/cover/0375509038_72.jpg Random House 320
+0553062042 9780553062045 The Daybreakers (The Louis L'Amour Collection) Louis L'Amour http://www.openisbn.com/cover/0553062042_72.jpg Bantam Doubleday Dell 198
+0316769487 9780316769488 The Catcher In The Rye J.D. Salinger http://www.openisbn.com/cover/0316769487_72.jpg Little, Brown And Company 224
+0679429220 9780679429227 Midnight In The Garden Of Good And Evil John Berendt http://www.openisbn.com/cover/0679429220_72.jpg Random House 388
+0671867156 9780671867157 Pretend You Don't See Her Mary Higgins Clark http://www.openisbn.com/cover/0671867156_72.jpg Pocket Books 320
+0312252617 9780312252618 Fast Women Jennifer Crusie http://www.openisbn.com/cover/0312252617_72.jpg St. Martin's Press 352
+0312261594 9780312261597 Female Intelligence Jane Heller http://www.openisbn.com/cover/0312261594_72.jpg St. Martin's Press 336
+0316748641 9780316748643 Pasquale's Nose: Idle Days In An Italian Town Michael Rips http://www.openisbn.com/cover/0316748641_72.jpg Back Bay Books 224
+0316973742 9780316973748 The Gospel Of Judas: A Novel Simon Mawer http://www.openisbn.com/cover/0316973742_72.jpg Back Bay Books 352
+0385235941 9780385235945 Prize Stories 1987: The O. Henry Awards William Abrahams http://www.openisbn.com/cover/0385235941_72.jpg Doubleday 320
+0446677450 9780446677455 Rich Dad, Poor Dad: What The Rich Teach Their Kids About Money--That The Poor And Middle Class Do Not! Robert T. Kiyosaki,Sharon L. Lechter http://www.openisbn.com/cover/0446677450_72.jpg Business Plus 207
+0451166892 9780451166890 The Pillars Of The Earth Ken Follett http://www.openisbn.com/cover/0451166892_72.jpg Signet 983
\ No newline at end of file
-
-
-