Refactor Document class and add brief field

Author: carlbennett

src/controllers/Document/Create.php

@@ -69,22 +69,21 @@ protected function handlePost(Router &$router, DocumentCreateModel &$model) {
 
     try {
 
-      $success = Document::create(
-        $user_id, $options_bitmask, $title, $content
-      );
+      $document = new Document(null);
+      $document->setContent($content);
+      $document->setOptions($options_bitmask);
+      $document->setTitle($title);
+      $document->setUserId($user_id);
+      $document->commit();
+      $model->error = false;
 
     } catch (QueryException $e) {
 
       // SQL error occurred. We can show a friendly message to the user while
       // also notifying this problem to staff.
       Logger::logException($e);
-
-    }
-
-    if (!$success) {
       $model->error = 'INTERNAL_ERROR';
-    } else {
-      $model->error = false;
+
     }
 
     Logger::logEvent(

src/controllers/Document/Edit.php

@@ -45,16 +45,14 @@ public function &run(Router &$router, View &$view, array &$args) {
     if ($model->document === null) {
       $model->error = 'NOT_FOUND';
     } else {
-      $flags = $model->document->getOptionsBitmask();
-
       $model->comments = Comment::getAll(
         Comment::PARENT_TYPE_DOCUMENT,
         $model->document_id
       );
 
       $model->content   = $model->document->getContent(false);
-      $model->markdown  = ($flags & Document::OPTION_MARKDOWN);
-      $model->published = ($flags & Document::OPTION_PUBLISHED);
+      $model->markdown  = $model->document->isMarkdown();
+      $model->published = $model->document->isPublished();
       $model->title     = $model->document->getTitle();
 
       if ($router->getRequestMethod() == 'POST') {
@@ -63,7 +61,7 @@ public function &run(Router &$router, View &$view, array &$args) {
     }
 
     $view->render($model);
-    $model->_responseCode = ($model->acl_allowed ? 200 : 403);
+    $model->_responseCode = ($model->acl_allowed ? 200 : 401);
     return $model;
   }
 
@@ -102,31 +100,19 @@ protected function handlePost(Router &$router, DocumentEditModel &$model) {
       $model->document->setTitle($model->title);
       $model->document->setMarkdown($model->markdown);
       $model->document->setContent($model->content);
-      $model->document->setPublished($publish);
-
-      $model->document->setEditedCount(
-        $model->document->getEditedCount() + 1
-      );
-      $model->document->setEditedDateTime(
-        new DateTime( 'now', new DateTimeZone( 'Etc/UTC' ))
-      );
+      $model->document->setPublished($publish ? true : false);
 
-      $success = $model->document->save();
+      $model->document->incrementEdited();
+      $model->document->commit();
+      $model->error = false;
 
     } catch (QueryException $e) {
 
       // SQL error occurred. We can show a friendly message to the user while
       // also notifying this problem to staff.
       Logger::logException($e);
-
-      $success = false;
-
-    }
-
-    if (!$success) {
       $model->error = 'INTERNAL_ERROR';
-    } else {
-      $model->error = false;
+
     }
 
     Logger::logEvent(
@@ -136,7 +122,7 @@ protected function handlePost(Router &$router, DocumentEditModel &$model) {
       json_encode([
         'error'           => $model->error,
         'document_id'     => $model->document_id,
-        'options_bitmask' => $model->document->getOptionsBitmask(),
+        'options_bitmask' => $model->document->getOptions(),
         'title'           => $model->document->getTitle(),
         'content'         => $model->document->getContent(false),
       ])

src/controllers/Document/Index.php

@@ -57,7 +57,7 @@ public function &run(Router &$router, View &$view, array &$args) {
     if ($model->documents) {
       $i = count($model->documents) - 1;
       while ($i >= 0) {
-        if (!($model->documents[$i]->getOptionsBitmask()
+        if (!($model->documents[$i]->getOptions()
           & Document::OPTION_PUBLISHED)) {
           unset($model->documents[$i]);
         }
@@ -80,7 +80,7 @@ public function &run(Router &$router, View &$view, array &$args) {
                                   $document->getEditedDateTime()
                                 ),
           'id'               => $document->getId(),
-          'options_bitmask'  => $document->getOptionsBitmask(),
+          'options_bitmask'  => $document->getOptions(),
           'title'            => $document->getTitle(),
           'user'             => $document->getUser(),
         ];