Changeset 80844

Timestamp:

07/18/11 15:37:51 (4 years ago)

Author:

derek@…

Message:

Changes to way existing records are queried

add_os_data

• Use User association to get an existing OsStatistics entry. This should be clearer and easier to read than before.

add_port

• Finding an existing InstalledPort now also uses the user association.
• Check if :created_at falls between the range [start_of_month, end_of_month] rather than use month,year columns

File:

• branches/gsoc11-statistics/stats-server/app/models/submission.rb (modified) (2 diffs)

branches/gsoc11-statistics/stats-server/app/models/submission.rb

@@ -18 +18 @@
    
     # Try to find an existing entry
-    os_stats = OsStatistic.find_by_user_id(user.id)
+    os_stats = user.os_statistic
      
     if os_stats.nil?
@@ -43 +43 @@
     logger.debug {"Adding installed port #{installed_port['name']}"}
     
-    # Update any ports found for this user is they have already been submitted this month
-    port_entry = InstalledPort.find_by_port_id_and_user_id_and_month_and_year(macports_port.id, 
-                                                                              user.id, 
-                                                                              month, 
-                                                                              year)
-    
-    # New port entry                  
+    # Update any ports found for this user if they have already been submitted this month  
+    port_entrys = user.installed_ports.where(:created_at => (Date.today.at_beginning_of_month)..(Date.today.at_end_of_month))
+    port_entry = port_entrys.find_by_port_id(macports_port.id)
+
+    # No existing entry was found - create a new one                
     if port_entry.nil?
       port_entry = InstalledPort.new
     end
-        
+    
     port_entry[:user_id]  = user.id
     port_entry[:port_id]  = macports_port.id
     port_entry[:version]  = installed_port['version']
     port_entry[:variants] = installed_port['variants']
-    port_entry[:month]    = month
-    port_entry[:year]     = year
-                              
+                            
     if not port_entry.save
      logger.debug "Unable to save port #{installed_port['name']}"