For #26 change name excpetion for more specific

src/contacts/exceptions.py

@@ -24,17 +24,9 @@ class JobError(Exception):
     pass
 
 
-class FailedNewsSubscription(Exception):
+class HtmxFailureError(Exception):
     """
-    get triggered if subscription to news letter failed
-    """
-
-    pass
-
-
-class UnsubcribeFail(Exception):
-    """
-    get triggered if subscription to news letter failed
+    get triggered if request is not htmx
     """
 
     pass

src/contacts/tests/test_view.py

@@ -4,7 +4,7 @@
 from django.utils.translation import gettext_lazy as _
 
 from src.accounts.tests.factories import UserFactory
-from src.contacts.exceptions import FailedNewsSubscription, UnsubcribeFail
+from src.contacts.exceptions import HtmxFailureError
 from src.profiles.models import Profile
 from src.profiles.tests.factories.profile_factory import ProfileFactory
 
@@ -36,7 +36,7 @@ def test_failed_subscription_news(self):
         profile = user.profile
         self.client.force_login(user)
         url = reverse("contacts:subscribe")
-        with self.assertRaises(FailedNewsSubscription) as e:
+        with self.assertRaises(HtmxFailureError) as e:
             self.client.post(url)  # noqa
 
         profile.refresh_from_db()
@@ -54,7 +54,7 @@ def test_ok_unsubscribe(self):
         url = reverse("contacts:end_news", kwargs={"uuid": profile.uuid})
         resp = self.client.post(url, **headers)
         profile.refresh_from_db()
-        print(resp.items())
+
         self.assertEqual(resp.status_code, 200)
         self.assertIsNotNone(resp.headers["HX-Redirect"])
         self.assertFalse(profile.want_news)
@@ -66,9 +66,9 @@ def test_failed_unsubscribe_no_htmx(self):
         """
         profile = ProfileFactory(want_news=True)
         url = reverse("contacts:end_news", kwargs={"uuid": profile.uuid})
-        with self.assertRaises(UnsubcribeFail) as e:
-            self.client.post(url)  # noqa
 
+        with self.assertRaises(HtmxFailureError) as e:
+            self.client.post(url)  # noqa
         self.assertTrue(profile.want_news)
         self.assertEqual(
             str(e.exception), (_("Something went wrong.Can't unsubscribe."))

src/contacts/views.py

@@ -7,7 +7,7 @@
 
 from src.profiles.models import Profile
 
-from .exceptions import FailedNewsSubscription, UnsubcribeFail
+from .exceptions import HtmxFailureError
 
 
 class Subscribe(LRM, View):
@@ -38,7 +38,7 @@ def post(self, request, **kwargs):
                 headers={"HX-Redirect": "/"},
             )
         elif htmx_req is None:
-            raise FailedNewsSubscription(_("Subscription failed"))
+            raise HtmxFailureError(_("Subscription failed"))
 
 
 class UnSubscribe(View):
@@ -68,4 +68,4 @@ def post(self, request, **kwargs):
                 },
             )
         elif htmx_req is None:
-            raise UnsubcribeFail(_("Something went wrong.Can't unsubscribe."))
+            raise HtmxFailureError(_("Something went wrong.Can't unsubscribe."))

src/profiles/exceptions.py

@@ -4,3 +4,11 @@ class ProfileException(Exception):
     """
 
     pass
+
+
+class NoAjaxError(Exception):
+    """
+    get triggered if request is not ajax
+    """
+
+    pass

src/profiles/views.py

@@ -2,8 +2,10 @@
 from django.contrib.auth.mixins import LoginRequiredMixin as LRM
 from django.http import JsonResponse
 from django.shortcuts import get_object_or_404, redirect, render
+from django.utils.translation import gettext_lazy as _
 from django.views.generic import View
 
+from .exceptions import NoAjaxError
 from .forms import ProfileForm
 from .models import Profile
 
@@ -17,28 +19,27 @@ def get(self, request, **kwargs):
         return render(request, "profiles/profile_detail.html", ctx)
 
     def post(self, request, **kwargs):
