org_text adjustments

backend/entities/models.py

@@ -43,6 +43,9 @@ class Organization(models.Model):
     status_updated = models.DateTimeField(auto_now=True, null=True)
     acceptance_date = models.DateTimeField(null=True, blank=True)
     deletion_date = models.DateTimeField(null=True, blank=True)
+    org_text = models.ForeignKey(
+        "OrganizationText", on_delete=models.CASCADE, null=True, blank=True
+    )
 
     def __str__(self) -> str:
         return self.name
@@ -211,7 +214,7 @@ def __str__(self) -> str:
 
 class OrganizationText(models.Model):
     org_id = models.ForeignKey(Organization, on_delete=models.CASCADE)
-    iso = models.ForeignKey("content.IsoCodeMap", on_delete=models.CASCADE)
+    iso = models.ForeignKey("content.IsoCodeMap", on_delete=models.CASCADE, null=True)
     primary = models.BooleanField(default=False)
     description = models.TextField(max_length=2500)
     get_involved = models.TextField(max_length=500, blank=True)

backend/entities/serializers.py

@@ -2,6 +2,8 @@
 Serializers for the entities app.
 """
 
+from typing import Any
+
 from rest_framework import serializers
 
 from .models import (
@@ -41,7 +43,8 @@ class Meta:
 
 
 class OrganizationSerializer(serializers.ModelSerializer[Organization]):
-    organization_text = OrganizationTextSerializer(read_only=True)
+    org_text = OrganizationTextSerializer(read_only=True)
+    description = serializers.CharField(write_only=True, required=False)
 
     class Meta:
         model = Organization
@@ -50,6 +53,7 @@ class Meta:
             "social_links": {"required": False},
             "status_updated": {"read_only": True},
             "acceptance_date": {"read_only": True},
+            "description": {"write_only": True},
         }
         fields = [
             "id",
@@ -63,9 +67,20 @@ class Meta:
             "status",
             "status_updated",
             "acceptance_date",
-            "organization_text",
+            "org_text",
+            "description",
         ]
 
+    def create(self, validated_data: dict[str, Any]) -> Organization:
+        description = validated_data.pop("description", None)
+        org = Organization.objects.create(**validated_data)
+        if org and description:
+            org_text = OrganizationText.objects.create(
+                org_id=org, description=description
+            )
+            org.org_text = org_text
+        return org
+
 
 class StatusSerializer(serializers.ModelSerializer[Status]):
     class Meta:

frontend/package.json

@@ -69,6 +69,7 @@
     "uuid": "^9.0.1",
     "v-calendar": "^3.1.1",
     "vue-socials": "^2.0.5",
+    "vue-sonner": "^1.1.3",
     "vuedraggable": "~4.1.0",
     "wait-on": "^7.2.0",
     "zxcvbn": "^4.4.2"

frontend/pages/organizations/create.vue

@@ -1,4 +1,5 @@
 <template>
+  <Toaster :theme="$colorMode.value === 'dark' ? 'dark' : 'light'" />
   <div class="w-full text-light-text dark:text-dark-text">
     <IndicatorProcessProgress
       type="default"
@@ -99,6 +100,7 @@
                 class="link-text"
                 >{{ $t("pages._global.terms-of-service-pt-2") }}</NuxtLink
               >
+
               <p>.</p>
             </label>
           </div>
@@ -119,6 +121,8 @@
 </template>
 
 <script setup lang="ts">
+import { Toaster, toast } from "vue-sonner";
+import BtnAction from "~/components/btn/action/BtnAction.vue";
 import type { OrganizationCreateFormData } from "~/types/entities/organization";
 
 definePageMeta({
@@ -143,8 +147,7 @@ const submit = async () => {
   if (responseID) {
     navigateTo(localePath(`/organizations/${responseID}`));
   } else {
-    // TODO: Push notification with toast should be added here.
-    false;
+    toast.error("Something went wrong. Please try again later.");
   }
 };
 </script>

frontend/stores/organization.ts

@@ -59,6 +59,7 @@ export const useOrganizationStore = defineStore("organization", {
             tagline: formData.tagline,
             social_accounts: formData.social_accounts,
             created_by: "cdfecc96-2dd5-435b-baba-a7610afee70e",
+            description: formData.description,
             topics: formData.topics,
             high_risk: false,
             total_flags: 0,
@@ -72,24 +73,7 @@ export const useOrganizationStore = defineStore("organization", {
 
       const responseOrgData = responseOrg.data.value as unknown as Organization;
 
-      const responseOrgText = await useFetch(
-        `${BASE_BACKEND_URL}/entities/organization_texts/`,
-        {
-          method: "POST",
-          body: JSON.stringify({
-            org_id: responseOrgData.id,
-            iso: 1,
-            description: formData.description,
-            get_involved: "",
-            donate_prompt: "",
-          }),
-          headers: {
-            Authorization: `Token ${token}`,
-          },
-        }
-      );
-
-      if (responseOrg && responseOrgText) {
+      if (responseOrg) {
         this.loading = false;
 
         return responseOrgData.id;