Merge User Settings API to My Profile API

Author: wenhui-wd

apiary.apib

@@ -1063,7 +1063,49 @@ Register a new user.
             "address": "address1, city, Maine, 04043, United States",
             "age": "25 - 34",
             "gender": "Male",
-            "shirt_size": "Medium"
+            "shirt_size": "Medium",
+            "privacy": {
+                "showMySchool": "Yes",
+                "showMyEarnings": "No",
+                "receiveMessages": "Yes",
+                "messageBlackList": ["handleA", "handleB"]
+             },
+             "emailNotification": {
+                "competitionAnnouncements": {
+                    "algorithmCompetitions": "No",
+                    "softwareDevelopmentOpportunities": "Yes",
+                    "topCoderStudioCompetitions": "No"
+                },
+                "others": {
+                    "employmentOpportunities": "Yes",
+                    "topCoderNewsAndEvents": "Yes",
+                    "topCoderDesignStudioNewsletter": "No"
+                }
+             },
+             "demographic": {
+                "nonEnglishName": "name1",
+                "jobTitle": "Lorem ipsum",
+                "company": "company1",
+                "country": "Indonesia",
+                "representedCountry": "Indonesia",
+                "phone": "555555",
+                "timeZone": "US/Central",
+                "age": "18 - 25",
+                "gender": "Male",
+                "ethnicBackground": "Asian or Pacific Islander",
+                "primaryInterest": "Creative Competition",
+                "shirtSize": "Small",
+                "collegeMajor": "Computer Science",
+                "collegeMajorDescription": "Software Design",
+                "degreeProgram": "Bachelors",
+                "graduationDate": "21/02/2011",
+                "clubsOrOrganizations": "None",
+                "school": "Harvard University",
+                "gpa": 3.5,
+                "gpaScale": 5,
+                "isStudent": "Yes",
+                "isProfessional": "No"
+             }
         }
 
 + Response 400 (application/json)
@@ -1375,96 +1417,6 @@ Register a new user.
             "description":"Unknown server error. Please contact support."
         }
 
-+ Response 503 (application/json)
-
-        {
-            "name":"Service Unavailable",
-            "value":"503",
-            "description":"Servers are up but overloaded. Try again later."
-        }
-        
-## User Settings [/users/settings]
-### User Settings [GET]
-
-+ Response 200 (application/json)
-
-        {
-             "privacy": {
-                "showMySchool": "Yes",
-                "showMyEarnings": "No",
-                "receiveMessages": "Yes",
-                "messageBlackList": ["handleA", "handleB"]
-             },
-             "emailNotification": {
-                "competitionAnnouncements": {
-                    "algorithmCompetitions": "No",
-                    "softwareDevelopmentOpportunities": "Yes",
-                    "topCoderStudioCompetitions": "No"
-                },
-                "others": {
-                    "employmentOpportunities": "Yes",
-                    "topCoderNewsAndEvents": "Yes",
-                    "topCoderDesignStudioNewsletter": "No"
-                }
-             },
-             "demographic": {
-                "nonEnglishName": "name1",
-                "jobTitle": "Lorem ipsum",
-                "company": "company1",
-                "country": "Indonesia",
-                "representedCountry": "Indonesia",
-                "phone": "555555",
-                "timeZone": "US/Central",
-                "age": "18 - 25",
-                "gender": "Male",
-                "ethnicBackground": "Asian or Pacific Islander",
-                "primaryInterest": "Creative Competition",
-                "shirtSize": "Small",
-                "collegeMajor": "Computer Science",
-                "collegeMajorDescription": "Software Design",
-                "degreeProgram": "Bachelors",
-                "graduationDate": "21/02/2011",
-                "clubsOrOrganizations": "None",
-                "school": "Harvard University",
-                "gpa": 3.5,
-                "gpaScale": 5,
-                "isStudent": "Yes",
-                "isProfessional": "No"
-             }
-        }
-
-+ Response 400 (application/json)
-
-        {
-            "name":"Bad Request",
-            "value":"400",
-            "description":"This message will explain why the request is invalid or cannot be served."
-        }
-
-+ Response 401 (application/json)
-
-        {
-            "name":"Unauthorized",
-            "value":"401",
-            "description":"Authentication credentials were missing or incorrect."
-        }
-
-+ Response 403 (application/json)
-
-        {
-            "name":"Forbidden",
-            "value":"403",
-            "description":"The request is understood, but it has been refused or access is not allowed."
-        }
-
-+ Response 500 (application/json)
-
-        {
-            "name":"Internal Server Error",
-            "value":"500",
-            "description":"Unknown server error. Please contact support."
-        }
-
 + Response 503 (application/json)
 
         {