@@ -1,4 +1,4 @@
-from django.urls import reverse as _reverse
+from django.db.models import Prefetch
 
 from pythonpro.modules.models import Section as _Section, Module as _Module
 
@@ -11,20 +11,16 @@ def get_all_modules():
     return tuple(_Module.objects.order_by('order'))
 
 
-def get_module_sections(module):
+def get_module_sections(slug):
     """
-    Search for all module's sections. Only Section's title and slug is returned
-    :param module:
-    :return:
+    Search for a module with respective sections
+    :param slug: module slugs
+    :return: Module with respective section on attribute sections
     """
 
-    def set_absolut_url(dct):
-        dct['get_absolute_url'] = _reverse('sections:detail', kwargs={'slug': dct['slug']})
-        return dct
-
-    mapped = map(
-        set_absolut_url,
-        _Section.objects.values('title', 'slug').filter(_module_slug=module.slug).order_by('order')
-    )
-
-    return tuple(mapped)
+    return _Module.objects.filter(slug=slug).prefetch_related(
+        Prefetch(
+            'section_set',
+            queryset=_Section.objects.order_by('order'),
+            to_attr='sections')
+    ).get()
@@ -0,0 +1,33 @@
+# Generated by Django 2.0.3 on 2018-03-14 20:45
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+def populate_foreign_key(apps, scheme_editor):
+    """Populate module foreign key attribute based on _module_slug"""
+    Section = apps.get_model('modules', 'Section')
+    Module = apps.get_model('modules', 'Module')
+    for section in Section.objects.all():
+        section.module = Module.objects.filter(slug=section._module_slug).get()
+        section.save()
+
+
+def reverse_populate_foreign_key(apps, scheme_editor):
+    """No need to revert since column will be dropped. Function is present only to allow migration roll back"""
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('modules', '0003_module'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='section',
+            name='module',
+            field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='modules.Module'),
+            preserve_default=False,
+        ),
+        migrations.RunPython(populate_foreign_key, reverse_populate_foreign_key)
+    ]
@@ -185,6 +185,7 @@ def parent(self):
 
 class Section(Content):
     _module_slug = models.SlugField(choices=((m.slug, m.title) for m in ALL.values()))
+    module = models.ForeignKey('Module', on_delete=models.CASCADE)
     order_with_respect_to = '_module_slug'
 
     class Meta:
@@ -194,4 +195,4 @@ def get_absolute_url(self):
         return reverse('sections:detail', kwargs={'slug': self.slug})
 
     def parent(self):
-        return ALL[self._module_slug]
+        return self.module
@@ -2,16 +2,13 @@
 from django.shortcuts import render
 
 # Create your views here.
-from pythonpro.modules import models
 from pythonpro.modules.facade import get_module_sections, get_all_modules
 
 
 @login_required
 def detail(request, slug):
-    module = models.ALL[slug]
-    module.sections = get_module_sections(module)
-    ctx = dict(module=module)
-    return render(request, 'modules/module_detail.html', context=ctx)
+    module = get_module_sections(slug)
+    return render(request, 'modules/module_detail.html', {'module': module})
 
 
 def index(request):
 
@@ -1,17 +1,26 @@
 import pytest
+from django.core.management import call_command
 from django.urls import reverse
 from model_mommy import mommy
 
 from pythonpro.django_assertions import dj_assert_contains
-from pythonpro.modules.models import Section, PYTHON_BIRDS
+from pythonpro.modules import facade
+from pythonpro.modules.models import Section, PYTHON_BIRDS, Module
 
 
 def generate_resp(slug, client):
     return client.get(reverse('modules:detail', kwargs={'slug': slug}))
 
 
 @pytest.fixture
-def client_with_user(client, django_user_model):
+def modules(transactional_db):
+    call_command('loaddata', 'pythonpro_modules.json')
+    modules = facade.get_all_modules()
+    return modules
+
+
+@pytest.fixture
+def client_with_user(client, django_user_model, modules):
     user = mommy.make(django_user_model)
     client.force_login(user)
     return client
@@ -62,7 +71,7 @@ def test_page_content_with_pre_requisite(content, client_with_user):
 
 @pytest.fixture
 def sections(transactional_db):
-    return mommy.make(Section, 2, _module_slug=PYTHON_BIRDS.slug)
+    return mommy.make(Section, 2, module=Module.objects.filter(slug='python-birds').get())
 
 
 @pytest.fixture
 
@@ -11,7 +11,6 @@
 def modules(transactional_db):
     call_command('loaddata', 'pythonpro_modules.json')
     modules = facade.get_all_modules()
-    assert len(modules) > 0
     return modules
 
 
 
@@ -3,12 +3,17 @@
 from model_mommy import mommy
 
 from pythonpro.django_assertions import dj_assert_contains
-from pythonpro.modules.models import Section, PYTHON_BIRDS
+from pythonpro.modules.models import Section, Module
 
 
 @pytest.fixture
-def section():
-    return mommy.make(Section, slug='procedural', _module_slug=PYTHON_BIRDS.slug)
+def module():
+    return mommy.make(Module)
+
+
+@pytest.fixture
+def section(module):
+    return mommy.make(Section, slug='procedural', module=module)
 
 
 @pytest.fixture
@@ -27,10 +32,10 @@ def test_title(resp, section, property_name):
     dj_assert_contains(resp, getattr(section, property_name))
 
 
-def test_breadcrumb_parent(resp):
+def test_breadcrumb_parent(resp, module):
     dj_assert_contains(
         resp,
-        '<li class="breadcrumb-item"><a href="/modulos/python-birds/">Python Birds</a></li>'
+        f'<li class="breadcrumb-item"><a href="{module.get_absolute_url()}">{module.title}</a></li>'
     )