Added view models for the remaining view methods (not recorded).

Author: mikeckennedy

app/ch13-validation/final/pypi_org/templates/cms/page.html

@@ -2,9 +2,9 @@
 {% block title %}About PyPI Demo{% endblock %}
 
 {% block main_content %}
-    <h1>{{ page_title }}</h1>
+    <h1>{{ page.page_title }}</h1>
 
     <div>
-        {{ page_details }}
+        {{ page.page_details }}
     </div>
 {% endblock %}

app/ch13-validation/final/pypi_org/viewmodels/account/index_viewmodel.py

@@ -5,4 +5,4 @@
 class IndexViewModel(ViewModelBase):
     def __init__(self):
         super().__init__()
-        self.user = user_service.find_user_by_id(self.user_id)
+        self.user = user_service.find_user_by_id(self.user_id)

app/ch13-validation/final/pypi_org/viewmodels/account/login_viewmodel.py

@@ -0,0 +1,15 @@
+from pypi_org.services import user_service
+from pypi_org.viewmodels.shared.viewmodelbase import ViewModelBase
+
+
+class LoginViewModel(ViewModelBase):
+    def __init__(self):
+        super().__init__()
+        self.email = self.request_dict.email.lower().strip()
+        self.password = self.request_dict.password.strip()
+
+    def validate(self):
+        if not self.email or not self.email.strip():
+            self.error = 'You must specify a email.'
+        elif not self.password:
+            self.error = 'You must specify a password.'

app/ch13-validation/final/pypi_org/viewmodels/cms/page_viewmodel.py

@@ -0,0 +1,10 @@
+from pypi_org.services import user_service, cms_service
+from pypi_org.viewmodels.shared.viewmodelbase import ViewModelBase
+
+
+class PageViewModel(ViewModelBase):
+    def __init__(self, full_url: str):
+        super().__init__()
+
+        self.page = cms_service.get_page(full_url)
+

app/ch13-validation/final/pypi_org/viewmodels/home/index_viewmodel.py

@@ -0,0 +1,12 @@
+from pypi_org.services import user_service, package_service
+from pypi_org.viewmodels.shared.viewmodelbase import ViewModelBase
+
+
+class IndexViewModel(ViewModelBase):
+    def __init__(self):
+        super().__init__()
+
+        self.releases = package_service.get_latest_releases()
+        self.package_count = package_service.get_package_count()
+        self.release_count = package_service.get_release_count()
+        self.user_count = user_service.get_user_count()

app/ch13-validation/final/pypi_org/viewmodels/packages/pagedetails_viewmodel.py

@@ -0,0 +1,22 @@
+from pypi_org.services import user_service, package_service
+from pypi_org.viewmodels.shared.viewmodelbase import ViewModelBase
+
+
+class PackageDetailsViewModel(ViewModelBase):
+    def __init__(self, package_name: str):
+        super().__init__()
+        self.package_name = package_name
+        self.package = None
+        if package_name:
+            self.package_name = package_name.strip().lower()
+            self.package = package_service.get_package_by_id(self.package_name)
+
+        self.latest_version = "0.0.0"
+        self.latest_release = None
+        self.is_latest = True
+
+        if self.package and self.package.releases:
+            self.latest_release = self.package.releases[0]
+            self.latest_version = self.latest_release.version_text
+
+        self.release_version = self.latest_release

app/ch13-validation/final/pypi_org/views/account_views.py

@@ -1,10 +1,10 @@
 import flask
 
-from pypi_org.infrastructure import request_dict
 from pypi_org.infrastructure.view_modifiers import response
 from pypi_org.services import user_service
 import pypi_org.infrastructure.cookie_auth as cookie_auth
 from pypi_org.viewmodels.account.index_viewmodel import IndexViewModel
+from pypi_org.viewmodels.account.login_viewmodel import LoginViewModel
 from pypi_org.viewmodels.account.register_viewmodel import RegisterViewModel
 
 blueprint = flask.Blueprint('account', __name__, template_folder='templates')
@@ -57,33 +57,23 @@ def register_post():
 @blueprint.route('/account/login', methods=['GET'])
 @response(template_file='account/login.html')
 def login_get():
-    return {}
+    vm = LoginViewModel()
+    return vm.to_dict()
 
 
 @blueprint.route('/account/login', methods=['POST'])
 @response(template_file='account/login.html')
 def login_post():
