From 526f0dc3158934eca19383f065900446f3f51587 Mon Sep 17 00:00:00 2001
From: Jan Kaluza <jkaluza@redhat.com>
Date: Apr 30 2020 05:13:39 +0000
Subject: Fix Compose.result_repofile_path.


---

diff --git a/server/odcs/server/models.py b/server/odcs/server/models.py
index a706934..ea5452b 100644
--- a/server/odcs/server/models.py
+++ b/server/odcs/server/models.py
@@ -302,7 +302,7 @@ class Compose(ODCSBase):
         """
         Returns path to .repo file.
         """
-        return os.path.join(self.name, "compose", "Temporary",
+        return os.path.join(self.toplevel_dir, "compose", "Temporary",
                             self.name + ".repo")
 
     @property
diff --git a/server/tests/test_models.py b/server/tests/test_models.py
index 2d924af..3ca803d 100644
--- a/server/tests/test_models.py
+++ b/server/tests/test_models.py
@@ -20,6 +20,7 @@
 #
 # Written by Jan Kaluza <jkaluza@redhat.com>
 
+import os
 from datetime import datetime
 from datetime import timedelta
 
@@ -84,6 +85,21 @@ class TestModels(ModelsBaseTest):
                          'toplevel_url': 'http://localhost/odcs/odcs-1'}
         self.assertEqual(c.json(True), expected_json)
 
+    def test_compose_paths(self):
+        compose = Compose.create(
+            db.session, "me", PungiSourceType.MODULE, "testmodule-master",
+            COMPOSE_RESULTS["repository"], 3600)
+        compose.id = 1
+        self.assertEqual(compose.toplevel_dir, os.path.join(conf.target_dir, "odcs-1"))
+        self.assertEqual(
+            compose.result_repofile_path,
+            os.path.join(conf.target_dir, "odcs-1/compose/Temporary/odcs-1.repo")
+        )
+        self.assertEqual(
+            compose.result_repo_dir,
+            os.path.join(conf.target_dir, "odcs-1/compose/Temporary")
+        )
+
     def test_target_dir_none(self):
         compose = Compose.create(
             db.session, "me", PungiSourceType.MODULE, "testmodule-master",