Simplify DB object management with Django CRUD helpers
parent
8f705e2f25
commit
c685b6d25f
GPG Key ID:
5ACFCEED46C0904F
@ -1,21 +0,0 @@
|
||||
{% include 'partials/notify.html' %}
|
||||
<h1 class="title is-4">List of accounts</h1>
|
||||
|
||||
<div class="buttons">
|
||||
<button
|
||||
hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
|
||||
hx-get="{% url 'account_action' type=type %}"
|
||||
hx-trigger="click"
|
||||
hx-target="#modals-here"
|
||||
class="button is-info">
|
||||
<span class="icon-text">
|
||||
<span class="icon">
|
||||
<i class="fa-solid fa-plus"></i>
|
||||
</span>
|
||||
<span>Account</span>
|
||||
</span>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{% include 'partials/account-list.html' %}
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
{% include 'partials/notify.html' %}
|
||||
|
||||
{% load crispy_forms_tags %}
|
||||
|
||||
{% load crispy_forms_bulma_field %}
|
||||
<form
|
||||
hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
|
||||
{% if account_id is not None %}
|
||||
hx-put="{% url 'account_action' type=type account_id=account_id %}"
|
||||
{% else %}
|
||||
hx-put="{% url 'account_action' type=type %}"
|
||||
{% endif %}
|
||||
hx-target="#accounts-table"
|
||||
hx-swap="outerHTML">
|
||||
{% csrf_token %}
|
||||
{{ form|crispy }}
|
||||
<button
|
||||
type="button"
|
||||
class="button is-light modal-close-button">
|
||||
Cancel
|
||||
</button>
|
||||
<button type="submit" class="button is-info modal-close-button">Submit</button>
|
||||
</form>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
{% include 'partials/notify.html' %}
|
||||
|
||||
{% load crispy_forms_tags %}
|
||||
|
||||
{% load crispy_forms_bulma_field %}
|
||||
<form
|
||||
hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
|
||||
{% if strategy_id is not None %}
|
||||
hx-put="{% url 'strategies_action' type=type strategy_id=strategy_id %}"
|
||||
{% else %}
|
||||
hx-put="{% url 'strategies_action' type=type %}"
|
||||
{% endif %}
|
||||
hx-target="#strategies-table"
|
||||
hx-swap="outerHTML">
|
||||
{% csrf_token %}
|
||||
{{ form|crispy }}
|
||||
<button
|
||||
type="button"
|
||||
class="button is-light modal-close-button">
|
||||
Cancel
|
||||
</button>
|
||||
<button type="submit" class="button is-info modal-close-button">Submit</button>
|
||||
</form>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
<h1 class="title is-5">Add or edit a trade</h1>
|
||||
<h1 class="subtitle">Updates will be posted to exchange!</h1>
|
||||
|
||||
{% include 'partials/notify.html' %}
|
||||
|
||||
{% load crispy_forms_tags %}
|
||||
|
||||
{% load crispy_forms_bulma_field %}
|
||||
<form
|
||||
hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
|
||||
{% if trade_id is not None %}
|
||||
hx-put="{% url 'trade_action' type=type trade_id=trade_id %}"
|
||||
{% else %}
|
||||
hx-put="{% url 'trade_action' type=type %}"
|
||||
{% endif %}
|
||||
hx-target="#trades-table"
|
||||
hx-swap="outerHTML">
|
||||
{% csrf_token %}
|
||||
{{ form|crispy }}
|
||||
<button
|
||||
type="button"
|
||||
class="button is-light modal-close-button">
|
||||
Cancel
|
||||
</button>
|
||||
<button type="submit" class="button is-info modal-close-button">Submit</button>
|
||||
</form>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
{% include 'partials/notify.html' %}
|
||||
<h1 class="title is-4">List of active URL endpoints for receiving hooks.</h1>
|
||||
<h1 class="subtitle">Add URLs here to receive Drakdoo callbacks. Make then unique!</h1>
|
||||
<h1 class="subtitle">Warning: hooks can only trade in one direction.</h1>
|
||||
|
||||
<div class="buttons">
|
||||
<button
|
||||
hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
|
||||
hx-get="{% url 'hook_action' type=type %}"
|
||||
hx-trigger="click"
|
||||
hx-target="#modals-here"
|
||||
class="button is-info">
|
||||
<span class="icon-text">
|
||||
<span class="icon">
|
||||
<i class="fa-solid fa-plus"></i>
|
||||
</span>
|
||||
<span>Hook</span>
|
||||
</span>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{% include 'partials/hook-list.html' %}
|
||||
|
||||
@ -0,0 +1,28 @@
|
||||
{% include 'partials/notify.html' %}
|
||||
{% if page_title is not None %}
|
||||
<h1 class="title is-4">{{ page_title }}</h1>
|
||||
{% endif %}
|
||||
{% if page_subtitle is not None %}
|
||||
<h1 class="subtitle">{{ page_subtitle }}</h1>
|
||||
{% endif %}
|
||||
|
||||
{% if submit_url is not None %}
|
||||
<div class="buttons">
|
||||
<button
|
||||
hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
|
||||
hx-get="{{ submit_url }}"
|
||||
hx-trigger="click"
|
||||
hx-target="#modals-here"
|
||||
class="button is-info">
|
||||
<span class="icon-text">
|
||||
<span class="icon">
|
||||
<i class="fa-solid fa-plus"></i>
|
||||
</span>
|
||||
<span>{{ title_singular }}</span>
|
||||
</span>
|
||||
</button>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% include list_template %}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<h1 class="title is-4">Live positions from all exchanges</h1>
|
||||
<h1 class="subtitle">Manual trades are editable under "Bot Trades" tab.</h1>
|
||||
<h1 class="title is-4"></h1>
|
||||
<h1 class="subtitle"></h1>
|
||||
|
||||
{% include 'partials/notify.html' %}
|
||||
|
||||
{% include 'partials/position-list.html' %}
|
||||
{% include 'partials/position-list.html' %}SSSSSSSSSSSSSSSSS
|
||||
@ -1,21 +0,0 @@
|
||||
{% include 'partials/notify.html' %}
|
||||
<h1 class="title is-4">List of strategies</h1>
|
||||
|
||||
<div class="buttons">
|
||||
<button
|
||||
hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
|
||||
hx-get="{% url 'strategies_action' type=type %}"
|
||||
hx-trigger="click"
|
||||
hx-target="#modals-here"
|
||||
class="button is-info">
|
||||
<span class="icon-text">
|
||||
<span class="icon">
|
||||
<i class="fa-solid fa-plus"></i>
|
||||
</span>
|
||||
<span>Strategy</span>
|
||||
</span>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{% include 'partials/strategy-list.html' %}
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
<div class="buttons">
|
||||
<button
|
||||
hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
|
||||
hx-get="{% url 'trade_action' type=type %}"
|
||||
hx-trigger="click"
|
||||
hx-target="#modals-here"
|
||||
class="button is-info">
|
||||
<span class="icon-text">
|
||||
<span class="icon">
|
||||
<i class="fa-solid fa-plus"></i>
|
||||
</span>
|
||||
<span>Trade</span>
|
||||
</span>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{% include 'partials/notify.html' %}
|
||||
|
||||
<h1 class="title is-4">List of bot and manual trades. This may not reflect actual live trades.</h1>
|
||||
<h1 class="subtitle">Trades deleted here will not be closed on the exchange.</h1>
|
||||
|
||||
{% include 'partials/trade-list.html' %}
|
||||
|
||||
@ -0,0 +1,203 @@
|
||||
import uuid
|
||||
|
||||
from django.http import Http404, HttpResponseBadRequest
|
||||
from django.urls import reverse
|
||||
from django.views.generic.detail import DetailView
|
||||
from django.views.generic.edit import CreateView, DeleteView, UpdateView
|
||||
from django.views.generic.list import ListView
|
||||
from rest_framework.parsers import FormParser
|
||||
|
||||
from core.util import logs
|
||||
|
||||
log = logs.get_logger(__name__)
|
||||
|
||||
|
||||
class ObjectList(ListView):
|
||||
allowed_types = ["modal", "widget", "window", "page"]
|
||||
window_content = "window-content/objects.html"
|
||||
list_template = None
|
||||
|
||||
model = None
|
||||
context_object_name = "objects"
|
||||
page_title = None
|
||||
page_subtitle = None
|
||||
|
||||
title = "Objects"
|
||||
title_singular = "Object"
|
||||
|
||||
submit_url_name = None
|
||||
|
||||
# copied from BaseListView
|
||||
def get(self, request, *args, **kwargs):
|
||||
self.object_list = self.get_queryset()
|
||||
allow_empty = self.get_allow_empty()
|
||||
|
||||
type = kwargs.get("type", None)
|
||||
if not type:
|
||||
return HttpResponseBadRequest("No type specified")
|
||||
if type not in self.allowed_types:
|
||||
return HttpResponseBadRequest("Invalid type specified")
|
||||
self.template_name = f"wm/{type}.html"
|
||||
unique = str(uuid.uuid4())[:8]
|
||||
if type == "page":
|
||||
type = "modal"
|
||||
|
||||
if not allow_empty:
|
||||
# When pagination is enabled and object_list is a queryset,
|
||||
# it's better to do a cheap query than to load the unpaginated
|
||||
# queryset in memory.
|
||||
if self.get_paginate_by(self.object_list) is not None and hasattr(
|
||||
self.object_list, "exists"
|
||||
):
|
||||
is_empty = not self.object_list.exists()
|
||||
else:
|
||||
is_empty = not self.object_list
|
||||
if is_empty:
|
||||
raise Http404("Empty list")
|
||||
submit_url = reverse(self.submit_url_name, kwargs={"type": type})
|
||||
context = self.get_context_data()
|
||||
context["title"] = self.title + f" ({type})"
|
||||
context["title_singular"] = self.title_singular
|
||||
context["unique"] = unique
|
||||
context["window_content"] = self.window_content
|
||||
context["list_template"] = self.list_template
|
||||
context["page_title"] = self.page_title
|
||||
context["page_subtitle"] = self.page_subtitle
|
||||
context["type"] = type
|
||||
context["submit_url"] = submit_url
|
||||
return self.render_to_response(context)
|
||||
|
||||
|
||||
class ObjectCreate(CreateView):
|
||||
allowed_types = ["modal", "widget", "window", "page"]
|
||||
window_content = "window-content/object-form.html"
|
||||
parser_classes = [FormParser]
|
||||
|
||||
model = None
|
||||
context_object_name = "objects"
|
||||
submit_url_name = None
|
||||
|
||||
request = None
|
||||
|
||||
def form_valid(self, form):
|
||||
obj = form.save(commit=False)
|
||||
if self.request is None:
|
||||
raise Exception("Request is None")
|
||||
obj.user = self.request.user
|
||||
obj.save()
|
||||
form.save_m2m()
|
||||
context = {"message": "Object created", "class": "success"}
|
||||
return self.render_to_response(context)
|
||||
|
||||
def get(self, request, *args, **kwargs):
|
||||
self.request = request
|
||||
type = kwargs.get("type", None)
|
||||
if not type:
|
||||
return HttpResponseBadRequest("No type specified")
|
||||
if type not in self.allowed_types:
|
||||
return HttpResponseBadRequest("Invalid type specified")
|
||||
self.template_name = f"wm/{type}.html"
|
||||
unique = str(uuid.uuid4())[:8]
|
||||
if type == "page":
|
||||
type = "modal"
|
||||
|
||||
self.object = None
|
||||
submit_url = reverse(self.submit_url_name, kwargs={"type": type})
|
||||
context = self.get_context_data()
|
||||
context["unique"] = unique
|
||||
context["window_content"] = self.window_content
|
||||
context["context_object_name"] = self.context_object_name
|
||||
context["submit_url"] = submit_url
|
||||
context["type"] = type
|
||||
return self.render_to_response(context)
|
||||
|
||||
def post(self, request, *args, **kwargs):
|
||||
self.request = request
|
||||
self.template_name = "partials/notify.html"
|
||||
return super().post(request, *args, **kwargs)
|
||||
|
||||
|
||||
class ObjectRead(DetailView):
|
||||
allowed_types = ["modal", "widget", "window", "page"]
|
||||
window_content = "window-content/object.html"
|
||||
|
||||
model = None
|
||||
context_object_name = "object"
|
||||
|
||||
|
||||
class ObjectUpdate(UpdateView):
|
||||
allowed_types = ["modal", "widget", "window", "page"]
|
||||
window_content = "window-content/object-form.html"
|
||||
parser_classes = [FormParser]
|
||||
|
||||
model = None
|
||||
context_object_name = "objects"
|
||||
submit_url_name = None
|
||||
|
||||
request = None
|
||||
|
||||
def form_valid(self, form):
|
||||
obj = form.save(commit=False)
|
||||
if self.request is None:
|
||||
raise Exception("Request is None")
|
||||
obj.save()
|
||||
form.save_m2m()
|
||||
context = {"message": "Object updated", "class": "success"}
|
||||
return self.render_to_response(context)
|
||||
|
||||
def get(self, request, *args, **kwargs):
|
||||
self.request = request
|
||||
type = kwargs.get("type", None)
|
||||
pk = kwargs.get("pk", None)
|
||||
if not type:
|
||||
return HttpResponseBadRequest("No type specified")
|
||||
if not pk:
|
||||
return HttpResponseBadRequest("No pk specified")
|
||||
if type not in self.allowed_types:
|
||||
return HttpResponseBadRequest("Invalid type specified")
|
||||
self.template_name = f"wm/{type}.html"
|
||||
unique = str(uuid.uuid4())[:8]
|
||||
if type == "page":
|
||||
type = "modal"
|
||||
|
||||
self.object = self.get_object()
|
||||
submit_url = reverse(self.submit_url_name, kwargs={"type": type, "pk": pk})
|
||||
context = self.get_context_data()
|
||||
context["unique"] = unique
|
||||
context["window_content"] = self.window_content
|
||||
context["context_object_name"] = self.context_object_name
|
||||
context["submit_url"] = submit_url
|
||||
context["type"] = type
|
||||
return self.render_to_response(context)
|
||||
|
||||
def post(self, request, *args, **kwargs):
|
||||
self.request = request
|
||||
self.template_name = "partials/notify.html"
|
||||
return super().post(request, *args, **kwargs)
|
||||
|
||||
|
||||
class ObjectDelete(DeleteView):
|
||||
model = None
|
||||
template_name = "partials/notify.html"
|
||||
|
||||
# Overriden to prevent success URL from being used
|
||||
def delete(self, request, *args, **kwargs):
|
||||
"""
|
||||
Call the delete() method on the fetched object and then redirect to the
|
||||
success URL.
|
||||
"""
|
||||
self.object = self.get_object()
|
||||
# success_url = self.get_success_url()
|
||||
self.object.delete()
|
||||
context = {"message": "Object deleted", "class": "success"}
|
||||
return self.render_to_response(context)
|
||||
|
||||
# This will be used in newer Django versions, until then we get a warning
|
||||
def form_valid(self, form):
|
||||
"""
|
||||
Call the delete() method on the fetched object.
|
||||
"""
|
||||
self.object = self.get_object()
|
||||
self.object.delete()
|
||||
context = {"message": "Object deleted", "class": "success"}
|
||||
return self.render_to_response(context)
|
||||
@ -1,187 +1,40 @@
|
||||
import uuid
|
||||
|
||||
from django.contrib.auth.mixins import LoginRequiredMixin
|
||||
from django.http import HttpResponseBadRequest
|
||||
from django.shortcuts import render
|
||||
from django.views import View
|
||||
from rest_framework.parsers import FormParser
|
||||
from rest_framework.views import APIView
|
||||
|
||||
from core.forms import TradeForm
|
||||
from core.models import Account, Trade
|
||||
from core.models import Trade
|
||||
from core.util import logs
|
||||
from core.views import ObjectCreate, ObjectDelete, ObjectList, ObjectUpdate
|
||||
|
||||
log = logs.get_logger(__name__)
|
||||
|
||||
|
||||
def get_trades(user, account=None):
|
||||
if user:
|
||||
trades = Trade.objects.filter(account__user=user)
|
||||
elif account:
|
||||
trades = Trade.objects.filter(account=account, account__user=user)
|
||||
return trades
|
||||
|
||||
|
||||
class Trades(LoginRequiredMixin, View):
|
||||
allowed_types = ["modal", "widget", "window", "page"]
|
||||
window_content = "window-content/trades.html"
|
||||
|
||||
async def get(self, request, type, account_id=None):
|
||||
if type not in self.allowed_types:
|
||||
return HttpResponseBadRequest
|
||||
template_name = f"wm/{type}.html"
|
||||
unique = str(uuid.uuid4())[:8]
|
||||
if account_id:
|
||||
try:
|
||||
trades = Account.objects.get(id=account_id, user=request.user)
|
||||
except Account.DoesNotExist:
|
||||
message = "Account does not exist."
|
||||
message_class = "danger"
|
||||
context = {
|
||||
"message": message,
|
||||
"class": message_class,
|
||||
"type": type,
|
||||
}
|
||||
return render(request, template_name, context)
|
||||
trades = get_trades(request.user, account_id)
|
||||
else:
|
||||
trades = get_trades(request.user)
|
||||
if type == "page":
|
||||
type = "modal"
|
||||
context = {
|
||||
"title": f"Trades ({type})",
|
||||
"unique": unique,
|
||||
"window_content": self.window_content,
|
||||
"items": trades,
|
||||
"type": type,
|
||||
}
|
||||
return render(request, template_name, context)
|
||||
|
||||
|
||||
class TradeAction(LoginRequiredMixin, APIView):
|
||||
allowed_types = ["modal", "widget", "window", "page"]
|
||||
window_content = "window-content/add-trade.html"
|
||||
parser_classes = [FormParser]
|
||||
|
||||
def get(self, request, type, trade_id=None):
|
||||
"""
|
||||
Get the form for adding or editing a trade.
|
||||
:param trade_id: The id of the trade to edit. Optional.
|
||||
"""
|
||||
if type not in self.allowed_types:
|
||||
return HttpResponseBadRequest
|
||||
template_name = f"wm/{type}.html"
|
||||
unique = str(uuid.uuid4())[:8]
|
||||
if trade_id:
|
||||
try:
|
||||
trade = Trade.objects.get(id=trade_id, account__user=request.user)
|
||||
form = TradeForm(instance=trade)
|
||||
except Trade.DoesNotExist:
|
||||
message = "Trade does not exist"
|
||||
message_class = "danger"
|
||||
context = {
|
||||
"message": message,
|
||||
"message_class": message_class,
|
||||
"window_content": self.window_content,
|
||||
}
|
||||
return render(request, template_name, context)
|
||||
else:
|
||||
form = TradeForm()
|
||||
if type == "page":
|
||||
type = "modal"
|
||||
context = {
|
||||
"form": form,
|
||||
"trade_id": trade_id,
|
||||
"type": type,
|
||||
"unique": unique,
|
||||
"window_content": self.window_content,
|
||||
}
|
||||
|
||||
return render(request, template_name, context)
|
||||
|
||||
def put(self, request, type, trade_id=None):
|
||||
"""
|
||||
Add or edit a trade.
|
||||
:param trade_id: The id of the trade to edit. Optional.
|
||||
"""
|
||||
if type not in self.allowed_types:
|
||||
return HttpResponseBadRequest
|
||||
message = None
|
||||
message_class = "success"
|
||||
class TradeList(LoginRequiredMixin, ObjectList):
|
||||
list_template = "partials/trade-list.html"
|
||||
model = Trade
|
||||
context_object_name = "trades"
|
||||
title = "Trades"
|
||||
title_singular = "Trade"
|
||||
page_title = (
|
||||
"List of bot and manual trades. This may not reflect actual live trades."
|
||||
)
|
||||
page_subtitle = "Trades deleted here will not be closed on the exchange."
|
||||
|
||||
if trade_id:
|
||||
try:
|
||||
form = TradeForm(
|
||||
request.data,
|
||||
instance=Trade.objects.get(id=trade_id, account__user=request.user),
|
||||
)
|
||||
except Trade.DoesNotExist:
|
||||
message = "Trade does not exist"
|
||||
message_class = "danger"
|
||||
context = {
|
||||
"message": message,
|
||||
"class": message_class,
|
||||
}
|
||||
return render(request, self.template_name, context)
|
||||
else:
|
||||
form = TradeForm(request.data)
|
||||
if form.is_valid():
|
||||
trade = form.save(commit=False)
|
||||
print("PRESAVE TRADE", trade)
|
||||
trade.user = request.user
|
||||
trade.save()
|
||||
success, returned = trade.post()
|
||||
if success:
|
||||
print("SAVED TRADE", trade)
|
||||
if trade_id:
|
||||
message = f"Trade {trade_id} edited successfully"
|
||||
else:
|
||||
message = f"Trade {trade.id} added successfully"
|
||||
else:
|
||||
message = f"Error adding trade: {returned}"
|
||||
message_class = "danger"
|
||||
else:
|
||||
message = "Error adding trade"
|
||||
message_class = "danger"
|
||||
submit_url_name = "trade_create"
|
||||
|
||||
trades = get_trades(request.user)
|
||||
|
||||
context = {
|
||||
"items": trades,
|
||||
"type": type,
|
||||
}
|
||||
if message:
|
||||
context["message"] = message
|
||||
context["class"] = message_class
|
||||
template_name = "partials/trade-list.html"
|
||||
return render(request, template_name, context)
|
||||
class TradeCreate(LoginRequiredMixin, ObjectCreate):
|
||||
model = Trade
|
||||
form_class = TradeForm
|
||||
context_object_name = "trades"
|
||||
submit_url_name = "trade_create"
|
||||
|
||||
def delete(self, request, type, trade_id):
|
||||
"""
|
||||
Delete a trade.
|
||||
:param trade_id: The id of the trade to delete.
|
||||
"""
|
||||
if type not in self.allowed_types:
|
||||
return HttpResponseBadRequest
|
||||
message = None
|
||||
message_class = "success"
|
||||
try:
|
||||
trade = Trade.objects.get(id=trade_id, account__user=request.user)
|
||||
trade.delete()
|
||||
message = "Trade deleted successfully"
|
||||
except Trade.DoesNotExist:
|
||||
message = "Error deleting trade"
|
||||
message_class = "danger"
|
||||
|
||||
trades = get_trades(request.user)
|
||||
class TradeUpdate(LoginRequiredMixin, ObjectUpdate):
|
||||
model = Trade
|
||||
form_class = TradeForm
|
||||
context_object_name = "trades"
|
||||
submit_url_name = "trade_update"
|
||||
|
||||
context = {
|
||||
"items": trades,
|
||||
"type": type,
|
||||
}
|
||||
if message:
|
||||
context["message"] = message
|
||||
context["class"] = message_class
|
||||
|
||||
template_name = "partials/trade-list.html"
|
||||
return render(request, template_name, context)
|
||||
class TradeDelete(LoginRequiredMixin, ObjectDelete):
|
||||
model = Trade
|
||||
|
||||
Loading…
Reference in New Issue