Skip to content

Commit

Permalink
fix: Update feedback API
Browse files Browse the repository at this point in the history
  • Loading branch information
idabblewith committed Jan 15, 2024
1 parent 33f63fc commit a465bd3
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 19 deletions.
32 changes: 16 additions & 16 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
name: Docker Image CI for GHCR
'on': push

on:
push:
tags:
- '*'

jobs:
build_and_publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Checkout code
uses: actions/checkout@v3

- name: Extract version from push command
id: extract_version
run: echo "::set-output name=version::$(echo ${GITHUB_REF#refs/tags/})"
- name: Set up Docker
run: docker login --username idabblewith --password ${{ secrets.GH_PAT }} ghcr.io

- name: Check if version is provided
id: check_version
run: echo "::set-output name=version_provided::$(test -n "${{ steps.extract_version.outputs.version }}")"
- name: Get the tag name
id: tag
run: echo "::set-output name=TAG_NAME::${GITHUB_REF#refs/tags/}"

- name: Build and Push Image
if: steps.check_version.outputs.version_provided == 'true'
run: |
docker login --username idabblewith --password ${{ secrets.GH_PAT }} ghcr.io
docker buildx create --use
docker buildx build . --tag ghcr.io/dbca-wa/science-projects-service:${{ steps.extract_version.outputs.version }} --push
docker tag ghcr.io/dbca-wa/science-projects-service:${{ steps.extract_version.outputs.version }} ghcr.io/dbca-wa/science-projects-service:latest
docker build . --tag ghcr.io/dbca-wa/science-projects-service:${{ steps.tag.outputs.TAG_NAME }}
docker push ghcr.io/dbca-wa/science-projects-service:${{ steps.tag.outputs.TAG_NAME }}
docker tag ghcr.io/dbca-wa/science-projects-service:${{ steps.tag.outputs.TAG_NAME }} ghcr.io/dbca-wa/science-projects-service:latest
docker push ghcr.io/dbca-wa/science-projects-service:latest
Empty file added git
Empty file.
9 changes: 9 additions & 0 deletions tasks/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,15 @@ class Meta:
fields = "__all__"



class UserFeedbackCreationSerializer(ModelSerializer):

class Meta:
model = UserFeedback
fields = "__all__"



class TaskSerializer(ModelSerializer):
class Meta:
model = Task
Expand Down
22 changes: 19 additions & 3 deletions tasks/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
)
from django.db import transaction
from .models import Task, UserFeedback
from .serializers import TaskSerializer, TinyTaskSerializer, UserFeedbackSerializer
from .serializers import TaskSerializer, TinyTaskSerializer, UserFeedbackCreationSerializer, UserFeedbackSerializer
from rest_framework.response import Response
from rest_framework.views import APIView
from django.conf import settings
Expand Down Expand Up @@ -70,18 +70,34 @@ def get(self, req):
)

def post(self, req):
# print(req.data)
ser = UserFeedbackSerializer(
print(req.data)
# text = req.data['text']
# kind = req.data['kind']
# status = req.data['status']
# user = req.user

# data_object = {
# "user": user,
# "text": text,
# "kind": kind,
# "status": status,
# }


ser = UserFeedbackCreationSerializer(
data=req.data,
)
if ser.is_valid():
print("feedback ser valid")
feedback = ser.save()
return Response(
UserFeedbackSerializer(feedback).data,
status=HTTP_201_CREATED,
)
else:
print("feedback ser NOT VALID", ser.errors)
return Response(
ser.errors,
HTTP_400_BAD_REQUEST,
)

Expand Down

0 comments on commit a465bd3

Please sign in to comment.