Changeset 80746

Timestamp:

07/16/11 12:36:18 (4 years ago)

Author:

derek@…

Message:

Update existing installed_port submissions for a given user if they re-submit during the same month

File:

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

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

@@ -42 +42 @@
   def add_port(user, macports_port, installed_port, month, year)
     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                  
+    if port_entry.nil?
+      port_entry = InstalledPort.new
+    end
         
-    portEntry = InstalledPort.new(:user_id => user.id,
-                             :port_id => macports_port.id,
-                             :version => installed_port['version'],
-                             :variants => installed_port['variants'],
-                             :month => month,
-                             :year => year)
-                        
-    if not portEntry.save
-     logger.debug "Unable to save port #{port['name']}"
-     logger.debug "Error message: #{portEntry.errors.full_messages}"
+    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']}"
+     logger.debug "Reason: #{port_entry.errors.full_messages}"
    end
  end