From 138182ad1d10db401b3fb7f2818fb0e85854a71c Mon Sep 17 00:00:00 2001
From: Hironsan <hiroki.nakayama.py@gmail.com>
Date: Mon, 11 Jun 2018 11:15:48 +0900
Subject: [PATCH] Rename model

---
 doccano/app/db.sqlite3       | Bin 184320 -> 184320 bytes
 doccano/app/server/admin.py  |   4 ++--
 doccano/app/server/models.py |   4 ++--
 doccano/app/server/tests.py  |   6 +++---
 doccano/app/server/views.py  |  14 +++++++-------
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/doccano/app/db.sqlite3 b/doccano/app/db.sqlite3
index 399e96ee3c42f8d2532d4702b9ee1d32c8c5ac0f..26bddf1c0da7cbb178d1fbe989e5d061b80a91bf 100644
GIT binary patch
delta 2569
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

delta 4071
zcmd5<du&tZ6~EuT*Rii(C!uLWAP*-r1QX)ihwm$tM?w<HR40K3Sa>vXViTMucIr3{
zN!PioXwq6Sm0qoP&@sZaYJZ?TSX8pETgNJ)Nr1Lhn}#;E(5a)NTUnv&T50Vb-*<hT
zIFznZ|61f6>pR~$zjMCteCOfEW;~D0c%E8bvYDc&M*N@uyZ^`<32i>ze+-a3`ys@=
ze!f{&n<Xj43z8~JMzW%AfyJwGSTRmkthHHUNEcOE<Bh*mG%v7tO;$xitlTiq(lkxf
zL?c@%FR&C{;x*&tN~M4$tCD0CRfQK=VM)P?_g1M3EKwA6**IKv&jO2=L`gI*6|huY
zP&C=7sg{@J4kU(Dg;#ZrXB<>nT}w1Jnn)TatC!A$sG=gOit$YKiUk%gsIqGOqPk&q
z9z;=8UetXsNV$Py;Vr0y7a;*(gs(vaz5^0)vo(S1{-z}*Oc0I7(+|hfed*|AESibZ
zr8LusV#CqoP^!<e-#3yP@-8iAWMsZ_f-Ws*O8ra|XKO{1$y6qqNu-kSRby*Y`8uzM
zspg^+nf-keSOn(aca#$g7kinyyrq%oKzzix1Qu+MrBlQ4!3<-(*i?R}74$pu25h&C
zx0)*NT2H~>-~#*sehM=%0WsJL>*2}SlKxsS)@|@K*s|^=Z25BAn2pR8v*l$r%QA0d
zHavaTIts4C@8LZB1Wv#ckbyzyhIJUP28?^Uym`D5j-|?%=MHS+feW+Bax5FK>uEG&
zIJ?)BtoJwgm->r*H+`@A&ikJC&EUJ<<1>!$^<`}bt4diEMDD@;_>$xKi?1wU(F){_
z#$tI+g(b$t;v?})ywA40Jjb+kZRRpdmm|71r+f*E>X6IUwOm}fq{iaesur&dSX7N%
zMA2H$Mjlw-lI<9}cl)-8-kpd~jo;lit!32x!&-|n@zAziTRQG<Xxprh4UZ1@Y8~Rl
zj?by`=z)Qe*71R!@pU3EXpOwmC<p-_zeTN?7eWdzDROv!BArT(N0YZmsLe7T(nMaA
zBsY#bg7+wRZ`M8Y?+rA3hy(Es9O-s24%$77`u|h?t+8VK`QaE_JjZTCbYS&yia8G3
z{V)68_ceMQ9>M*D>$2;V^ZBAN$K!M-`Y{Um-=q%vFH?ylNA5A>{pfD=z6r<ZR`X&%
zdH`)VX9tjq>dn6npsm@GW@p*fAUY@~lCk&!`+eIH%U^3>BG#wz0}3t*(qf5~o3^#L
z^t1=IbhfpBK2W=O^LFaBfv(O%IhJJK+=b(GADa7e3;Hu^7?z!7!614ZGSPvN_+rGx
zt6KAqL+DOtK38~`Y+m^WJqBND4Li$Z86B#(Aguf~jeV%pe0>O2nj61K7n$exq3cL8
ze>8+vp}-u*S)o;U;ROm;jW^&mxCF1@l=~3=0q?*$_!+!_qjD6C?kkP~uY*Cz?Xjqv
zP#0%WmqncxEwZS?qAZ~tV^NxA5XX_2d*K`fAHfIkE>6a4*yd%NlD~yt;j}!5Z9NCA
zEW;r$As#~9gm8qo2yqfpM2LeBmJo&znqfH3hYeJDlBV-4T2pe|JLTQ(mAoF$8=kWs
z)03PPidTEG^;HfE1tqtgEA}OBiY5a&P5^TPBslezIl;wwO9XSAdBK_rEV!bvFqerG
z&a!!tmCFg1fRo#txPYpi%W_Ne*$b#9Qclzx3e!2SZfAGxQY=x|xG22~9JW%qwk#)O
zau-o$<z0ADUB8g%c|c2a?!}8}3sd3s4pQ(Ed;!+_U-Lib-|TzK_ax4%tKL)IL0rQ&
zd9xi}jsk&eKwOKsEjrnTFC~x~Af-F7N(}CPq!u4B9;<B*Jo4zHd)<Y(E|6*<D<MUe
zbWzbf1PA#rj&LiE5M*xA49m@;5|UIQtA(`=_q+?YQT^X8gozg+QP)LL+rwd;M$}7O
zxQ{fX`GW{S8pGs5YMrHaUm`vd8?SB726orxBd`~r(6#u4BHt_uAzl}BP21y|hZh&a
zi=PPpspwfj4e^?;hNV5ud3b3ty!6@O1u-NFBA$5m6wRZD3(>QIRpHML&#NIpQ?T=j
z!-6N#R|??+tCS#f%bf~xvm}HxO~PZ(o-8}>m%La}{)}$%3JIAcX|gVCU@-a$>v2on
zxq&1w5KR|6sVI5YTw&00lhd0;JtXl$Sk^Yu7@;ng9(ja)6GPDgh}$CwN=OiRo#)M$
zuAuth$4&4eo^*L$mr2EB;5vmX@_TR{*T*YRQ^X=%^BC)krdgKD)jh_4m4cJd>c5JU
z_mV%mn<=7J=q)XI&+yrL_9w;z_!A`u4cJdRbh`tJI(~Qh?RRuu5ckqWRNdMIaB}Pg
zbh29a$@t{>ye5X_kKx-pnqZy;8jr^0y2)MeGJZ-Qlg{mkB2UUb18-CCPxw2$jc@5P
zR5=)yBHf23Uo?wYDtAo?Zc=a)%e)CI@9^Q>YAzEW&sY_o;5gtk1#iQv@Jn19Ps6vt
z#IlDV>nj5;l1j#>MzIiHP`QQ2fhTw1Hl;>V=|Mm1peljuhz=%35}B!eUOd*91J@l-
zkEfDje%ji-FEwZl&?8HbgQ^3rD?JoVCZ;W3Di`k?q(i<BH?XDr-)u$yCDMl3WsKEP
zX{+Dm#NV|WDt7cw;9uMk&&;5IK{;-ZMAQM-3VZK0xQtaUK(WI~HW#|8aq~(U3m;K{
zx5-GxdRTHbR53-t2NtiM;wapfX&-lk@;Y_Of5X4bm-Jrns-9D>uXsw`)6QSJWv7l?
zZn={=Sh~sFVbaf_7W2AE&vCK!&a$Q^bZFB2?$_zx%+E2%v(o(DQThQUO|_G;t)*yf
zYf)KO(D=D$shK)P2hm3J=rQ`JYXhF#n(*XiKGlyjGyN>RgW=XX|1YPzIfSasgQIu^
zGf&Wox&AmRMrUT|^Zp%UqtayJ;q<`7X!@b4iHWIH>cI5)_;fNl^x%WxhbCi@o!j}y
z=(gd`;r6M{w(Uaa^vG!Mbn8g(Xy<TOTV%4UZE!L&9XSwbYnklDJDqJ?4|MgIf$!6Y
z?;q{$>79!7425^KMW(xYwk3Lpw@gMhcZ}}Z*)Dgs#fH0fwomr%j9`F{;Z89k?b;j(
mZ%Oj=6TK)GPV|bZ^JjiQzYc*<bNb9#`duJDRqfvbMDxEV{7cgS

diff --git a/doccano/app/server/admin.py b/doccano/app/server/admin.py
index 1cf1bb1a..cca19f35 100644
--- a/doccano/app/server/admin.py
+++ b/doccano/app/server/admin.py
@@ -1,8 +1,8 @@
 from django.contrib import admin
 
-from .models import Annotation, Label, RawData, Project
+from .models import Annotation, Label, Document, Project
 
 admin.site.register(Annotation)
 admin.site.register(Label)
-admin.site.register(RawData)
+admin.site.register(Document)
 admin.site.register(Project)
diff --git a/doccano/app/server/models.py b/doccano/app/server/models.py
index 8b578e32..0a44dbc8 100644
--- a/doccano/app/server/models.py
+++ b/doccano/app/server/models.py
@@ -24,7 +24,7 @@ class Label(models.Model):
                 'shortcut': self.shortcut}
 
 
-class RawData(models.Model):
+class Document(models.Model):
     text = models.TextField()
     project = models.ForeignKey(Project, on_delete=models.CASCADE, null=True)
 
@@ -36,7 +36,7 @@ class RawData(models.Model):
 class Annotation(models.Model):
     prob = models.FloatField(blank=True, null=True)
     label = models.ForeignKey(Label, on_delete=models.CASCADE)
-    data = models.ForeignKey(RawData, on_delete=models.CASCADE)
+    data = models.ForeignKey(Document, on_delete=models.CASCADE)
     manual = models.BooleanField(default=False)
 
     def as_dict(self):
diff --git a/doccano/app/server/tests.py b/doccano/app/server/tests.py
index dd58d89d..d045f17f 100644
--- a/doccano/app/server/tests.py
+++ b/doccano/app/server/tests.py
@@ -3,7 +3,7 @@ import os
 from django.test import TestCase, Client
 from django.urls import reverse
 
-from .models import Project, RawData, Label
+from .models import Project, Document, Label
 
 
 class ProjectModelTest(TestCase):
@@ -24,7 +24,7 @@ class TestRawDataAPI(TestCase):
         self.assertEqual(res.json()['data'], [])
 
     def test_post(self):
-        self.assertEqual(RawData.objects.count(), 0)
+        self.assertEqual(Document.objects.count(), 0)
 
         filename = os.path.join(os.path.dirname(__file__), 'data/test.jsonl')
         client = Client()
@@ -32,7 +32,7 @@ class TestRawDataAPI(TestCase):
             client.post(reverse('data_api', args=[1]),
                         {'name': 'fred', 'attachment': f})
 
-        self.assertGreater(RawData.objects.count(), 0)
+        self.assertGreater(Document.objects.count(), 0)
 
 
 class TestLabelAPI(TestCase):
diff --git a/doccano/app/server/views.py b/doccano/app/server/views.py
index 0055a123..51ceac01 100644
--- a/doccano/app/server/views.py
+++ b/doccano/app/server/views.py
@@ -6,7 +6,7 @@ from django.views import View
 from django.views.generic.list import ListView
 from django.views.generic.detail import DetailView
 
-from .models import Annotation, Label, RawData, Project
+from .models import Annotation, Label, Document, Project
 
 
 class AnnotationView(View):
@@ -30,7 +30,7 @@ class AnnotationAPIView(View):
             docs = Annotation.objects.all()
         else:
             # Left outer join data and annotation.
-            docs = RawData.objects.filter(annotation__isnull=True, project=project)
+            docs = Document.objects.filter(annotation__isnull=True, project=project)
             docs = [{**d.as_dict(), **{'labels': []}} for d in docs]
 
         if not docs:
@@ -42,7 +42,7 @@ class AnnotationAPIView(View):
         body = json.loads(request.body)
         data_id, label_id = body.get('id'), body.get('label_id')  # {id:0, label_id:1}
 
-        data = RawData.objects.get(id=data_id)
+        data = Document.objects.get(id=data_id)
         label = Label.objects.get(id=label_id)
         Annotation(data=data, label=label, manual=True).save()
 
@@ -59,8 +59,8 @@ class AnnotationAPIView(View):
 class MetaInfoAPI(View):
 
     def get(self, request, *args, **kwargs):
-        total = RawData.objects.count()
-        remaining = RawData.objects.filter(annotation__isnull=True).count()
+        total = Document.objects.count()
+        remaining = Document.objects.filter(annotation__isnull=True).count()
 
         return JsonResponse({'total': total, 'remaining': remaining})
 
@@ -69,7 +69,7 @@ class SearchAPI(View):
 
     def get(self, request, *args, **kwargs):
         keyword = request.GET.get('keyword')
-        docs = RawData.objects.filter(text__contains=keyword)
+        docs = Document.objects.filter(text__contains=keyword)
         labels = [[a.as_dict() for a in Annotation.objects.filter(data=d.id)] for d in docs]
         # print(annotations)
         # print(docs)
@@ -140,7 +140,7 @@ class RawDataAPI(View):
         content = ''.join(chunk.decode('utf-8') for chunk in f.chunks())
         for line in content.split('\n'):
             j = json.loads(line)
-            RawData(text=j['text']).save()
+            Document(text=j['text']).save()
 
         return JsonResponse({'status': 'ok'})