diff --git a/package-lock.json b/package-lock.json index 2676377..d321f3d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -500,7 +500,6 @@ "resolved": "https://registry.npmjs.org/@angular/common/-/common-20.3.10.tgz", "integrity": "sha512-12fEzvKbEqjqy1fSk9DMYlJz6dF1MJVXuC5BB+oWWJpd+2lfh4xJ62pkvvLGAICI89hfM5n9Cy5kWnXwnqPZsA==", "license": "MIT", - "peer": true, "dependencies": { "tslib": "^2.3.0" }, @@ -517,7 +516,6 @@ "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-20.3.10.tgz", "integrity": "sha512-cW939Lr8GZjPSYfbQKIDNrUaHWmn2M+zBbERThfq5skLuY+xM60bJFv4NqBekfX6YqKLCY62ilUZlnImYIXaqA==", "license": "MIT", - "peer": true, "dependencies": { "tslib": "^2.3.0" }, @@ -531,7 +529,6 @@ "integrity": "sha512-9BemvpFxA26yIVdu8ROffadMkEdlk/AQQ2Jb486w7RPkrvUQ0pbEJukhv9aryJvhbMopT66S5H/j4ipOUMzmzQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@babel/core": "7.28.3", "@jridgewell/sourcemap-codec": "^1.4.14", @@ -564,7 +561,6 @@ "resolved": "https://registry.npmjs.org/@angular/core/-/core-20.3.10.tgz", "integrity": "sha512-g99Qe+NOVo72OLxowVF9NjCckswWYHmvO7MgeiZTDJbTjF9tXH96dMx7AWq76/GUinV10sNzDysVW16NoAbCRQ==", "license": "MIT", - "peer": true, "dependencies": { "tslib": "^2.3.0" }, @@ -590,7 +586,6 @@ "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-20.3.10.tgz", "integrity": "sha512-9yWr51EUauTEINB745AaHwZNTHLpXIm4uxuykxzOg+g2QskEgVfH26uS8G2ogdNuwYpB8wnsXWr34qhM3qgOWw==", "license": "MIT", - "peer": true, "dependencies": { "tslib": "^2.3.0" }, @@ -609,7 +604,6 @@ "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-20.3.10.tgz", "integrity": "sha512-UV8CGoB5P3FmJciI3/I/n3L7C3NVgGh7bIlZ1BaB/qJDtv0Wq0rRAGwmT/Z3gwmrRtfHZWme7/CeQ2CYJmMyUQ==", "license": "MIT", - "peer": true, "dependencies": { "tslib": "^2.3.0" }, @@ -632,7 +626,6 @@ "resolved": "https://registry.npmjs.org/@angular/router/-/router-20.3.10.tgz", "integrity": "sha512-Z03cfH1jgQ7XMDJj4R8qAGqivcvhdG3wYBwaiN1K1ODBgPhbFKNeD4stKqYp7xBNtswmM2O2jMxrL/Djwju4Gg==", "license": "MIT", - "peer": true, "dependencies": { "tslib": "^2.3.0" }, @@ -714,7 +707,6 @@ "integrity": "sha512-yDBHV9kQNcr2/sUr9jghVyz9C3Y5G2zUM2H2lo+9mKv4sFgbA8s8Z9t8D1jiTkGoO/NoIfKMyKWr4s6CN23ZwQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.27.1", @@ -1682,7 +1674,6 @@ "integrity": "sha512-nqhDw2ZcAUrKNPwhjinJny903bRhI0rQhiDz1LksjeRxqa36i3l75+4iXbOy0rlDpLJGxqtgoPavQjmmyS5UJw==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@inquirer/checkbox": "^4.2.1", "@inquirer/confirm": "^5.1.14", @@ -2538,7 +2529,6 @@ "resolved": "https://registry.npmjs.org/@nestjs/common/-/common-11.1.6.tgz", "integrity": "sha512-krKwLLcFmeuKDqngG2N/RuZHCs2ycsKcxWIDgcm7i1lf3sQ0iG03ci+DsP/r3FcT/eJDFsIHnKtNta2LIi7PzQ==", "license": "MIT", - "peer": true, "dependencies": { "file-type": "21.0.0", "iterare": "1.2.1", @@ -4355,7 +4345,6 @@ "resolved": "https://registry.npmjs.org/axios/-/axios-1.12.2.tgz", "integrity": "sha512-vMJzPewAlRyOgxV2dU0Cuz2O8zzzx9VYtbJOaBgXFeLc4IV/Eg50n4LowmehOOR61S8ZMpc2K5Sa7g6A4jfkUw==", "license": "MIT", - "peer": true, "dependencies": { "follow-redirects": "^1.15.6", "form-data": "^4.0.4", @@ -4524,7 +4513,6 @@ } ], "license": "MIT", - "peer": true, "dependencies": { "baseline-browser-mapping": "^2.8.19", "caniuse-lite": "^1.0.30001751", @@ -5722,7 +5710,6 @@ "integrity": "sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "accepts": "^2.0.0", "body-parser": "^2.2.0", @@ -6982,7 +6969,6 @@ "integrity": "sha512-j1n1IuTX1VQjIy3tT7cyGbX7nvQOsFLoIqobZv4ttI5axP923gA44zUj6miiA6R5Aoms4sEGVIIcucXUbRI14g==", "dev": true, "license": "Apache-2.0", - "peer": true, "dependencies": { "copy-anything": "^2.0.1", "parse-node-version": "^1.0.1", @@ -7270,7 +7256,6 @@ "integrity": "sha512-SL0JY3DaxylDuo/MecFeiC+7pedM0zia33zl0vcjgwcq1q1FWWF1To9EIauPbl8GbMCU0R2e0uJ8bZunhYKD2g==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "cli-truncate": "^4.0.0", "colorette": "^2.0.20", @@ -8928,8 +8913,7 @@ "version": "0.2.2", "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.2.tgz", "integrity": "sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==", - "license": "Apache-2.0", - "peer": true + "license": "Apache-2.0" }, "node_modules/require-directory": { "version": "2.1.1", @@ -9159,7 +9143,6 @@ "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz", "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==", "license": "Apache-2.0", - "peer": true, "dependencies": { "tslib": "^2.1.0" } @@ -9196,7 +9179,6 @@ "integrity": "sha512-9GUyuksjw70uNpb1MTYWsH9MQHOHY6kwfnkafC24+7aOMZn9+rVMBxRbLvw756mrBFbIsFg6Xw9IkR2Fnn3k+Q==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "chokidar": "^4.0.0", "immutable": "^5.0.2", @@ -9935,8 +9917,7 @@ "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", - "license": "0BSD", - "peer": true + "license": "0BSD" }, "node_modules/tuf-js": { "version": "3.1.0", @@ -9986,7 +9967,6 @@ "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", "dev": true, "license": "Apache-2.0", - "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -10148,7 +10128,6 @@ "integrity": "sha512-uzcxnSDVjAopEUjljkWh8EIrg6tlzrjFUfMcR1EVsRDGwf/ccef0qQPRyOrROwhrTDaApueq+ja+KLPlzR/zdg==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "esbuild": "^0.25.0", "fdir": "^6.5.0", @@ -10529,7 +10508,6 @@ "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==", "dev": true, "license": "MIT", - "peer": true, "funding": { "url": "https://github.com/sponsors/colinhacks" } @@ -10548,8 +10526,7 @@ "version": "0.15.1", "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.15.1.tgz", "integrity": "sha512-XE96n56IQpJM7NAoXswY3XRLcWFW83xe0BiAOeMD7K5k5xecOeul3Qcpx6GqEeeHNkW5DWL5zOyTbEfB4eti8w==", - "license": "MIT", - "peer": true + "license": "MIT" } } } diff --git a/package.json b/package.json index 4895c46..b8ad459 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "start": "ng serve", "build": "ng build", "watch": "ng build --watch --configuration development", - "openapi": "rm -rf src/app/services/api && openapi-generator-cli generate -i http://localhost:5228/swagger/v1/swagger.json -g typescript-angular -o src/app/services/api -c openapi-generator.yaml", + "openapi": "rm -rf src/app/services/api && openapi-generator-cli generate -i http://localhost:5156/swagger/v1/swagger.json -g typescript-angular -o src/app/services/api -c openapi-generator.yaml", "openapiWin": "set JAVA_TOOL_OPTIONS=-Dcom.sun.net.ssl.checkRevocation=false -Djavax.net.ssl.trustStoreType=WINDOWS-ROOT && openapi-generator-cli generate -i https://localhost:44390/swagger/v1/swagger.json -g typescript-angular -o src/app/services/api -c openapi-generator.yaml\n" }, "prettier": { diff --git a/src/app/components/book-table/book-table.html b/src/app/components/book-table/book-table.html index 0164d6c..8362f5c 100644 --- a/src/app/components/book-table/book-table.html +++ b/src/app/components/book-table/book-table.html @@ -15,7 +15,7 @@ {{ book.title}} {{ book.isbn }} - {{ book.bookAuthorFirstName }} {{ book.bookAuthorName }} + {{ book.authorFirstName }} {{ book.authorName }} {{ book.releaseYear}}
diff --git a/src/app/components/book-table/book-table.ts b/src/app/components/book-table/book-table.ts index 75e0f54..064d8f8 100644 --- a/src/app/components/book-table/book-table.ts +++ b/src/app/components/book-table/book-table.ts @@ -37,7 +37,7 @@ export class BookTable implements OnInit { this.booksLoading.set(true) try { - const books = await firstValueFrom(this.booksService.getAllBooksEndpoint()); + const books = await firstValueFrom(this.booksService.getAllBookEndpoint()); this.books.set(books); diff --git a/src/app/components/create-loan/create-loan.ts b/src/app/components/create-loan/create-loan.ts index 9379fec..d45d75c 100644 --- a/src/app/components/create-loan/create-loan.ts +++ b/src/app/components/create-loan/create-loan.ts @@ -40,7 +40,7 @@ export class CreateLoan implements OnInit { async fetchUsers() { try { - const users = await firstValueFrom(this.userService.getAllUsersEndpoint()); + const users = await firstValueFrom(this.userService.getAllUserEndpoint()); this.users.set(users); } catch (e) { this.notificationService.error('Erreur', 'Impossible de récupérer les utilisateurs'); @@ -49,7 +49,7 @@ export class CreateLoan implements OnInit { async fetchBooks() { try { - const books = await firstValueFrom(this.bookService.getAllBooksEndpoint()); + const books = await firstValueFrom(this.bookService.getAllBookEndpoint()); this.books.set(books); } catch (e) { this.notificationService.error('Erreur', 'Impossible de récupérer les livres'); diff --git a/src/app/components/loan-table/loan-table.ts b/src/app/components/loan-table/loan-table.ts index da5d628..1173314 100644 --- a/src/app/components/loan-table/loan-table.ts +++ b/src/app/components/loan-table/loan-table.ts @@ -112,13 +112,14 @@ export class LoanTable implements OnInit { } async validationDate(loanId: number) { + try { const PatchLoanValue = { effectiveReturningDate: format(new Date(), 'yyyy-MM-dd') }; try { - await firstValueFrom(this.loansService.patchLoanEndpoint(loanId, PatchLoanValue)) + await firstValueFrom(this.loansService.updateLoanEffectiveReturnDateEndpoint(loanId, PatchLoanValue)) this.notificationService.success( 'Success', @@ -126,8 +127,8 @@ export class LoanTable implements OnInit { ) } catch (e) { this.notificationService.error( - 'Erreur', - 'La date à déjà été actualisée' + 'Error', + 'Can\'t set returning date' ) } } catch (e) { diff --git a/src/app/components/update-book/update-book.ts b/src/app/components/update-book/update-book.ts index 8e4860a..5892ff2 100644 --- a/src/app/components/update-book/update-book.ts +++ b/src/app/components/update-book/update-book.ts @@ -32,7 +32,7 @@ export class UpdateBook implements OnInit { title: this.book().title, isbn: this.book().isbn, releaseYear: this.book().releaseYear, - authorId: this.book().bookAuthorId + authorId: this.book().authorId }); } } diff --git a/src/app/components/update-loan/update-loan.ts b/src/app/components/update-loan/update-loan.ts index 681e53b..a97a831 100644 --- a/src/app/components/update-loan/update-loan.ts +++ b/src/app/components/update-loan/update-loan.ts @@ -1,4 +1,4 @@ -import {Component, inject, input, OnInit, signal} from '@angular/core'; +import {Component, inject, input, OnChanges, OnInit, signal} from '@angular/core'; import {FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators} from "@angular/forms"; import {NzColDirective, NzRowDirective} from "ng-zorro-antd/grid"; import {NzFormControlComponent, NzFormDirective, NzFormItemComponent, NzFormLabelComponent} from "ng-zorro-antd/form"; @@ -26,7 +26,7 @@ import {firstValueFrom} from "rxjs"; templateUrl: './update-loan.html', styleUrl: './update-loan.css', }) -export class UpdateLoan implements OnInit { +export class UpdateLoan implements OnInit, OnChanges { updateLoanForm = new FormGroup({ userId: new FormControl(null, Validators.required), bookId: new FormControl(null, Validators.required), @@ -64,7 +64,7 @@ export class UpdateLoan implements OnInit { async fetchUsers() { try { - const users = await firstValueFrom(this.userService.getAllUsersEndpoint()); + const users = await firstValueFrom(this.userService.getAllUserEndpoint()); this.users.set(users); } catch (e) { this.notificationService.error('Erreur', 'Impossible de récupérer les utilisateurs'); @@ -73,7 +73,7 @@ export class UpdateLoan implements OnInit { async fetchBooks() { try { - const books = await firstValueFrom(this.bookService.getAllBooksEndpoint()); + const books = await firstValueFrom(this.bookService.getAllBookEndpoint()); this.books.set(books); } catch (e) { this.notificationService.error('Erreur', 'Impossible de récupérer les livres'); diff --git a/src/app/components/user-table/user-table.ts b/src/app/components/user-table/user-table.ts index 4e5349c..85aba68 100644 --- a/src/app/components/user-table/user-table.ts +++ b/src/app/components/user-table/user-table.ts @@ -41,7 +41,7 @@ export class UserTable implements OnInit { this.usersLoading.set(true) try { - const users = await firstValueFrom(this.usersService.getAllUsersEndpoint()) + const users = await firstValueFrom(this.usersService.getAllUserEndpoint()) this.users.set(users); } catch (e) { this.notificationService.error( diff --git a/src/app/services/api/.openapi-generator/FILES b/src/app/services/api/.openapi-generator/FILES index 2a1f070..0ed00a9 100644 --- a/src/app/services/api/.openapi-generator/FILES +++ b/src/app/services/api/.openapi-generator/FILES @@ -1,4 +1,5 @@ .gitignore +.openapi-generator-ignore README.md api.base.service.ts api.module.ts @@ -7,7 +8,6 @@ api/authors.service.ts api/books.service.ts api/loans.service.ts api/login.service.ts -api/logins.service.ts api/users.service.ts configuration.ts encoder.ts @@ -22,15 +22,13 @@ model/create-user-dto.ts model/get-author-dto.ts model/get-book-dto.ts model/get-loan-dto.ts -model/get-login-connect-dto.ts model/get-login-dto.ts model/get-user-dto.ts model/models.ts -model/patch-loan-dto.ts model/update-author-dto.ts model/update-book-dto.ts model/update-loan-dto.ts -model/update-login-dto.ts +model/update-loan-effective-return-date-dto.ts model/update-user-dto.ts param.ts provide-api.ts diff --git a/src/app/services/api/api.base.service.ts b/src/app/services/api/api.base.service.ts index f470951..104f811 100644 --- a/src/app/services/api/api.base.service.ts +++ b/src/app/services/api/api.base.service.ts @@ -1,5 +1,5 @@ /** - * ApiEfCoreLibrary + * ApiLibrary * * * @@ -12,7 +12,7 @@ import { CustomHttpParameterCodec } from './encoder'; import { Configuration } from './configuration'; export class BaseService { - protected basePath = 'https://localhost:44390'; + protected basePath = 'http://localhost:5156'; public defaultHeaders = new HttpHeaders(); public configuration: Configuration; public encoder: HttpParameterCodec; diff --git a/src/app/services/api/api/api.ts b/src/app/services/api/api/api.ts index ab0b1d5..b983ab8 100644 --- a/src/app/services/api/api/api.ts +++ b/src/app/services/api/api/api.ts @@ -6,8 +6,6 @@ export * from './loans.service'; import { LoansService } from './loans.service'; export * from './login.service'; import { LoginService } from './login.service'; -export * from './logins.service'; -import { LoginsService } from './logins.service'; export * from './users.service'; import { UsersService } from './users.service'; -export const APIS = [AuthorsService, BooksService, LoansService, LoginService, LoginsService, UsersService]; +export const APIS = [AuthorsService, BooksService, LoansService, LoginService, UsersService]; diff --git a/src/app/services/api/api/authors.service.ts b/src/app/services/api/api/authors.service.ts index b571e02..527b241 100644 --- a/src/app/services/api/api/authors.service.ts +++ b/src/app/services/api/api/authors.service.ts @@ -1,5 +1,5 @@ /** - * ApiEfCoreLibrary + * ApiLibrary * * * @@ -222,6 +222,9 @@ export class AuthorsService extends BaseService { let localVarHeaders = this.defaultHeaders; + // authentication (JWTBearerAuth) required + localVarHeaders = this.configuration.addCredentialToHeaders('JWTBearerAuth', 'Authorization', localVarHeaders, 'Bearer '); + const localVarHttpHeaderAcceptSelected: string | undefined = options?.httpHeaderAccept ?? this.configuration.selectHeaderAccept([ 'application/json' ]); diff --git a/src/app/services/api/api/books.service.ts b/src/app/services/api/api/books.service.ts index a511ab0..082a5f8 100644 --- a/src/app/services/api/api/books.service.ts +++ b/src/app/services/api/api/books.service.ts @@ -1,5 +1,5 @@ /** - * ApiEfCoreLibrary + * ApiLibrary * * * @@ -161,10 +161,10 @@ export class BooksService extends BaseService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public getAllBooksEndpoint(observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>; - public getAllBooksEndpoint(observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>>; - public getAllBooksEndpoint(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>>; - public getAllBooksEndpoint(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable { + public getAllBookEndpoint(observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>; + public getAllBookEndpoint(observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>>; + public getAllBookEndpoint(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>>; + public getAllBookEndpoint(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable { let localVarHeaders = this.defaultHeaders; diff --git a/src/app/services/api/api/loans.service.ts b/src/app/services/api/api/loans.service.ts index c740e6a..503d074 100644 --- a/src/app/services/api/api/loans.service.ts +++ b/src/app/services/api/api/loans.service.ts @@ -1,5 +1,5 @@ /** - * ApiEfCoreLibrary + * ApiLibrary * * * @@ -21,9 +21,9 @@ import { CreateLoanDto } from '../model/create-loan-dto'; // @ts-ignore import { GetLoanDto } from '../model/get-loan-dto'; // @ts-ignore -import { PatchLoanDto } from '../model/patch-loan-dto'; -// @ts-ignore import { UpdateLoanDto } from '../model/update-loan-dto'; +// @ts-ignore +import { UpdateLoanEffectiveReturnDateDto } from '../model/update-loan-effective-return-date-dto'; // @ts-ignore import { BASE_PATH, COLLECTION_FORMATS } from '../variables'; @@ -224,6 +224,9 @@ export class LoansService extends BaseService { let localVarHeaders = this.defaultHeaders; + // authentication (JWTBearerAuth) required + localVarHeaders = this.configuration.addCredentialToHeaders('JWTBearerAuth', 'Authorization', localVarHeaders, 'Bearer '); + const localVarHttpHeaderAcceptSelected: string | undefined = options?.httpHeaderAccept ?? this.configuration.selectHeaderAccept([ 'application/json' ]); @@ -263,21 +266,21 @@ export class LoansService extends BaseService { } /** - * @endpoint patch /API/loans/{id}/EffectiveReturningDate + * @endpoint patch /API/loans/{id}/EffectiveReturnDate * @param id - * @param patchLoanDto + * @param updateLoanEffectiveReturnDateDto * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public patchLoanEndpoint(id: number, patchLoanDto: PatchLoanDto, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable; - public patchLoanEndpoint(id: number, patchLoanDto: PatchLoanDto, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>; - public patchLoanEndpoint(id: number, patchLoanDto: PatchLoanDto, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>; - public patchLoanEndpoint(id: number, patchLoanDto: PatchLoanDto, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable { + public updateLoanEffectiveReturnDateEndpoint(id: number, updateLoanEffectiveReturnDateDto: UpdateLoanEffectiveReturnDateDto, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable; + public updateLoanEffectiveReturnDateEndpoint(id: number, updateLoanEffectiveReturnDateDto: UpdateLoanEffectiveReturnDateDto, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>; + public updateLoanEffectiveReturnDateEndpoint(id: number, updateLoanEffectiveReturnDateDto: UpdateLoanEffectiveReturnDateDto, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>; + public updateLoanEffectiveReturnDateEndpoint(id: number, updateLoanEffectiveReturnDateDto: UpdateLoanEffectiveReturnDateDto, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable { if (id === null || id === undefined) { - throw new Error('Required parameter id was null or undefined when calling patchLoanEndpoint.'); + throw new Error('Required parameter id was null or undefined when calling updateLoanEffectiveReturnDateEndpoint.'); } - if (patchLoanDto === null || patchLoanDto === undefined) { - throw new Error('Required parameter patchLoanDto was null or undefined when calling patchLoanEndpoint.'); + if (updateLoanEffectiveReturnDateDto === null || updateLoanEffectiveReturnDateDto === undefined) { + throw new Error('Required parameter updateLoanEffectiveReturnDateDto was null or undefined when calling updateLoanEffectiveReturnDateEndpoint.'); } let localVarHeaders = this.defaultHeaders; @@ -314,12 +317,12 @@ export class LoansService extends BaseService { } } - let localVarPath = `/API/loans/${this.configuration.encodeParam({name: "id", value: id, in: "path", style: "simple", explode: false, dataType: "number", dataFormat: "int32"})}/EffectiveReturningDate`; + let localVarPath = `/API/loans/${this.configuration.encodeParam({name: "id", value: id, in: "path", style: "simple", explode: false, dataType: "number", dataFormat: "int32"})}/EffectiveReturnDate`; const { basePath, withCredentials } = this.configuration; return this.httpClient.request('patch', `${basePath}${localVarPath}`, { context: localVarHttpContext, - body: patchLoanDto, + body: updateLoanEffectiveReturnDateDto, responseType: responseType_, ...(withCredentials ? { withCredentials } : {}), headers: localVarHeaders, diff --git a/src/app/services/api/api/login.service.ts b/src/app/services/api/api/login.service.ts index c958a00..746cf31 100644 --- a/src/app/services/api/api/login.service.ts +++ b/src/app/services/api/api/login.service.ts @@ -1,5 +1,5 @@ /** - * ApiEfCoreLibrary + * ApiLibrary * * * @@ -19,7 +19,9 @@ import { Observable } from 'rxjs'; // @ts-ignore import { ConnectLoginDto } from '../model/connect-login-dto'; // @ts-ignore -import { GetLoginConnectDto } from '../model/get-login-connect-dto'; +import { CreateLoginDto } from '../model/create-login-dto'; +// @ts-ignore +import { GetLoginDto } from '../model/get-login-dto'; // @ts-ignore import { BASE_PATH, COLLECTION_FORMATS } from '../variables'; @@ -38,21 +40,24 @@ export class LoginService extends BaseService { } /** - * @endpoint post /API/login - * @param connectLoginDto + * @endpoint post /API/login/create + * @param createLoginDto * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public userLoginEndpoint(connectLoginDto: ConnectLoginDto, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable; - public userLoginEndpoint(connectLoginDto: ConnectLoginDto, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>; - public userLoginEndpoint(connectLoginDto: ConnectLoginDto, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>; - public userLoginEndpoint(connectLoginDto: ConnectLoginDto, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable { - if (connectLoginDto === null || connectLoginDto === undefined) { - throw new Error('Required parameter connectLoginDto was null or undefined when calling userLoginEndpoint.'); + public createLoginEndpoint(createLoginDto: CreateLoginDto, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable; + public createLoginEndpoint(createLoginDto: CreateLoginDto, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>; + public createLoginEndpoint(createLoginDto: CreateLoginDto, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>; + public createLoginEndpoint(createLoginDto: CreateLoginDto, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable { + if (createLoginDto === null || createLoginDto === undefined) { + throw new Error('Required parameter createLoginDto was null or undefined when calling createLoginEndpoint.'); } let localVarHeaders = this.defaultHeaders; + // authentication (JWTBearerAuth) required + localVarHeaders = this.configuration.addCredentialToHeaders('JWTBearerAuth', 'Authorization', localVarHeaders, 'Bearer '); + const localVarHttpHeaderAcceptSelected: string | undefined = options?.httpHeaderAccept ?? this.configuration.selectHeaderAccept([ 'application/json' ]); @@ -65,6 +70,69 @@ export class LoginService extends BaseService { const localVarTransferCache: boolean = options?.transferCache ?? true; + // to determine the Content-Type header + const consumes: string[] = [ + 'application/json' + ]; + const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); + if (httpContentTypeSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); + } + + let responseType_: 'text' | 'json' | 'blob' = 'json'; + if (localVarHttpHeaderAcceptSelected) { + if (localVarHttpHeaderAcceptSelected.startsWith('text')) { + responseType_ = 'text'; + } else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) { + responseType_ = 'json'; + } else { + responseType_ = 'blob'; + } + } + + let localVarPath = `/API/login/create`; + const { basePath, withCredentials } = this.configuration; + return this.httpClient.request('post', `${basePath}${localVarPath}`, + { + context: localVarHttpContext, + body: createLoginDto, + responseType: responseType_, + ...(withCredentials ? { withCredentials } : {}), + headers: localVarHeaders, + observe: observe, + ...(localVarTransferCache !== undefined ? { transferCache: localVarTransferCache } : {}), + reportProgress: reportProgress + } + ); + } + + /** + * @endpoint post /API/login + * @param connectLoginDto + * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. + * @param reportProgress flag to report request and response progress. + */ + public userLoginEndpoint(connectLoginDto: ConnectLoginDto, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined, context?: HttpContext, transferCache?: boolean}): Observable; + public userLoginEndpoint(connectLoginDto: ConnectLoginDto, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined, context?: HttpContext, transferCache?: boolean}): Observable>; + public userLoginEndpoint(connectLoginDto: ConnectLoginDto, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined, context?: HttpContext, transferCache?: boolean}): Observable>; + public userLoginEndpoint(connectLoginDto: ConnectLoginDto, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: undefined, context?: HttpContext, transferCache?: boolean}): Observable { + if (connectLoginDto === null || connectLoginDto === undefined) { + throw new Error('Required parameter connectLoginDto was null or undefined when calling userLoginEndpoint.'); + } + + let localVarHeaders = this.defaultHeaders; + + const localVarHttpHeaderAcceptSelected: string | undefined = options?.httpHeaderAccept ?? this.configuration.selectHeaderAccept([ + ]); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); + } + + const localVarHttpContext: HttpContext = options?.context ?? new HttpContext(); + + const localVarTransferCache: boolean = options?.transferCache ?? true; + + // to determine the Content-Type header const consumes: string[] = [ 'application/json' @@ -87,7 +155,7 @@ export class LoginService extends BaseService { let localVarPath = `/API/login`; const { basePath, withCredentials } = this.configuration; - return this.httpClient.request('post', `${basePath}${localVarPath}`, + return this.httpClient.request('post', `${basePath}${localVarPath}`, { context: localVarHttpContext, body: connectLoginDto, diff --git a/src/app/services/api/api/logins.service.ts b/src/app/services/api/api/logins.service.ts deleted file mode 100644 index 6ca8b1b..0000000 --- a/src/app/services/api/api/logins.service.ts +++ /dev/null @@ -1,331 +0,0 @@ -/** - * ApiEfCoreLibrary - * - * - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/* tslint:disable:no-unused-variable member-ordering */ - -import { Inject, Injectable, Optional } from '@angular/core'; -import { HttpClient, HttpHeaders, HttpParams, - HttpResponse, HttpEvent, HttpParameterCodec, HttpContext - } from '@angular/common/http'; -import { CustomHttpParameterCodec } from '../encoder'; -import { Observable } from 'rxjs'; - -// @ts-ignore -import { CreateLoginDto } from '../model/create-login-dto'; -// @ts-ignore -import { GetLoginDto } from '../model/get-login-dto'; -// @ts-ignore -import { UpdateLoginDto } from '../model/update-login-dto'; - -// @ts-ignore -import { BASE_PATH, COLLECTION_FORMATS } from '../variables'; -import { Configuration } from '../configuration'; -import { BaseService } from '../api.base.service'; - - - -@Injectable({ - providedIn: 'root' -}) -export class LoginsService extends BaseService { - - constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) { - super(basePath, configuration); - } - - /** - * @endpoint post /API/logins - * @param createLoginDto - * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. - * @param reportProgress flag to report request and response progress. - */ - public createLoginEndpoint(createLoginDto: CreateLoginDto, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable; - public createLoginEndpoint(createLoginDto: CreateLoginDto, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>; - public createLoginEndpoint(createLoginDto: CreateLoginDto, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>; - public createLoginEndpoint(createLoginDto: CreateLoginDto, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable { - if (createLoginDto === null || createLoginDto === undefined) { - throw new Error('Required parameter createLoginDto was null or undefined when calling createLoginEndpoint.'); - } - - let localVarHeaders = this.defaultHeaders; - - const localVarHttpHeaderAcceptSelected: string | undefined = options?.httpHeaderAccept ?? this.configuration.selectHeaderAccept([ - 'application/json' - ]); - if (localVarHttpHeaderAcceptSelected !== undefined) { - localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); - } - - const localVarHttpContext: HttpContext = options?.context ?? new HttpContext(); - - const localVarTransferCache: boolean = options?.transferCache ?? true; - - - // to determine the Content-Type header - const consumes: string[] = [ - 'application/json' - ]; - const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); - if (httpContentTypeSelected !== undefined) { - localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); - } - - let responseType_: 'text' | 'json' | 'blob' = 'json'; - if (localVarHttpHeaderAcceptSelected) { - if (localVarHttpHeaderAcceptSelected.startsWith('text')) { - responseType_ = 'text'; - } else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) { - responseType_ = 'json'; - } else { - responseType_ = 'blob'; - } - } - - let localVarPath = `/API/logins`; - const { basePath, withCredentials } = this.configuration; - return this.httpClient.request('post', `${basePath}${localVarPath}`, - { - context: localVarHttpContext, - body: createLoginDto, - responseType: responseType_, - ...(withCredentials ? { withCredentials } : {}), - headers: localVarHeaders, - observe: observe, - ...(localVarTransferCache !== undefined ? { transferCache: localVarTransferCache } : {}), - reportProgress: reportProgress - } - ); - } - - /** - * @endpoint delete /API/logins/{id} - * @param id - * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. - * @param reportProgress flag to report request and response progress. - */ - public deleteLoginEndpoint(id: number, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined, context?: HttpContext, transferCache?: boolean}): Observable; - public deleteLoginEndpoint(id: number, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined, context?: HttpContext, transferCache?: boolean}): Observable>; - public deleteLoginEndpoint(id: number, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined, context?: HttpContext, transferCache?: boolean}): Observable>; - public deleteLoginEndpoint(id: number, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: undefined, context?: HttpContext, transferCache?: boolean}): Observable { - if (id === null || id === undefined) { - throw new Error('Required parameter id was null or undefined when calling deleteLoginEndpoint.'); - } - - let localVarHeaders = this.defaultHeaders; - - const localVarHttpHeaderAcceptSelected: string | undefined = options?.httpHeaderAccept ?? this.configuration.selectHeaderAccept([ - ]); - if (localVarHttpHeaderAcceptSelected !== undefined) { - localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); - } - - const localVarHttpContext: HttpContext = options?.context ?? new HttpContext(); - - const localVarTransferCache: boolean = options?.transferCache ?? true; - - - let responseType_: 'text' | 'json' | 'blob' = 'json'; - if (localVarHttpHeaderAcceptSelected) { - if (localVarHttpHeaderAcceptSelected.startsWith('text')) { - responseType_ = 'text'; - } else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) { - responseType_ = 'json'; - } else { - responseType_ = 'blob'; - } - } - - let localVarPath = `/API/logins/${this.configuration.encodeParam({name: "id", value: id, in: "path", style: "simple", explode: false, dataType: "number", dataFormat: "int32"})}`; - const { basePath, withCredentials } = this.configuration; - return this.httpClient.request('delete', `${basePath}${localVarPath}`, - { - context: localVarHttpContext, - responseType: responseType_, - ...(withCredentials ? { withCredentials } : {}), - headers: localVarHeaders, - observe: observe, - ...(localVarTransferCache !== undefined ? { transferCache: localVarTransferCache } : {}), - reportProgress: reportProgress - } - ); - } - - /** - * @endpoint get /API/logins - * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. - * @param reportProgress flag to report request and response progress. - */ - public getAllLoginEndpoint(observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>; - public getAllLoginEndpoint(observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>>; - public getAllLoginEndpoint(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>>; - public getAllLoginEndpoint(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable { - - let localVarHeaders = this.defaultHeaders; - - const localVarHttpHeaderAcceptSelected: string | undefined = options?.httpHeaderAccept ?? this.configuration.selectHeaderAccept([ - 'application/json' - ]); - if (localVarHttpHeaderAcceptSelected !== undefined) { - localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); - } - - const localVarHttpContext: HttpContext = options?.context ?? new HttpContext(); - - const localVarTransferCache: boolean = options?.transferCache ?? true; - - - let responseType_: 'text' | 'json' | 'blob' = 'json'; - if (localVarHttpHeaderAcceptSelected) { - if (localVarHttpHeaderAcceptSelected.startsWith('text')) { - responseType_ = 'text'; - } else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) { - responseType_ = 'json'; - } else { - responseType_ = 'blob'; - } - } - - let localVarPath = `/API/logins`; - const { basePath, withCredentials } = this.configuration; - return this.httpClient.request>('get', `${basePath}${localVarPath}`, - { - context: localVarHttpContext, - responseType: responseType_, - ...(withCredentials ? { withCredentials } : {}), - headers: localVarHeaders, - observe: observe, - ...(localVarTransferCache !== undefined ? { transferCache: localVarTransferCache } : {}), - reportProgress: reportProgress - } - ); - } - - /** - * @endpoint get /API/logins/{id} - * @param id - * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. - * @param reportProgress flag to report request and response progress. - */ - public getLoginEndpoint(id: number, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable; - public getLoginEndpoint(id: number, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>; - public getLoginEndpoint(id: number, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>; - public getLoginEndpoint(id: number, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable { - if (id === null || id === undefined) { - throw new Error('Required parameter id was null or undefined when calling getLoginEndpoint.'); - } - - let localVarHeaders = this.defaultHeaders; - - const localVarHttpHeaderAcceptSelected: string | undefined = options?.httpHeaderAccept ?? this.configuration.selectHeaderAccept([ - 'application/json' - ]); - if (localVarHttpHeaderAcceptSelected !== undefined) { - localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); - } - - const localVarHttpContext: HttpContext = options?.context ?? new HttpContext(); - - const localVarTransferCache: boolean = options?.transferCache ?? true; - - - let responseType_: 'text' | 'json' | 'blob' = 'json'; - if (localVarHttpHeaderAcceptSelected) { - if (localVarHttpHeaderAcceptSelected.startsWith('text')) { - responseType_ = 'text'; - } else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) { - responseType_ = 'json'; - } else { - responseType_ = 'blob'; - } - } - - let localVarPath = `/API/logins/${this.configuration.encodeParam({name: "id", value: id, in: "path", style: "simple", explode: false, dataType: "number", dataFormat: "int32"})}`; - const { basePath, withCredentials } = this.configuration; - return this.httpClient.request('get', `${basePath}${localVarPath}`, - { - context: localVarHttpContext, - responseType: responseType_, - ...(withCredentials ? { withCredentials } : {}), - headers: localVarHeaders, - observe: observe, - ...(localVarTransferCache !== undefined ? { transferCache: localVarTransferCache } : {}), - reportProgress: reportProgress - } - ); - } - - /** - * @endpoint put /API/logins/{id} - * @param id - * @param updateLoginDto - * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. - * @param reportProgress flag to report request and response progress. - */ - public updateLoginEndpoint(id: number, updateLoginDto: UpdateLoginDto, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable; - public updateLoginEndpoint(id: number, updateLoginDto: UpdateLoginDto, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>; - public updateLoginEndpoint(id: number, updateLoginDto: UpdateLoginDto, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>; - public updateLoginEndpoint(id: number, updateLoginDto: UpdateLoginDto, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable { - if (id === null || id === undefined) { - throw new Error('Required parameter id was null or undefined when calling updateLoginEndpoint.'); - } - if (updateLoginDto === null || updateLoginDto === undefined) { - throw new Error('Required parameter updateLoginDto was null or undefined when calling updateLoginEndpoint.'); - } - - let localVarHeaders = this.defaultHeaders; - - const localVarHttpHeaderAcceptSelected: string | undefined = options?.httpHeaderAccept ?? this.configuration.selectHeaderAccept([ - 'application/json' - ]); - if (localVarHttpHeaderAcceptSelected !== undefined) { - localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); - } - - const localVarHttpContext: HttpContext = options?.context ?? new HttpContext(); - - const localVarTransferCache: boolean = options?.transferCache ?? true; - - - // to determine the Content-Type header - const consumes: string[] = [ - 'application/json' - ]; - const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); - if (httpContentTypeSelected !== undefined) { - localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected); - } - - let responseType_: 'text' | 'json' | 'blob' = 'json'; - if (localVarHttpHeaderAcceptSelected) { - if (localVarHttpHeaderAcceptSelected.startsWith('text')) { - responseType_ = 'text'; - } else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) { - responseType_ = 'json'; - } else { - responseType_ = 'blob'; - } - } - - let localVarPath = `/API/logins/${this.configuration.encodeParam({name: "id", value: id, in: "path", style: "simple", explode: false, dataType: "number", dataFormat: "int32"})}`; - const { basePath, withCredentials } = this.configuration; - return this.httpClient.request('put', `${basePath}${localVarPath}`, - { - context: localVarHttpContext, - body: updateLoginDto, - responseType: responseType_, - ...(withCredentials ? { withCredentials } : {}), - headers: localVarHeaders, - observe: observe, - ...(localVarTransferCache !== undefined ? { transferCache: localVarTransferCache } : {}), - reportProgress: reportProgress - } - ); - } - -} diff --git a/src/app/services/api/api/users.service.ts b/src/app/services/api/api/users.service.ts index d385b8d..70da856 100644 --- a/src/app/services/api/api/users.service.ts +++ b/src/app/services/api/api/users.service.ts @@ -1,5 +1,5 @@ /** - * ApiEfCoreLibrary + * ApiLibrary * * * @@ -161,10 +161,10 @@ export class UsersService extends BaseService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public getAllUsersEndpoint(observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>; - public getAllUsersEndpoint(observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>>; - public getAllUsersEndpoint(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>>; - public getAllUsersEndpoint(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable { + public getAllUserEndpoint(observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>; + public getAllUserEndpoint(observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>>; + public getAllUserEndpoint(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>>; + public getAllUserEndpoint(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable { let localVarHeaders = this.defaultHeaders; diff --git a/src/app/services/api/model/connect-login-dto.ts b/src/app/services/api/model/connect-login-dto.ts index 73f7492..e1dacb0 100644 --- a/src/app/services/api/model/connect-login-dto.ts +++ b/src/app/services/api/model/connect-login-dto.ts @@ -1,5 +1,5 @@ /** - * ApiEfCoreLibrary + * ApiLibrary * * * diff --git a/src/app/services/api/model/create-author-dto.ts b/src/app/services/api/model/create-author-dto.ts index 1c67370..3a24b66 100644 --- a/src/app/services/api/model/create-author-dto.ts +++ b/src/app/services/api/model/create-author-dto.ts @@ -1,5 +1,5 @@ /** - * ApiEfCoreLibrary + * ApiLibrary * * * @@ -10,7 +10,7 @@ export interface CreateAuthorDto { - name?: string | null; firstName?: string | null; + name?: string | null; } diff --git a/src/app/services/api/model/create-book-dto.ts b/src/app/services/api/model/create-book-dto.ts index 04cc824..3f8f11d 100644 --- a/src/app/services/api/model/create-book-dto.ts +++ b/src/app/services/api/model/create-book-dto.ts @@ -1,5 +1,5 @@ /** - * ApiEfCoreLibrary + * ApiLibrary * * * @@ -11,8 +11,8 @@ export interface CreateBookDto { title?: string | null; + authorId?: number; releaseYear?: number | null; isbn?: string | null; - authorId?: number; } diff --git a/src/app/services/api/model/create-loan-dto.ts b/src/app/services/api/model/create-loan-dto.ts index 620475f..a837861 100644 --- a/src/app/services/api/model/create-loan-dto.ts +++ b/src/app/services/api/model/create-loan-dto.ts @@ -1,5 +1,5 @@ /** - * ApiEfCoreLibrary + * ApiLibrary * * * @@ -10,8 +10,8 @@ export interface CreateLoanDto { - bookId?: number; userId?: number; + bookId?: number; date?: string; } diff --git a/src/app/services/api/model/create-login-dto.ts b/src/app/services/api/model/create-login-dto.ts index 2622616..2b47ce6 100644 --- a/src/app/services/api/model/create-login-dto.ts +++ b/src/app/services/api/model/create-login-dto.ts @@ -1,5 +1,5 @@ /** - * ApiEfCoreLibrary + * ApiLibrary * * * @@ -10,8 +10,9 @@ export interface CreateLoginDto { - username?: string | null; - fullName?: string | null; - password?: string | null; + username?: string; + password?: string; + fullName?: string; + role?: string; } diff --git a/src/app/services/api/model/create-user-dto.ts b/src/app/services/api/model/create-user-dto.ts index 4cdd2f8..8141c5c 100644 --- a/src/app/services/api/model/create-user-dto.ts +++ b/src/app/services/api/model/create-user-dto.ts @@ -1,5 +1,5 @@ /** - * ApiEfCoreLibrary + * ApiLibrary * * * diff --git a/src/app/services/api/model/get-author-dto.ts b/src/app/services/api/model/get-author-dto.ts index de8caa2..456751c 100644 --- a/src/app/services/api/model/get-author-dto.ts +++ b/src/app/services/api/model/get-author-dto.ts @@ -1,5 +1,5 @@ /** - * ApiEfCoreLibrary + * ApiLibrary * * * @@ -12,8 +12,8 @@ import { GetBookDto } from './get-book-dto'; export interface GetAuthorDto { id?: number; - name?: string | null; firstName?: string | null; + name?: string | null; books?: Array | null; } diff --git a/src/app/services/api/model/get-book-dto.ts b/src/app/services/api/model/get-book-dto.ts index 6e23d50..a9cdb8f 100644 --- a/src/app/services/api/model/get-book-dto.ts +++ b/src/app/services/api/model/get-book-dto.ts @@ -1,5 +1,5 @@ /** - * ApiEfCoreLibrary + * ApiLibrary * * * @@ -12,11 +12,10 @@ export interface GetBookDto { id?: number; title?: string | null; - authorId?: number; - bookAuthorId?: number; - bookAuthorName?: string | null; - bookAuthorFirstName?: string | null; releaseYear?: number | null; isbn?: string | null; + authorId?: number; + authorFirstName?: string | null; + authorName?: string | null; } diff --git a/src/app/services/api/model/get-loan-dto.ts b/src/app/services/api/model/get-loan-dto.ts index 15bc9ad..270657b 100644 --- a/src/app/services/api/model/get-loan-dto.ts +++ b/src/app/services/api/model/get-loan-dto.ts @@ -1,5 +1,5 @@ /** - * ApiEfCoreLibrary + * ApiLibrary * * * @@ -11,20 +11,19 @@ export interface GetLoanDto { id?: number; - bookId?: number; - bookTitle?: string | null; - bookAuthorId?: number; - bookAuthorName?: string | null; - bookAuthorFirstName?: string | null; - bookReleaseYear?: number | null; - bookIsbn?: string | null; + date?: string; + plannedReturningDate?: string; + effectiveReturningDate?: string | null; userId?: number; userName?: string | null; userFirstName?: string | null; userEmail?: string | null; userBirthDate?: string | null; - date?: string; - plannedReturningDate?: string; - effectiveReturningDate?: string | null; + bookId?: number; + bookTitle?: string | null; + bookReleaseYear?: number | null; + bookISBN?: string | null; + bookAuthorName?: string | null; + bookAuthorFirstName?: string | null; } diff --git a/src/app/services/api/model/get-login-connect-dto.ts b/src/app/services/api/model/get-login-connect-dto.ts deleted file mode 100644 index ceec3ef..0000000 --- a/src/app/services/api/model/get-login-connect-dto.ts +++ /dev/null @@ -1,15 +0,0 @@ -/** - * ApiEfCoreLibrary - * - * - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - - -export interface GetLoginConnectDto { - token?: string | null; -} - diff --git a/src/app/services/api/model/get-login-dto.ts b/src/app/services/api/model/get-login-dto.ts index 1015bcb..d0abd7c 100644 --- a/src/app/services/api/model/get-login-dto.ts +++ b/src/app/services/api/model/get-login-dto.ts @@ -1,5 +1,5 @@ /** - * ApiEfCoreLibrary + * ApiLibrary * * * @@ -12,8 +12,9 @@ export interface GetLoginDto { id?: number; username?: string | null; - fullName?: string | null; password?: string | null; + fullName?: string | null; salt?: string | null; + role?: string | null; } diff --git a/src/app/services/api/model/get-user-dto.ts b/src/app/services/api/model/get-user-dto.ts index 7fb573e..4d3d4ba 100644 --- a/src/app/services/api/model/get-user-dto.ts +++ b/src/app/services/api/model/get-user-dto.ts @@ -1,5 +1,5 @@ /** - * ApiEfCoreLibrary + * ApiLibrary * * * @@ -16,6 +16,6 @@ export interface GetUserDto { firstName?: string | null; email?: string | null; birthDate?: string | null; - loans?: Array | null; + loans?: Array; } diff --git a/src/app/services/api/model/models.ts b/src/app/services/api/model/models.ts index cd5083b..8e4b441 100644 --- a/src/app/services/api/model/models.ts +++ b/src/app/services/api/model/models.ts @@ -7,12 +7,10 @@ export * from './create-user-dto'; export * from './get-author-dto'; export * from './get-book-dto'; export * from './get-loan-dto'; -export * from './get-login-connect-dto'; export * from './get-login-dto'; export * from './get-user-dto'; -export * from './patch-loan-dto'; export * from './update-author-dto'; export * from './update-book-dto'; export * from './update-loan-dto'; -export * from './update-login-dto'; +export * from './update-loan-effective-return-date-dto'; export * from './update-user-dto'; diff --git a/src/app/services/api/model/update-author-dto.ts b/src/app/services/api/model/update-author-dto.ts index 6ac2fe7..8c970ad 100644 --- a/src/app/services/api/model/update-author-dto.ts +++ b/src/app/services/api/model/update-author-dto.ts @@ -1,5 +1,5 @@ /** - * ApiEfCoreLibrary + * ApiLibrary * * * @@ -10,7 +10,7 @@ export interface UpdateAuthorDto { - name?: string | null; firstName?: string | null; + name?: string | null; } diff --git a/src/app/services/api/model/update-book-dto.ts b/src/app/services/api/model/update-book-dto.ts index a989678..0b3a16f 100644 --- a/src/app/services/api/model/update-book-dto.ts +++ b/src/app/services/api/model/update-book-dto.ts @@ -1,5 +1,5 @@ /** - * ApiEfCoreLibrary + * ApiLibrary * * * @@ -11,8 +11,8 @@ export interface UpdateBookDto { title?: string | null; - releaseYear?: number | null; - isbn?: string | null; authorId?: number; + releaseYear?: number; + isbn?: string | null; } diff --git a/src/app/services/api/model/update-loan-dto.ts b/src/app/services/api/model/update-loan-dto.ts index 15c5929..3fb9664 100644 --- a/src/app/services/api/model/update-loan-dto.ts +++ b/src/app/services/api/model/update-loan-dto.ts @@ -1,5 +1,5 @@ /** - * ApiEfCoreLibrary + * ApiLibrary * * * @@ -10,8 +10,8 @@ export interface UpdateLoanDto { - bookId?: number; userId?: number; + bookId?: number; date?: string; plannedReturningDate?: string; effectiveReturningDate?: string | null; diff --git a/src/app/services/api/model/patch-loan-dto.ts b/src/app/services/api/model/update-loan-effective-return-date-dto.ts similarity index 76% rename from src/app/services/api/model/patch-loan-dto.ts rename to src/app/services/api/model/update-loan-effective-return-date-dto.ts index e8298ec..7fb8400 100644 --- a/src/app/services/api/model/patch-loan-dto.ts +++ b/src/app/services/api/model/update-loan-effective-return-date-dto.ts @@ -1,5 +1,5 @@ /** - * ApiEfCoreLibrary + * ApiLibrary * * * @@ -9,7 +9,7 @@ */ -export interface PatchLoanDto { +export interface UpdateLoanEffectiveReturnDateDto { effectiveReturningDate?: string; } diff --git a/src/app/services/api/model/update-login-dto.ts b/src/app/services/api/model/update-login-dto.ts deleted file mode 100644 index 808dabc..0000000 --- a/src/app/services/api/model/update-login-dto.ts +++ /dev/null @@ -1,17 +0,0 @@ -/** - * ApiEfCoreLibrary - * - * - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - - -export interface UpdateLoginDto { - username?: string | null; - fullName?: string | null; - password?: string | null; -} - diff --git a/src/app/services/api/model/update-user-dto.ts b/src/app/services/api/model/update-user-dto.ts index a3610cd..db8ece1 100644 --- a/src/app/services/api/model/update-user-dto.ts +++ b/src/app/services/api/model/update-user-dto.ts @@ -1,5 +1,5 @@ /** - * ApiEfCoreLibrary + * ApiLibrary * * *