-    data = request_dict.create(default_val='')
-
-    email = data.email.lower().strip()
-    password = data.password.strip()
+    vm = LoginViewModel()
+    vm.validate()
 
-    if not email or not password:
-        return {
-            'email': email,
-            'password': password,
-            'error': "Some required fields are missing.",
-            'user_id': cookie_auth.get_user_id_via_auth_cookie(flask.request),
-        }
+    if vm.error:
+        return vm.to_dict()
 
-    user = user_service.login_user(email, password)
+    user = user_service.login_user(vm.email, vm.password)
     if not user:
-        return {
-            'email': email,
-            'password': password,
-            'error': "The account does not exist or the password is wrong.",
-            'user_id': cookie_auth.get_user_id_via_auth_cookie(flask.request),
-        }
+        vm.error = "The account does not exist or the password is wrong."
+        return vm.to_dict()
 
     resp = flask.redirect('/account')
     cookie_auth.set_auth(resp, user.id)

app/ch13-validation/final/pypi_org/views/cms_views.py

@@ -1,18 +1,17 @@
 import flask
 
 from pypi_org.infrastructure.view_modifiers import response
-import pypi_org.services.cms_service as cms_service
+from pypi_org.viewmodels.cms.page_viewmodel import PageViewModel
 
 blueprint = flask.Blueprint('cms', __name__, template_folder='templates')
 
 
 @blueprint.route('/<path:full_url>')
 @response(template_file='cms/page.html')
 def cms_page(full_url: str):
-    print("Getting CMS page for {}".format(full_url))
+    vm = PageViewModel(full_url)
 
-    page = cms_service.get_page(full_url)
-    if not page:
+    if not vm.page:
         return flask.abort(404)
 
-    return page
+    return vm.to_dict()

app/ch13-validation/final/pypi_org/views/home_views.py

@@ -1,28 +1,21 @@
 import flask
 
-from pypi_org.infrastructure import cookie_auth
 from pypi_org.infrastructure.view_modifiers import response
-import pypi_org.services.package_service as package_service
-import pypi_org.services.user_service as user_service
+from pypi_org.viewmodels.home.index_viewmodel import IndexViewModel
+from pypi_org.viewmodels.shared.viewmodelbase import ViewModelBase
 
 blueprint = flask.Blueprint('home', __name__, template_folder='templates')
 
 
 @blueprint.route('/')
 @response(template_file='home/index.html')
 def index():
-    return {
-        'releases': package_service.get_latest_releases(),
-        'package_count': package_service.get_package_count(),
-        'release_count': package_service.get_release_count(),
-        'user_count': user_service.get_user_count(),
-        'user_id': cookie_auth.get_user_id_via_auth_cookie(flask.request),
-    }
+    vm = IndexViewModel()
+    return vm.to_dict()
 
 
 @blueprint.route('/about')
 @response(template_file='home/about.html')
 def about():
-    return {
-        'user_id': cookie_auth.get_user_id_via_auth_cookie(flask.request),
-    }
+    vm = ViewModelBase()
+    return vm.to_dict()

app/ch13-validation/final/pypi_org/views/package_views.py

@@ -1,38 +1,19 @@
 import flask
 
-from pypi_org.infrastructure import cookie_auth
 from pypi_org.infrastructure.view_modifiers import response
-import pypi_org.services.package_service as package_service
+from pypi_org.viewmodels.packages.pagedetails_viewmodel import PackageDetailsViewModel
 
 blueprint = flask.Blueprint('packages', __name__, template_folder='templates')
 
 
 @blueprint.route('/project/<package_name>')
 @response(template_file='packages/details.html')
 def package_details(package_name: str):
-    if not package_name:
+    vm = PackageDetailsViewModel(package_name)
+    if not vm.package:
         return flask.abort(status=404)
 
-    package = package_service.get_package_by_id(package_name.strip().lower())
-    if not package:
-        return flask.abort(status=404)
-
-    latest_version = "0.0.0"
-    latest_release = None
-    is_latest = True
-
-    if package.releases:
-        latest_release = package.releases[0]
-        latest_version = latest_release.version_text
-
-    return {
-        'package': package,
-        'latest_version': latest_version,
-        'latest_release': latest_release,
-        'release_version': latest_release,
-        'is_latest': is_latest,
-        'user_id': cookie_auth.get_user_id_via_auth_cookie(flask.request),
-    }
+    return vm.to_dict()
 
 
 @blueprint.route('/<int:rank>')