From e15de890531723fee8bc553c74bcde6d93351daa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jarno=20Kiesil=C3=A4inen?= <jarnokie@gmail.com>
Date: Thu, 7 Aug 2025 19:15:00 +0300
Subject: [PATCH 1/3] feat: removed backend pipeline step for caching m2

---
 .gitea/workflows/backend-ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitea/workflows/backend-ci.yml b/.gitea/workflows/backend-ci.yml
index 2b464dc..9610e9b 100644
--- a/.gitea/workflows/backend-ci.yml
+++ b/.gitea/workflows/backend-ci.yml
@@ -25,11 +25,14 @@ jobs:
         java-version: '21'
         distribution: 'temurin'
         cache: 'maven'
+<<<<<<< HEAD
 
     - name: Set up Maven
       uses: stCarolas/setup-maven@v5
       with:
         maven-version: '3.6.3'
+=======
+>>>>>>> c5433df (feat: removed backend pipeline step for caching m2)
         
     - name: Run Maven tests
       working-directory: ./backend
-- 
2.49.1


From 2e9db89ffa4ed9902ba7a9bc148fab8244198b92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jarno=20Kiesil=C3=A4inen?= <jarnokie@gmail.com>
Date: Thu, 7 Aug 2025 19:15:42 +0300
Subject: [PATCH 2/3] feat: added setup maven step to the backend pipeline

---
 .gitea/workflows/backend-ci.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitea/workflows/backend-ci.yml b/.gitea/workflows/backend-ci.yml
index 9610e9b..2b464dc 100644
--- a/.gitea/workflows/backend-ci.yml
+++ b/.gitea/workflows/backend-ci.yml
@@ -25,14 +25,11 @@ jobs:
         java-version: '21'
         distribution: 'temurin'
         cache: 'maven'
-<<<<<<< HEAD
 
     - name: Set up Maven
       uses: stCarolas/setup-maven@v5
       with:
         maven-version: '3.6.3'
-=======
->>>>>>> c5433df (feat: removed backend pipeline step for caching m2)
         
     - name: Run Maven tests
       working-directory: ./backend
-- 
2.49.1


From 408b0a7259dc4469f8bda700c592e2cf0b88aa04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jarno=20Kiesil=C3=A4inen?= <jarnokie@gmail.com>
Date: Thu, 7 Aug 2025 19:27:06 +0300
Subject: [PATCH 3/3] updated readme to match the datamodel

---
 README.md | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d1936ad..347ca59 100644
--- a/README.md
+++ b/README.md
@@ -5,10 +5,28 @@
 ```mermaid
 classDiagram
     class Activity {
+        +Long id
         +String name
         +Location location
-        +Int priceRange
+        +Integer priceRange
         +List~String~ tags
+        +String description
+        +LocalDateTime createdAt
+        +LocalDateTime updatedAt
     }
+    
+    class Location {
+        +Long id
+        +String name
+        +String address
+        +String city
+        +String country
+        +String postalCode
+        +Double latitude
+        +Double longitude
+        +LocalDateTime createdAt
+        +LocalDateTime updatedAt
+    }
+    
+    Activity <-- Location : belongs to
 ```
-
-- 
2.49.1