Notification API responding from the DB

Thiez · Jul 28, 2013 · dc67dad · dc67dad
1 parent cb1d774
commit dc67dad
Show file tree

Hide file tree

Showing 8 changed files with 76 additions and 12 deletions.
diff --git a/frontend/config/server.js b/frontend/config/server.js
@@ -22,9  22,9 @@ module.exports = {
       res.json([
         {
           id : "51dcb40d4a31e7a3cb000010",
-          type: "argument",
-          unread: true,
-          link: "http://localhost:8000/submissions/51dcb40d4a31e7a3cb000011",
           kind: "argument",
           read: true,
           link: "submissions/51dcb40d4a31e7a3cb000011",
           from: "Bob",
           // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date
           // Of our options, the Unix date string seems the most sane.
@@ -33,17  33,17 @@ module.exports = {
         },
         {
           id : "51dcb40d4a31e7a3cb000031",
-          type: "nitpick",
-          unread: true,
           kind: "nitpick",
           read: true,
           link: "http://localhost:8000/submissions/51dcb40d4a31e7a3cb00000f",
           from: "Alice",
           date: 1374453865190,
           humanReadableDate: "about 12 hours ago",
         },
         {
           id : "51dcb40d4a31e7a3cb000012",
-          type: "argument",
-          unread: false,
           kind: "argument",
           read: false,
           link:  "http://localhost:8000/submissions/51dcb40d4a31e7a3cb00000f",
           from: "Bob",
           date: 1374453866182,

diff --git a/lib/app.rb b/lib/app.rb
@@ -10,6  10,7 @@
 require 'app/exercises'
 require 'app/trails'
 require 'app/about'
 require 'app/presenters/notifications_presenter'
 require 'app/nitpick'
 require 'app/helpers/fuzzy_time_helper'
 require 'app/helpers/gravatar_helper'

diff --git a/lib/app/api/notifications_api.rb b/lib/app/api/notifications_api.rb
@@ -1,14  1,15 @@
 class ExercismApp < Sinatra::Base
   get '/api/v1/notifications' do
-    notification_user
     notifications = Dispatch.notifications_for_user(notification_user)
     NotificationsPresenter.new(notifications).to_json
   end
 
   private
   def notification_user
     if params[:key]
       User.find_by(:key, params[:key])
     elsif session[:github_id]
-      @current_user
       current_user
     else
       no_user_error
     end

diff --git a/lib/app/presenters/notifications_presenter.rb b/lib/app/presenters/notifications_presenter.rb
@@ -0,0  1,28 @@
 #requiring here doesn't feel right
 require_relative '../helpers/fuzzy_time_helper'
 
 class NotificationsPresenter
   include Sinatra::FuzzyTimeHelper
 
   def initialize(notifications)
     @notifications = transform(notifications)
   end
 
   def to_json
     @notifications.to_json
   end
 
   def transform(notifications)
     notifications.map { |notification|
       {
         id: notification.id,
         kind: notification.kind,
         read: notification.read,
         link: notification.link,
         from: notification.from,
         date: notification.at.to_time.to_i,
         humanReadableDate: ago(notification.at),
       }
     }
   end
 end
diff --git a/lib/exercism/use_cases/notification.rb b/lib/exercism/use_cases/notification.rb
@@ -1,5  1,16 @@
 class Notification
   include Mongoid::Document
 
   field :re, as: :regarding, type: String
   field :r, as: :read, type: Boolean, default: false
   field :l, as: :link, type: String
   field :f, as: :from, type: String
   field :at, type: Time, default: ->{ Time.now.utc }
 
   belongs_to :user
 
   def self.recent_for_user(user)
     where(user: user).limit(100).descending(:at)
   end
 end
 
diff --git a/lib/services.rb b/lib/services.rb
@@ -2,3  2,4 @@
 require 'services/message'
 require 'services/nitpick_message'
 require 'services/approval_message'
 require 'services/dispatch'
diff --git a/lib/services/dispatch.rb b/lib/services/dispatch.rb
@@ -0,0  1,5 @@
 class Dispatch
   def self.notifications_for_user(user)
     Notification.recent_for_user(user)
   end
 end
diff --git a/test/app/notifications_api_test.rb b/test/app/notifications_api_test.rb
@@ -9,8  9,19 @@ def app
 
   attr_reader :alice
   def setup
-    @alice = User.create(username: 'alice', github_id: 1, current: {'ruby' => 'word-count', 'javascript' => 'anagram'})
-    Notification.create(user: @alice ,unread: true, from: "Bob", type: "argument")
     @alice = User.create({
       username: 'alice',
       github_id: 1,
       current: {'ruby' => 'word-count', 'javascript' => 'anagram'}
     })
     Notification.create({
       user: @alice,
       unread: true,
       from: "Bob",
       type: "argument",
       kind: "Nitpick",
       link: "a/link/to/a/thing",
     })
   end
 
   def teardown
@@ -26,9  37,9 @@ def not_logged_in
   end
 
   def test_get_notifications_when_logged_in
-    skip
     get '/api/v1/notifications', {}, 'rack.session' => logged_in
     assert last_response.body.include?("Bob")
     assert last_response.body.include?("just now")
   end
 
   def test_get_notifications_when_not_logged_in
@@ -37,15  48,21 @@ def test_get_notifications_when_not_logged_in
   end
 
   def test_get_notifications_from_cli
     skip
     get '/api/v1/notifications', @alice.key
     assert last_response.body.include?("just now")
   end
 
   def test_mark_notification_read_when_logged_in
     skip
   end
 
   def test_mark_notification_read_when_not_logged_in
     skip
   end
 
   def test_mark_notification_from_cli
     skip
   end
 end