Fakultas Ilmu Komputer UI
Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
PMPL
Class Project
Kape
Commits
50683bdb
Commit
50683bdb
authored
Dec 06, 2019
by
REGENSA ANNAAFII TJAHJANTO
Browse files
1606875926 226 feature sort vacancies by close_time
parent
ff683634
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
core/migrations/0002_student_ielts.py
View file @
50683bdb
# Generated by Django 2.2.8 on 2019-12-0
5 15:09
# Generated by Django 2.2.8 on 2019-12-0
6 03:44
from
django.db
import
migrations
,
models
...
...
core/tests/test_vacancies.py
View file @
50683bdb
...
...
@@ -285,6 +285,51 @@ class VacancyTest(APITestCase):
VacancySerializer
(
Vacancy
.
objects
.
order_by
(
'-created'
),
many
=
True
,
context
=
{
'request'
:
request
}).
data
)
def
test_sort_vacancies_by_close_time
(
self
):
superuser
=
User
.
objects
.
create_superuser
(
'dummy.company'
,
'dummy.company@company.com'
,
'lalala123'
)
self
.
client
.
force_authenticate
(
user
=
superuser
)
new_user
=
User
.
objects
.
create_user
(
'dummy.company3'
,
'dummy.company3@company.com'
,
'lalala123'
)
new_company
=
Company
.
objects
.
create
(
user
=
new_user
,
description
=
"lalala"
,
status
=
Company
.
VERIFIED
,
logo
=
None
,
address
=
None
)
open_time
=
datetime
(
2019
,
12
,
7
)
close_time1
=
datetime
(
2019
,
12
,
20
)
close_time2
=
datetime
(
2020
,
2
,
22
)
close_time3
=
datetime
(
2020
,
2
,
21
)
created_time
=
datetime
(
2019
,
12
,
6
)
v1
=
Vacancy
.
objects
.
create
(
company
=
new_company
,
verified
=
True
,
open_time
=
open_time
,
salary
=
3000000
,
description
=
''
,
close_time
=
close_time1
,
name
=
'vacancy1'
,
max_accepted_applicants
=
3
,
working_period
=
"3 Bulan"
,
created
=
created_time
)
v1
.
save
()
v2
=
Vacancy
.
objects
.
create
(
company
=
new_company
,
verified
=
True
,
open_time
=
open_time
,
salary
=
3500000
,
description
=
''
,
close_time
=
close_time2
,
name
=
'vacancy2'
,
max_accepted_applicants
=
3
,
working_period
=
"3 Bulan"
,
created
=
created_time
)
v2
.
save
()
v3
=
Vacancy
.
objects
.
create
(
company
=
new_company
,
verified
=
True
,
open_time
=
open_time
,
salary
=
3500000
,
description
=
''
,
close_time
=
close_time3
,
name
=
'vacancy2'
,
max_accepted_applicants
=
3
,
working_period
=
"3 Bulan"
,
created
=
created_time
)
v3
.
save
()
factory
=
APIRequestFactory
()
url_close_time_asc
=
'/api/vacancies/?sort=close_time&order=ascending'
request
=
factory
.
get
(
url_close_time_asc
)
response
=
self
.
client
.
get
(
url_close_time_asc
,
format
=
'json'
)
self
.
assertEqual
(
dict
(
response
.
data
)[
'results'
],
VacancySerializer
(
Vacancy
.
objects
.
order_by
(
'close_time'
),
many
=
True
,
context
=
{
'request'
:
request
}).
data
)
url_close_time_desc
=
'/api/vacancies/?sort=close_time&order=descending'
request
=
factory
.
get
(
url_close_time_desc
)
response
=
self
.
client
.
get
(
url_close_time_desc
,
format
=
'json'
)
self
.
assertEqual
(
dict
(
response
.
data
)[
'results'
],
VacancySerializer
(
Vacancy
.
objects
.
order_by
(
'-close_time'
),
many
=
True
,
context
=
{
'request'
:
request
}).
data
)
def
test_fail_on_unverified_user_vacancy_list
(
self
):
url
=
'/api/vacancies/'
response
=
self
.
client
.
post
(
url
,
format
=
'json'
)
...
...
core/views/vacancies.py
View file @
50683bdb
...
...
@@ -101,7 +101,7 @@ class VacancyViewSet(MultiSerializerViewSetMixin, viewsets.ModelViewSet):
return
vacancies
def
sort
(
self
,
order_by
,
vacancies
,
order
):
if
(
order_by
is
not
None
)
and
(
order_by
in
[
views_constants
.
NAME
,
views_constants
.
SALARY
,
views_constants
.
MOST_RECENT
])
and
(
if
(
order_by
is
not
None
)
and
(
order_by
in
[
views_constants
.
NAME
,
views_constants
.
SALARY
,
views_constants
.
MOST_RECENT
,
views_constants
.
CLOSE_TIME
])
and
(
order
in
[
views_constants
.
ORDER_ASCENDING
,
views_constants
.
ORDER_DESCENDING
]):
if
order_by
==
views_constants
.
MOST_RECENT
:
return
vacancies
.
order_by
(
'-created'
)
...
...
package-lock.json
deleted
100755 → 0
View file @
ff683634
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment