Commit 38ba310f authored by Eduard Štefan Mlynárik's avatar Eduard Štefan Mlynárik
Browse files

Merge branch 'baronScenarionM4' into 'master' 

Baron scenarion m4

See merge request !49
parents 103c11c8 d65efabf

.gitignore

+1 −0
Original line number Original line Diff line number Diff line
@@ -24,3 +24,4 @@ 
/dist/

/dist/

/nbdist/

/nbdist/

/.nb-gradle/

/.nb-gradle/

*/target/
 
 No newline at end of file

README.md

+1 −0
Original line number Original line Diff line number Diff line
@@ -57,6 +57,7 @@ Afterward you gain a bearer token, which you can use to access other services. 
Go to main project directory and run`python scenario.py`

Go to main project directory and run`python scenario.py`

Scenario will run correctly only in linux systems or in wsl, databases and services need to be started via docker-compose.

Scenario will run correctly only in linux systems or in wsl, databases and services need to be started via docker-compose.

Before running the scenario, you need to change the token in the scenario.py file to your token you got from the security server.

Before running the scenario, you need to change the token in the scenario.py file to your token you got from the security server.

In the scenario, you can see how the services work together and how the basic usage of the system might look like.









### Metrics and monitoring

### Metrics and monitoring

compose.yml

+0 −14
Original line number Original line Diff line number Diff line
@@ -153,20 +153,6 @@ services: 
    volumes:

    volumes:

      - ./security/etc/external-app.yml:/app/etc/application.yml

      - ./security/etc/external-app.yml:/app/etc/application.yml





  master:

    image: locustio/locust

    ports:

      - "8089:8089"

    volumes:

      - ./:/mnt/locust

    command: -f /mnt/locust/locustfile.py --master -H http://master:8089



  worker:

    image: locustio/locust

    volumes:

      - ./:/mnt/locust

    command: -f /mnt/locust/locustfile.py --worker --master-host master



volumes:

volumes:

  wine-production-db:

  wine-production-db:

  harvest-management-db:

  harvest-management-db:

customer-service/src/main/java/cz/muni/fi/pa165/facade/InvoiceFacadeImpl.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -140,6 +140,7 @@ public class InvoiceFacadeImpl implements InvoiceFacade { 
        }

        }

        return items.stream().map(item -> {

        return items.stream().map(item -> {

            InvoiceItemDTO itemDTO = new InvoiceItemDTO();

            InvoiceItemDTO itemDTO = new InvoiceItemDTO();

            itemDTO.setName(item.getName());

            itemDTO.setPrice(item.getPrice());

            itemDTO.setPrice(item.getPrice());

            itemDTO.setQuantity(item.getQuantity());

            itemDTO.setQuantity(item.getQuantity());

            itemDTO.setWineExtId(item.getWineExtId());

            itemDTO.setWineExtId(item.getWineExtId());

customer-service/src/main/java/cz/muni/fi/pa165/service/InvoiceServiceImpl.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -62,6 +62,7 @@ public class InvoiceServiceImpl implements InvoiceService { 




    private InvoiceItemDAO mapToInvoiceItemDAO(InvoiceItemDTO invoiceItemDTO) {

    private InvoiceItemDAO mapToInvoiceItemDAO(InvoiceItemDTO invoiceItemDTO) {

        InvoiceItemDAO invoiceItemDAO = new InvoiceItemDAO();

        InvoiceItemDAO invoiceItemDAO = new InvoiceItemDAO();

        invoiceItemDAO.setName(invoiceItemDTO.getName());

        invoiceItemDAO.setPrice(invoiceItemDTO.getPrice());

        invoiceItemDAO.setPrice(invoiceItemDTO.getPrice());

        invoiceItemDAO.setQuantity(invoiceItemDTO.getQuantity());

        invoiceItemDAO.setQuantity(invoiceItemDTO.getQuantity());

        invoiceItemDAO.setWineExtId(invoiceItemDTO.getWineExtId());

        invoiceItemDAO.setWineExtId(invoiceItemDTO.getWineExtId());