Flare-k

model 수정

Showing 28 changed files with 262 additions and 18 deletions
1 +# Generated by Django 3.0.6 on 2020-05-28 11:05
2 +
3 +from django.db import migrations, models
4 +import django.utils.timezone
5 +
6 +
7 +class Migration(migrations.Migration):
8 +
9 + dependencies = [
10 + ('cloud', '0001_initial'),
11 + ]
12 +
13 + operations = [
14 + migrations.AlterModelOptions(
15 + name='file',
16 + options={'ordering': ['createdDate']},
17 + ),
18 + migrations.RemoveField(
19 + model_name='file',
20 + name='created_date',
21 + ),
22 + migrations.RemoveField(
23 + model_name='file',
24 + name='modified_date',
25 + ),
26 + migrations.AddField(
27 + model_name='file',
28 + name='createdDate',
29 + field=models.DateTimeField(default=django.utils.timezone.now),
30 + ),
31 + migrations.AddField(
32 + model_name='file',
33 + name='fileSize',
34 + field=models.IntegerField(default=0),
35 + ),
36 + migrations.AddField(
37 + model_name='file',
38 + name='isFolder',
39 + field=models.BooleanField(default=False),
40 + ),
41 + migrations.AddField(
42 + model_name='file',
43 + name='modifiedDate',
44 + field=models.DateTimeField(blank=True, null=True),
45 + ),
46 + migrations.AddField(
47 + model_name='file',
48 + name='name',
49 + field=models.CharField(default='', max_length=50, null=True),
50 + ),
51 + migrations.AddField(
52 + model_name='file',
53 + name='owner',
54 + field=models.CharField(default='', max_length=30, null=True),
55 + ),
56 + migrations.AlterField(
57 + model_name='file',
58 + name='path',
59 + field=models.TextField(),
60 + ),
61 + ]
1 +# Generated by Django 3.0.6 on 2020-05-28 11:06
2 +
3 +from django.db import migrations, models
4 +
5 +
6 +class Migration(migrations.Migration):
7 +
8 + dependencies = [
9 + ('cloud', '0002_auto_20200528_2005'),
10 + ]
11 +
12 + operations = [
13 + migrations.AlterField(
14 + model_name='file',
15 + name='fileSize',
16 + field=models.IntegerField(default=0),
17 + ),
18 + ]
1 +# Generated by Django 3.0.6 on 2020-05-28 11:10
2 +
3 +from django.db import migrations, models
4 +
5 +
6 +class Migration(migrations.Migration):
7 +
8 + dependencies = [
9 + ('cloud', '0003_auto_20200528_2006'),
10 + ]
11 +
12 + operations = [
13 + migrations.AlterField(
14 + model_name='file',
15 + name='fileSize',
16 + field=models.IntegerField(),
17 + ),
18 + migrations.AlterField(
19 + model_name='file',
20 + name='isFolder',
21 + field=models.BooleanField(),
22 + ),
23 + migrations.AlterField(
24 + model_name='file',
25 + name='owner',
26 + field=models.CharField(max_length=30),
27 + ),
28 + ]
1 +# Generated by Django 3.0.6 on 2020-05-28 11:11
2 +
3 +from django.db import migrations, models
4 +
5 +
6 +class Migration(migrations.Migration):
7 +
8 + dependencies = [
9 + ('cloud', '0004_auto_20200528_2010'),
10 + ]
11 +
12 + operations = [
13 + migrations.AlterField(
14 + model_name='file',
15 + name='owner',
16 + field=models.CharField(default='', max_length=30, null=True),
17 + ),
18 + ]
1 +# Generated by Django 3.0.6 on 2020-05-28 11:54
2 +
3 +from django.db import migrations
4 +
5 +
6 +class Migration(migrations.Migration):
7 +
8 + dependencies = [
9 + ('cloud', '0005_auto_20200528_2011'),
10 + ]
11 +
12 + operations = [
13 + migrations.AlterModelOptions(
14 + name='file',
15 + options={},
16 + ),
17 + ]
1 +# Generated by Django 3.0.6 on 2020-05-28 12:09
2 +
3 +from django.db import migrations, models
4 +
5 +
6 +class Migration(migrations.Migration):
7 +
8 + dependencies = [
9 + ('cloud', '0006_auto_20200528_2054'),
10 + ]
11 +
12 + operations = [
13 + migrations.AlterModelOptions(
14 + name='file',
15 + options={'ordering': ['createdDate']},
16 + ),
17 + migrations.AlterField(
18 + model_name='file',
19 + name='fileSize',
20 + field=models.IntegerField(default=0),
21 + ),
22 + ]
1 +# Generated by Django 3.0.6 on 2020-05-28 12:10
2 +
3 +from django.db import migrations
4 +
5 +
6 +class Migration(migrations.Migration):
7 +
8 + dependencies = [
9 + ('cloud', '0007_auto_20200528_2109'),
10 + ]
11 +
12 + operations = [
13 + migrations.AlterModelOptions(
14 + name='file',
15 + options={'ordering': ('createdDate',)},
16 + ),
17 + ]
1 +# Generated by Django 3.0.6 on 2020-05-28 12:12
2 +
3 +from django.db import migrations, models
4 +
5 +
6 +class Migration(migrations.Migration):
7 +
8 + dependencies = [
9 + ('cloud', '0008_auto_20200528_2110'),
10 + ]
11 +
12 + operations = [
13 + migrations.RemoveField(
14 + model_name='file',
15 + name='fileSize',
16 + ),
17 + migrations.AddField(
18 + model_name='file',
19 + name='filesize',
20 + field=models.IntegerField(default=0),
21 + ),
22 + ]
1 +# Generated by Django 3.0.6 on 2020-05-28 12:14
2 +
3 +from django.db import migrations, models
4 +
5 +
6 +class Migration(migrations.Migration):
7 +
8 + dependencies = [
9 + ('cloud', '0009_auto_20200528_2112'),
10 + ]
11 +
12 + operations = [
13 + migrations.AlterField(
14 + model_name='file',
15 + name='filesize',
16 + field=models.CharField(default='', max_length=30, null=True),
17 + ),
18 + ]
1 +# Generated by Django 3.0.6 on 2020-05-28 12:18
2 +
3 +from django.db import migrations, models
4 +
5 +
6 +class Migration(migrations.Migration):
7 +
8 + dependencies = [
9 + ('cloud', '0010_auto_20200528_2114'),
10 + ]
11 +
12 + operations = [
13 + migrations.AlterField(
14 + model_name='file',
15 + name='filesize',
16 + field=models.IntegerField(default=0),
17 + ),
18 + ]
1 +# Generated by Django 3.0.6 on 2020-05-28 12:19
2 +
3 +from django.db import migrations
4 +
5 +
6 +class Migration(migrations.Migration):
7 +
8 + dependencies = [
9 + ('cloud', '0011_auto_20200528_2118'),
10 + ]
11 +
12 + operations = [
13 + migrations.AlterModelOptions(
14 + name='file',
15 + options={'ordering': ['createdDate']},
16 + ),
17 + ]
1 from django.db import models 1 from django.db import models
2 from django.utils import timezone 2 from django.utils import timezone
3 3
4 -# Create your models here.
5 -
6 4
7 class File(models.Model): 5 class File(models.Model):
8 - # file = models.FileField(upload_to=None, max_length=100) #일단 보류 6 + name = models.CharField(null=True, default='', max_length=50)
9 - name = models.CharField(max_length=50) 7 + isFolder = models.BooleanField()
10 - isFolder = models.BooleanField(default=False)
11 path = models.TextField() 8 path = models.TextField()
12 - owner = models.CharField(max_length=30) 9 + owner = models.CharField(null=True, default='', max_length=30)
13 - fileSize = models.IntegerField() 10 + filesize = models.IntegerField(default=0)
14 - createdDate = models.DateTimeField(auto_now_add=True) 11 + createdDate = models.DateTimeField(default=timezone.now)
15 modifiedDate = models.DateTimeField(blank=True, null=True) 12 modifiedDate = models.DateTimeField(blank=True, null=True)
13 + # file = models.FileField(upload_to=None, max_length=100) #일단 보류
16 14
17 class Meta: 15 class Meta:
18 ordering = ['createdDate'] 16 ordering = ['createdDate']
......
1 -from rest_framework import serializers
2 -from .models import File
3 -
4 -
5 -class FileSerializer(serializers.FileSerializer):
6 - class Meta:
7 - model = File
8 - fields = ['file', 'name', 'isFolder', 'path', 'owner',
9 - 'fileSize', 'createdDate', 'modifiedDate']
...@@ -7,7 +7,6 @@ from django.http import HttpResponse ...@@ -7,7 +7,6 @@ from django.http import HttpResponse
7 import boto3 7 import boto3
8 import os 8 import os
9 import json 9 import json
10 -from .files import *
11 from django.http import JsonResponse 10 from django.http import JsonResponse
12 # from cloud.aws import aws_key 11 # from cloud.aws import aws_key
13 import configparser 12 import configparser
......