Commit Graph

43 Commits

Author SHA1 Message Date
julius.lautz
0b89e88905 added the necessary classes for the discovery web controller 2021-12-04 15:16:29 +01:00
bc5c654154 Merge remote-tracking branch 'upstream/main' into dev 2021-11-21 12:14:26 +01:00
reynisson
53d815b93d smallest fixes 2021-11-20 23:26:02 +01:00
reynisson
3141f97f41 smaller fixes 2021-11-20 23:08:22 +01:00
reynisson
332f035622 small fixes 2021-11-20 22:53:52 +01:00
reynisson
3b205d80a5 using the bidders auction house uri 2021-11-20 22:39:20 +01:00
reynisson
e3768280ac using https for auction house link 2021-11-20 22:09:07 +01:00
6fe4b4dfbe bugfixes + env variables 2021-11-17 21:35:38 +01:00
reynisson
9d8e6cf216 Logging bids received 2021-11-17 18:29:08 +01:00
reynisson
96b0e82113 Merge remote-tracking branch 'origin/dev' into dev 2021-11-17 18:26:02 +01:00
reynisson
01b5056671 Testing out getting Environment variables from main 2021-11-17 18:25:49 +01:00
Andrei Ciortea
1d2c7103e4 Merge branch 'main' of github.com:SCS-ASSE-FS21-Tutors/tapas into main 2021-11-16 22:41:45 +01:00
Andrei Ciortea
292d30d1bd Add example for reading config properties in the main method for TapasAuctionHouse 2021-11-16 22:41:22 +01:00
add257fd5e updated dependencies to remove security issues 2021-11-16 21:20:26 +01:00
084270bbb8 env changes 2021-11-16 19:43:46 +01:00
reynisson
1bc6ec6813 Small URI fixes 2021-11-16 19:41:56 +01:00
reynisson
e869fb9699 Bidding workflow 2021-11-16 18:51:39 +01:00
reynisson
8fba9136b2 Implemented auctioning of tasks workflow in auction house 2021-11-16 17:42:14 +01:00
Peter Guhl
df53236853
Compiling and running tapas on a local docker installation (#10)
* First version building tasks and mongodb

* Creating container for local tests

* Initial version

* Added mongodb to correct network

* Added auction house

* Acknowledgments, Dockerfile for app

* Added app to build

* Dockerfile for app

* Mapped app port to localhost:8080

Co-authored-by: Ubuntu <ubuntu@docker-tests.novalocal>
2021-11-16 16:12:15 +01:00
reynisson
071dee6d21
Merge pull request #63 from SCS-ASSE-FS21-Group1/auctionhouse-websub
Auctionhouse websub
2021-11-14 22:16:15 +01:00
b65df5f7be Merge branch 'auctionhouse-websub' of https://github.com/SCS-ASSE-FS21-Group1/tapas into auctionhouse-websub 2021-11-14 22:09:33 +01:00
613c1482d7 fixed nameing 2021-11-14 22:09:10 +01:00
afb534b0e1
Merge branch 'dev' into auctionhouse-websub 2021-11-14 20:51:27 +01:00
333f6aab21 finished websub implementation 2021-11-14 20:46:42 +01:00
reynisson
1b7395ba0d Implemented the handling of the mqtt executor removed event 2021-11-14 19:26:19 +01:00
reynisson
1d9459d8f3
Merge pull request #56 from SCS-ASSE-FS21-Group1/timestamp
changed deadline to timestamp and the logic to schedule an auction
2021-11-14 16:53:49 +01:00
julius.lautz
b37141f5ce fixed issues 2021-11-14 16:51:42 +01:00
reynisson
ccb800b6af Merge branch 'auction_house_adapt_to_new_executor_event' into dev
# Conflicts:
#	tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/http/ExecutorRemovedEventListenerHttpAdapter.java
2021-11-14 16:15:22 +01:00
reynisson
e3d68b88d9
Merge pull request #51 from SCS-ASSE-FS21-Group1/ExecutorRemovedEventListenerMqttAdapter
Implemented RemovedEventListener...
2021-11-14 16:12:10 +01:00
reynisson
41b0e25a5e Adapted the auction house to receive and handle the new executor event over mqtt 2021-11-14 16:06:03 +01:00
reynisson
2999fb294c Implemented the auction started event over mqtt 2021-11-14 15:16:42 +01:00
reynisson
2f42da485d Fixed imports so that the class builds 2021-11-12 13:30:16 +01:00
rahimiankeanu
c48a402e55 2.0 2021-11-12 08:59:09 +01:00
rahimiankeanu
f652a9ecaf MQTT event adapter 2021-11-12 08:51:43 +01:00
Andrei Ciortea
3f4f2f4a1b Update BROKERS.md 2021-11-11 17:16:09 +01:00
18fdf819f1 First implementation of WebSub 2021-11-10 15:14:41 +01:00
julius.lautz
74a51cfcf6 changed deadline to timestamp and the logic to schedule an auction 2021-11-10 11:03:57 +00:00
6855ef6f2a Merge remote-tracking branch 'upstream/main' into dev 2021-11-08 15:03:01 +01:00
rahimiankeanu
e0e54f9350 Implemented RemovedEventListener... 2021-11-07 23:35:24 +01:00
Andrei Ciortea
5c82dd84b4 Add instructions for setting up a local WebSub hub and MQTT broker 2021-10-22 12:39:50 +02:00
d08a6d0b67 merge everything from main project 2021-10-18 11:45:52 +02:00
Andrei Ciortea
061a76288d Update project template for Auction House 2021-10-18 09:45:52 +02:00
Andrei Ciortea
34fb3c682f Add Auction House; Extend uniform HTTP API for TAPAS-Tasks 2021-10-18 01:19:42 +02:00