app/controllers/api/v1/contacts_controller.rb in faalis_contacts-0.1.0 vs app/controllers/api/v1/contacts_controller.rb in faalis_contacts-0.3.0

@@ -6,53 +6,19 @@
   def index
     respond_with(@contacts)
   end
 
   def create
-    details = params[:contact][:details] || []
-    details_list = []
-    details.each do |detail|
-      contact_detail = ContactDetails.create!(:detail_field => detail[:field],
-                                              :detail_type => detail[:type],
-                                              :detail_value => detail[:value])
-      details_list << contact_detail
-    end
-
-    @contact.details = details_list
-
-    if @contact.save
-      respond_with(@contact)
-    else
-      respond_to do |format|
-        format.json { render :json => {:fields => @contact.errors}, :status => :unprocessable_entity }
-      end
-    end
+    create_or_update(:create)
   end
 
   def show
     respond_with(@contact)
   end
 
   def update
-    details = params[:contact][:details] || []
-    details_list = []
-    details.each do |detail|
-      contact_detail = ContactDetails.create!(:detail_field => detail[:field],
-                                              :detail_type => detail[:type],
-                                              :detail_value => detail[:value])
-      details_list << contact_detail
-    end
-
-    @contact.details = details_list
-
-    if @contact.update(resource_params)
-      respond_with(@contact)
-    else
-      respond_to do |format|
-        format.json { render :json => {:fields => @contact.errors}, :status => :unprocessable_entity }
-      end
-    end
+    create_or_update(:update)
   end
 
   def destroy
     ids = params[:id].split(",")
     @contacts = ::Contact.where(:id => ids)
@@ -64,8 +30,80 @@
     @contact = ::Contact.new(resource_params)
   end
 
   def resource_params
     params.require(:contact).permit(:id, :prefix, :first_name, :middle_name, :last_name, :suffix, :organization, :is_organization)
+  end
+
+  private
+
+  def create_or_update(action)
+    details = params[:contact][:details] || []
+    details_list = []
+    details_errors = []
+    valid = true
+
+    details.each do |detail|
+
+      contact_detail = ContactDetails.find_or_initialize_by(:detail_field_id => detail[:field],
+                                                            :detail_type => detail[:type],
+                                                            :detail_value => detail[:value])
+
+      if not contact_detail.valid?
+        details_errors << contact_detail.errors
+        valid = false
+      else
+        details_errors << {}
+        details_list << contact_detail
+      end
+    end
+
+    if valid
+      details_list.each { |x| x.save }
+      @contact.details = details_list
+    end
+
+    result = @contact.update(resource_params) if action == :update
+    result = @contact.save if action == :create
+
+    if result and valid
+      respond_with(@contact)
+    else
+      errors = get_details_error(@contact, details_errors)
+      respond_to do |format|
+        format.json { render :json => errors, :status => :unprocessable_entity }
+      end
+    end
+
+
+  end
+
+  def get_details_error(contact, gerrors)
+    errors = {:fields => contact.errors}
+    counter = 0
+
+    contact.details.each do |detail|
+      if not detail.errors.empty?
+        detail.errors.each do |key, value|
+          errors[:fields]["#{key}_#{counter}".to_sym] = value
+          if errors[:fields]["#{key}_#{counter}".to_sym].length > 1
+            errors[:fields]["#{key}_#{counter}".to_sym].uniq!
+          end
+        end
+      end
+      counter += 1
+    end
+
+    counter = 0
+    gerrors.each do |err|
+      err.each do |key, value|
+        errors[:fields]["#{key}_#{counter}".to_sym] = value
+        if errors[:fields]["#{key}_#{counter}".to_sym].length > 1
+            errors[:fields]["#{key}_#{counter}".to_sym].uniq!
+        end
+      end
+      counter += 1
+    end
+    errors
   end
 
 end