Used the feedback from Scott to improve endpoints

app/schemas/models/achievement.coffee

@@ -10,6 +10,10 @@ module.exports =
       model: { type: 'string' }
       description: { type: 'string' }
       userField: { type: 'string' }
+<<<<<<< HEAD
+=======
+      related: c.objectId
+>>>>>>> 97602db... Refactored achievements and their endpoints as per the feedback by Scott.
       proportionalTo:
         type: 'string'
         description: 'For repeatables only. Denotes the field a repeatable achievement needs for its calculations'

app/schemas/models/earned_achievement.coffee

@@ -17,9 +17,11 @@ module.exports =
           [
             {
               rel: 'extra'
-              href: '/db/user/{($)}'
+              href: '/db/achievement/{($)}'
             }
           ]
+      collection:
+        type: 'string'
       achievementName:
         type: 'string'
       created:

app/views/kinds/SearchView.coffee

@@ -4,8 +4,12 @@ forms = require('lib/forms')
 app = require('application')
 
 class SearchCollection extends Backbone.Collection
-  initialize: (modelURL, @model, @term) ->
+  initialize: (modelURL, @model, @term, @projection) ->
-    @url = "#{modelURL}/search?project=true"
+    @url = "#{modelURL}/search?project="
+    if @projection? and not @projection == []
+      @url += projection[0]
+      @url += ',' + projected for projected in projection[1..]
+    else @url += "true"
     @url += "&term=#{term}" if @term
 
 module.exports = class SearchView extends View
@@ -17,6 +21,7 @@ module.exports = class SearchView extends View
   model: null # Article
   modelURL: null # '/db/article'
   tableTemplate: null # require 'templates/editor/article/table'
+  projected: null # ['name', 'description', 'version'] or null for default
 
   events:
     'change input#search': 'runSearch'

server/achievements/EarnedAchievement.coffee

@@ -13,4 +13,7 @@ EarnedAchievementSchema = new mongoose.Schema({
     default: false
 }, {strict:false})
 
+# Maybe consider indexing on changed: -1 as well?
+EarnedAchievementSchema.index({user: 1, achievement: 1}, {unique: true, name: 'earned achievement index'})
+
 module.exports = EarnedAchievement = mongoose.model('EarnedAchievement', EarnedAchievementSchema)

server/achievements/achievement_handler.coffee

@@ -5,7 +5,7 @@ class AchievementHandler extends Handler
   modelClass: Achievement
 
   # Used to determine which properties requests may edit
-  editableProperties: ['name', 'query', 'worth', 'model', 'description', 'userField', 'proportionalTo']
+  editableProperties: ['name', 'query', 'worth', 'collection', 'description', 'userField', 'proportionalTo']
   jsonSchema = require '../../app/schemas/models/achievement.coffee'
 
   hasAccess: (req) ->

server/plugins/achievements.coffee

@@ -11,7 +11,7 @@ loadAchievements = ->
   query = Achievement.find({})
   query.exec (err, docs) ->
     _.each docs, (achievement) ->
-      category = achievement.get 'model'
+      category = achievement.get 'collection'
       achievements[category] = [] unless category of achievements
       achievements[category].push achievement
 
@@ -49,29 +49,28 @@ module.exports = AchievablePlugin = (schema, options) ->
         userObjectID = doc.get(achievement.get('userField'))
         userID = if _.isObject userObjectID then userObjectID.toHexString() else userObjectID # Standardize! Use strings, not ObjectId's
 
-        if newlyAchieved and not alreadyAchieved
+        if newlyAchieved and (not alreadyAchieved or isRepeatable)
-          console.log 'Creating a new earned achievement called \'' + (achievement.get 'name') + '\' for ' + userID
+          earned = {
-          earned = new EarnedAchievement(
             user: userID
             achievement: achievement._id.toHexString()
             achievementName: achievement.get 'name'
-          )
+          }
-          earned.save (err, doc) ->
+          if isRepeatable
-            console.log err if err?
+            console.log 'Upserting repeatable achievement called \'' + (achievement.get 'name') + '\' for ' + userID
-        else if newlyAchieved and isRepeatable
+            proportionalTo = achievement.get 'proportionalTo'
-          proportionalTo = achievement.get 'proportionalTo'
+            originalValue = util.getByPath(originalDocObj, proportionalTo)
-          originalValue = util.getByPath(originalDocObj, proportionalTo)
+            newValue = docObj.get proportionalTo
-          newValue = docObj.get proportionalTo
 
-          if originalValue != newValue
+            if originalValue != newValue
-            upsertQuery = EarnedAchievement.findOneAndUpdate
+              earned.notified = false
-              user: userID
+              earned.achievedAmount = newValue
-              achievement: achievement._id.toHexString(),
+              earned.changed = Date.now()
-              notified: false
+              upsertQuery = EarnedAchievement.findOneAndUpdate earned, upsert:true
-              achievedAmount: newValue
+              upsertQuery.exec (err, docs) ->
-              changed: Date.now(),
+                console.log err if err?
-              upsert: true
+          else # alreadyAchieved
-            upsertQuery.exec (err, docs) ->
+            console.log 'Creating a new earned achievement called \'' + (achievement.get 'name') + '\' for ' + userID
+            (new EarnedAchievement(earned)).save (err, doc) ->
               console.log err if err?
 
 

server/users/user_handler.coffee

@@ -10,7 +10,7 @@ async = require 'async'
 log = require 'winston'
 LevelSession = require('../levels/sessions/LevelSession')
 LevelSessionHandler = require '../levels/sessions/level_session_handler'
-EarnedAchievement = require '../achievements/earned_achievement_handler'
+EarnedAchievement = require '../achievements/EarnedAchievement'
 
 serverProperties = ['passwordHash', 'emailLower', 'nameLower', 'passwordReset']
 privateProperties = [