Hotfix 1.0.1 🔧 - Fix misaligned Profile and User id (#217)

* Change user serializer to show profile id * Change profile page to use profile id not user id * Bump version
HackerSchool · May 30, 2022 · 2610cb7 · 2610cb7
1 parent 9739b68
commit 2610cb7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/backend/api/serializer.py b/backend/api/serializer.py
@@ -14,11 +14,14 @@ class UserSerializer(serializers.ModelSerializer):
 	username = serializers.ReadOnlyField()
 	mod = serializers.BooleanField(source="is_staff")
 	admin = serializers.BooleanField(source="is_superuser")
+	profile = serializers.IntegerField(source='profile.id')
 
 	class Meta:
 		model = User
-		fields = ("id", "username", "email", "mod", "admin")
+		fields = ("id", "profile", "username", "email", "mod", "admin")
 
+	def get_profile(self):
+		profile = Profile.objects.get(user=self.id)
 
 class XPEventSerializer(serializers.ModelSerializer):
 	class Meta:

diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "frontend",
-	"version": "1.0.0",
+	"version": "1.0.1",
 	"private": true,
 	"scripts": {
 		"start": "react-scripts start",

diff --git a/frontend/src/pages/ProfilePage.js b/frontend/src/pages/ProfilePage.js
@@ -27,8 +27,8 @@ const ProfilePage = () => {
 
 	useEffect(() => {
 		getUser((res1) => {
-			getProfile(res1.data.id, (res2) => {
-				getXpEvents(res1.data.id, (res3) => {
+			getProfile(res1.data.profile, (res2) => {
+				getXpEvents(res1.data.profile, (res3) => {
 					setXpEvents(res3.data);
 					setLoading(false);
 				});