-        # htmx_based
+        # ajax request
+        # request.headers.get("x-requested_with") == "XMLHttpRequest")
         # bug TODO: if user (avatar +) by chance click on upload without attached file
         # user contradicts themselves problem;
-        try:
+        ajax = request.headers.get("x-requested_with")
+        if ajax == "XMLHttpRequest":
             uuid = kwargs.get("uuid")
             profile = get_object_or_404(Profile, uuid=uuid)
             form = ProfileForm(request.POST, request.FILES, profile)
-            # if request.headers.get("x-requested_with") == "XMLHttpRequest":
-            #     print("got an ajax")
-
             if form.is_valid():
                 ava_img = form.cleaned_data.get("avatar")
                 if ava_img:
                     profile.avatar = ava_img
                 else:
                     profile.avatar = None
                 profile.save()
-                return JsonResponse({"status_code": 200, "resp": "upload success"})
+                return JsonResponse({"status_code": 200, "resp": "OK"})
             else:
                 return JsonResponse({"status_code": 404, "err": form.errors})
-        except Exception as e:
-            print("exeption", e)
+        else:
+            raise NoAjaxError(_("Something went wrong"))
 
 
 class ProfileDelete(LRM, View):

src/static/js/sendAvaForm.js

@@ -1,34 +1,31 @@
 const sendAvaUpdate = function(url,avatar) {
-    let log = console.log;
-    const fd = new FormData();
+  const fd = new FormData();
     fd.append("csrfmiddlewaretoken",getCookie("csrftoken"));
     fd.append('avatar',avatar)
     fetch(url,{
       method:"POST",
-      body:fd
+      body:fd,
+      headers:{"X-Requested-With": "XMLHttpRequest"},
       }).then((resp)=>resp.json())
         .then((data)=>{
-        log(data);
-        if(data.status_code ===200){
-              log("data",data.resp);
-              log("reloading")
-              window.location.reload();
+          if(data.status_code ===200){
+            setTimeout(
+              window.location.reload(),3000
+            )
           }
           else if(data.status_code ===404){
-            log("code 404; upload failed")
             jsErr.classList.remove("visually-hidden");
             jsErr.textContent = "Failed upload avatar";
             data.err.avatar.forEach((err)=>{
               let div = document.createElement("div")
               div.classList.add("errorlist");
-              print("div is ",div)
               div.innerHTML = `${err}`;
               errDiv.appendChild(div)
             });
              throw new Error(message="Custom error: upload failed");
             }
         })
         .catch((err)=>{
-          log(err["message"]);
+          console.log(err["message"]);
   })
 }

src/static/js/utils.js

@@ -53,7 +53,7 @@ let helpUtil =  (url,name)=>{
 
   let arr = url.split(",")
   let mime = arr[0].match(/:(.*?);/)[1]
-  log("initial mime is ",mime,"check below ...")
+  console.log("initial mime is ",mime,"check below ...")
   let dataStr = arr.at(-1)
   // let dataStr = arr[1]
   let bstr = atob(dataStr);
@@ -63,7 +63,7 @@ let helpUtil =  (url,name)=>{
       u8arr[lenData]= bstr.charCodeAt(lenData);
   }
   const file = new File([u8arr],name,{type:mime})
-  log("final file ext is ",mime)
+  console.log("final file ext is ",mime)
   // console.log("w,h do not exist")
   return file;
 }

src/templates/contacts/emails/letter.html

@@ -12,15 +12,13 @@ <h3>Greetings from MedSandbox</h3>
       <p>Here is a link to read a new article:
         {% if posts %}
           {% for post in posts %}
-            <a href="#">Post title: {{post.title}}</a>
-    {% comment %}
-    <a href="{{domain}}{% url 'posts:post_detail' letter.post.slug %}">Some post</a></p>
-    {% endcomment %}
-          {% endfor%}
-          {% else %}
-          <p>No posts</p>
-         {% endif %}
+      <a href="{{domain}}{% url 'posts:post_detail' letter.post.slug %}">{{post.title}}</a>
+    </p>
+      {% endfor%}
+      {% else %}
+      <p>No posts</p>
       {% endif %}
+    {% endif %}
       <p>Best regards,</p>
       <p>Admin</p>
       <hr>