Changeset 80569

Timestamp:

07/14/11 23:13:50 (4 years ago)

Author:

derek@…

Message:

• Add uuid to users table if it is not already there
• use user_id rather than uuid when saving os_statistics
• A user can have only one os_statistics entry for a given uuid. Attempt to find an existing entry and update that before creating a new one

File:

• branches/gsoc11-statistics/stats-server/app/controllers/submissions_controller.rb (modified) (3 diffs)

branches/gsoc11-statistics/stats-server/app/controllers/submissions_controller.rb

@@ -21 +21 @@
 
   # Populate an OsStatistics row based on submitted JSON data
-  def add_os_data(uuid, os)
+  def add_os_data(user, os)
     logger.debug "In add_os_data"
     
@@ -36 +36 @@
     xcode_version    = os['xcode_version']
    
-    @os_stats = OsStatistic.new(:uuid => uuid,
-                            :macports_version => macports_version,
-                            :osx_version      => osx_version,
-                            :os_arch          => os_arch,
-                            :os_platform      => os_platform,
-                            :build_arch       => build_arch,
-                            :gcc_version      => gcc_version,
-                            :xcode_version    => xcode_version)
-    if not @os_stats.save
+    # Try and find an existing entry
+    os_stats = OsStatistic.find_by_user_id(user.id)
+     
+    if os_stats.nil?
+      # No entry for this user - create a new one
+      os_stats = OsStatistic.new()
+    end
+    
+    os_stats[:user_id]          = user.id
+    os_stats[:macports_version] = macports_version
+    os_stats[:osx_version]      = osx_version
+    os_stats[:os_arch]          = os_arch
+    os_stats[:os_platform]      = os_platform
+    os_stats[:build_arch]       = build_arch
+    os_stats[:gcc_version]      = gcc_version
+    os_stats[:xcode_version]    = xcode_version
+    
+    if not os_stats.save
       logger.debug "Unable to save os_stats"
-      logger.debug "Error message: #{@os_stats.errors.full_messages}"
+      logger.debug "Error message: #{os_stats.errors.full_messages}"
     end
   end
@@ -84 +93 @@
     os = json['os']
     active_ports = json['active_ports']
-    add_os_data(json['id'], os)
+    
+    user = User.find_or_create_by_uuid(json['id'])
+    
+    add_os_data(user, os)
     add_port_data(json['id'], active_ports)