Merge branch 'develop' into 'master' (5d99e387) · Commits · ERP (SIL) / BACK

Commit 5d99e387 authored 3 years ago by

BEAUVAIS ANTOINE

Merge branch 'develop' into 'master'

Merge new API transaction handling into 'master'.

See merge request !2

parents 1bc5555f 10fc4cb8

Branches

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/fr/unistra/sil/erp/back/Config.java 19 additions, 0 deletions

src/main/java/fr/unistra/sil/erp/back/Config.java
src/main/java/fr/unistra/sil/erp/back/DatabaseSystem.java 2 additions, 2 deletions

src/main/java/fr/unistra/sil/erp/back/DatabaseSystem.java
src/main/java/fr/unistra/sil/erp/back/controller/IRetrieveStocks.java 7 additions, 0 deletions

...a/fr/unistra/sil/erp/back/controller/IRetrieveStocks.java
src/main/java/fr/unistra/sil/erp/back/controller/api/ApiBadRequestException.java 16 additions, 1 deletion

...a/sil/erp/back/controller/api/ApiBadRequestException.java
src/main/java/fr/unistra/sil/erp/back/controller/api/ApiErrorHandler.java 33 additions, 0 deletions

.../unistra/sil/erp/back/controller/api/ApiErrorHandler.java
src/main/java/fr/unistra/sil/erp/back/controller/api/ApiResourceNotFoundException.java 28 additions, 0 deletions

...erp/back/controller/api/ApiResourceNotFoundException.java
src/main/java/fr/unistra/sil/erp/back/controller/api/ApiRetrieveCategoriesController.java 0 additions, 1 deletion

.../back/controller/api/ApiRetrieveCategoriesController.java
src/main/java/fr/unistra/sil/erp/back/controller/api/ApiRetrieveInfoController.java 0 additions, 1 deletion

...il/erp/back/controller/api/ApiRetrieveInfoController.java
src/main/java/fr/unistra/sil/erp/back/controller/api/ApiServerErrorException.java 12 additions, 2 deletions

.../sil/erp/back/controller/api/ApiServerErrorException.java
src/main/java/fr/unistra/sil/erp/back/controller/api/ApiSubmitTransactionController.java 48 additions, 6 deletions

...p/back/controller/api/ApiSubmitTransactionController.java
src/main/java/fr/unistra/sil/erp/back/db/DatabaseConnectionException.java 17 additions, 2 deletions

.../unistra/sil/erp/back/db/DatabaseConnectionException.java
src/main/java/fr/unistra/sil/erp/back/db/DatabaseInterface.java 19 additions, 1 deletion

...in/java/fr/unistra/sil/erp/back/db/DatabaseInterface.java
src/main/java/fr/unistra/sil/erp/back/db/DatabaseResourceNotFoundException.java 26 additions, 0 deletions

...ra/sil/erp/back/db/DatabaseResourceNotFoundException.java
src/main/java/fr/unistra/sil/erp/back/db/DatabaseSQLiteImpl.java 148 additions, 1 deletion

...n/java/fr/unistra/sil/erp/back/db/DatabaseSQLiteImpl.java
src/main/java/fr/unistra/sil/erp/back/db/DatabaseUpdateException.java 27 additions, 0 deletions

...a/fr/unistra/sil/erp/back/db/DatabaseUpdateException.java
src/main/java/fr/unistra/sil/erp/back/model/ErrorMessage.java 18 additions, 0 deletions

...main/java/fr/unistra/sil/erp/back/model/ErrorMessage.java
src/main/java/fr/unistra/sil/erp/back/model/Item.java 10 additions, 2 deletions

src/main/java/fr/unistra/sil/erp/back/model/Item.java
src/main/java/fr/unistra/sil/erp/back/model/RegistryEntry.java 75 additions, 6 deletions

...ain/java/fr/unistra/sil/erp/back/model/RegistryEntry.java
src/main/java/fr/unistra/sil/erp/back/model/Stock.java 40 additions, 0 deletions

src/main/java/fr/unistra/sil/erp/back/model/Stock.java
src/main/java/fr/unistra/sil/erp/back/model/Transaction.java 41 additions, 11 deletions

src/main/java/fr/unistra/sil/erp/back/model/Transaction.java

with 586 additions and 36 deletions

Please register or to comment

Admin message

Merge branch 'develop' into 'master'