klmp200/PQT_Gestionnaire_vent_stock
1
0
Fork 0
mirror of https://github.com/klmp200/PQT_Gestionnaire_vente_stock.git synced 2024-11-22 08:13:20 +00:00
Code Issues Releases Wiki Activity

[CORE] + [SERVER] #17 : Modif de la convention de nommage : requête 'update' -> 'stock_update'; Modif de tous les éléments liés, y compris les noms de méthds

Browse Source
This commit is contained in:
Notmoo-PC\Notmoo 2018-01-25 00:12:47 +01:00
parent e67552a8dd
commit a69f936d02
7 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Workspace/client/src/main/java/com/pqt/client/module/query/QueryExecutor.java
View File

@ -43,8 +43,8 @@ public class QueryExecutor {
sendMessage(messageFactory.newPingMessage(), callback, MessageType.ACK_PING);
}
public void executeUpdateQuery(List<ProductUpdate> updates, INoItemMessageCallback callback) {
sendMessage(messageFactory.newUpdateMessage(updates), callback, MessageType.ACK_UPDATE);
public void executeStockUpdateQuery(List<ProductUpdate> updates, INoItemMessageCallback callback) {
sendMessage(messageFactory.newStockUpdateMessage(updates), callback, MessageType.ACK_STOCK_UPDATE);
}
public void executeConnectAccountQuery(Account account, boolean desiredState, INoItemMessageCallback callback){

4
Workspace/client/src/main/java/com/pqt/client/module/query/QueryMessageFactory.java
View File

@ -42,10 +42,10 @@ class QueryMessageFactory {
return newSimpleMessage(MessageType.QUERY_STAT);
}
Message newUpdateMessage(List<ProductUpdate> updates) {
Message newStockUpdateMessage(List<ProductUpdate> updates) {
Map<String, String> fields = new HashMap<>();
fields.put("updates", messageToolFactory.getListFormatter(ProductUpdate.class).format(updates));
return newSimpleMessage(MessageType.QUERY_UPDATE, fields);
return newSimpleMessage(MessageType.QUERY_STOCK_UPDATE, fields);
}
Message newAccountListMessage(){

2
Workspace/client/src/main/java/com/pqt/client/module/stock/StockDao.java
View File

@ -79,7 +79,7 @@ public class StockDao {
updateId++;
else
updateId = 0;
executor.executeUpdateQuery(updates, new INoItemMessageCallback() {
executor.executeStockUpdateQuery(updates, new INoItemMessageCallback() {
@Override
public void ack() {
//TODO Issue #6 : add log line

14
Workspace/client/src/main/java/com/pqt/client/module/stock/StockService.java
View File

@ -90,12 +90,12 @@ public class StockService {
* Renvoie un nouveau builder d'update de stock.
* <p/>
* Un update de stock correspond à un ticket de demande de modification du stock, composé d'ajouts, de suppressions et de modifications de produits.
* Un objet {@link UpdateBuilder} permet de générer facilement une update. Pour valider l'update, voir {@link #commitUpdate(UpdateBuilder)}.
* Un objet {@link StockUpdateBuilder} permet de générer facilement une update. Pour valider l'update, voir {@link #commitUpdate(StockUpdateBuilder)}.
*
* @return nouvelle instance de la classe {@link UpdateBuilder}.
* @return nouvelle instance de la classe {@link StockUpdateBuilder}.
*/
public UpdateBuilder getNewUpdateBuilder() {
return new UpdateBuilder();
public StockUpdateBuilder getNewUpdateBuilder() {
return new StockUpdateBuilder();
}
/**
@ -105,11 +105,11 @@ public class StockService {
* Les événements liées à la valiation des updates du stock peuvent être écoutés via la classe de listener {@link IStockListener}.
* <p/>
* Une procédure de mise à jour du stock sera automatiquement lancée si la modification est validée (comme si la méthode {@link #refreshProductList()} avait été appelée).
* @param updateBuilder
* @param stockUpdateBuilder
* @return l'identifiant de l'update soumise.
*/
public long commitUpdate(UpdateBuilder updateBuilder) {
return dao.commitUpdate(updateBuilder.build());
public long commitUpdate(StockUpdateBuilder stockUpdateBuilder) {
return dao.commitUpdate(stockUpdateBuilder.build());
}
/**

11
Workspace/client/src/main/java/com/pqt/client/module/stock/UpdateBuilder.java → Workspace/client/src/main/java/com/pqt/client/module/stock/StockUpdateBuilder.java
View File

@ -5,32 +5,32 @@ import com.pqt.core.entities.product.ProductUpdate;
import java.util.*;
public class UpdateBuilder {
public class StockUpdateBuilder {
private Set<Product> toAdd, toRemove;
private Map<Product, Product> toModify;
public UpdateBuilder() {
public StockUpdateBuilder() {
toAdd = new HashSet<>();
toRemove = new HashSet<>();
toModify = new HashMap<>();
}
public UpdateBuilder addProduct(Product product) {
public StockUpdateBuilder addProduct(Product product) {
if(!toAdd.contains(product)){
toAdd.add(product);
}
return this;
}
public UpdateBuilder removeProduct(Product product) {
public StockUpdateBuilder removeProduct(Product product) {
if(!toRemove.contains(product)){
toRemove.add(product);
}
return this;
}
public UpdateBuilder modifyProduct(Product oldVersion, Product newVersion) {
public StockUpdateBuilder modifyProduct(Product oldVersion, Product newVersion) {
toModify.put(oldVersion, newVersion);
return this;
}
@ -49,5 +49,4 @@ public class UpdateBuilder {
return reply;
}
}

7
Workspace/core/src/main/java/com/pqt/core/entities/messages/MessageType.java
View File

@ -25,8 +25,11 @@ public enum MessageType {
QUERY_CONNECT_ACCOUNT,
ACK_CONNECT_ACCOUNT,
QUERY_UPDATE,
ACK_UPDATE,
QUERY_STOCK_UPDATE,
ACK_STOCK_UPDATE,
QUERY_ACCOUNT_UPDATE,
ACK_ACCOUNT_UPDATE,
QUERY_PING,
ACK_PING,

4
Workspace/server/src/main/java/com/pqt/server/controller/SimpleMessageHandler.java
View File

@ -119,11 +119,11 @@ public class SimpleMessageHandler implements IMessageHandler {
/*
MASTER-restricted queries
*/
manager.supportForConnectedAccounts(MessageType.QUERY_UPDATE, (message)->{
manager.supportForConnectedAccounts(MessageType.QUERY_STOCK_UPDATE, (message)->{
try{
List<ProductUpdate> updates = messageToolFactory.getListParser(ProductUpdate.class).parse(message.getField("updates"));
stockService.applyUpdateList(updates);
return new Message(MessageType.ACK_UPDATE, serverStateService.getServer(), message.getEmitter(), message.getUser(), message, null);
return new Message(MessageType.ACK_STOCK_UPDATE, serverStateService.getServer(), message.getEmitter(), message.getUser(), message, null);
}catch (ServerQueryException | NullPointerException e){
Map<String, String> fields = new HashMap<>();
fields.put(header_err_query, e.toString());