Merge pull request #1 from jurismarches/sirene_v3

Sirene v3

Author: roxanebellot

.circleci/config.yml

@@ -1,26 +1,26 @@
 version: 2
 jobs:
   build:
-    docker:
-      - image: technekes/circleci
+    machine:
+      image: ubuntu-1604:201903-01
 
     working_directory: /tmp/app
 
     steps:
       - checkout
-      - setup_remote_docker
 
       - run:
           name: Build the image(s)
           command: |
-            docker build -t sirene:latest .
+            cp .env.sample .env
+            docker-compose build
 
       - run:
           name: Run quality
           command: |
-            docker run sirene make quality
+            docker-compose run --rm sirene make quality
 
       - run:
           name: Run test and coverage
           command: |
-            docker run sirene /bin/bash -c "make coverage; codecov --token=03f9df38-f1e3-4f0d-bfa1-0e8626319b14"
+            docker-compose run --rm sirene  /bin/bash -c "make coverage; codecov --token=03f9df38-f1e3-4f0d-bfa1-0e8626319b14"

.env.sample

@@ -0,0 +1,4 @@
+# database
+POSTGRES_NAME=postgres
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=postgres

Dockerfile

@@ -1,7 +1,7 @@
 FROM python:3
 
 ENV PYTHONBUFFERED 1
-ENV APPLICATION_ROOT /app/
+ARG APPLICATION_ROOT=/app/
 
 RUN mkdir -p $APPLICATION_ROOT
 
@@ -13,14 +13,25 @@ RUN set -x && apt-get update && apt-get -y install \
     lib32z1-dev \
     # psycopg2
     libpq-dev \
-    postgresql-client
+    postgresql-client\
+    # wait for it
+    wait-for-it
 
 ADD requirements_dev.txt requirements_dev.txt
 
 ADD . $APPLICATION_ROOT
 
+RUN useradd ubuntu --create-home
+
 WORKDIR $APPLICATION_ROOT
 
 RUN pip3 install pip -U && \
     pip3 install -r requirements_dev.txt
 
+RUN chown -R ubuntu $APPLICATION_ROOT
+RUN chown -R ubuntu /home/ubuntu
+
+USER ubuntu
+
+# compile python files
+RUN python -m compileall .

README.md

@@ -24,7 +24,6 @@ These are settings you will want to redefine::
 | Setting                            | Default | Details                                                 |
 | ---------------------------------- | ------- | ------------------------------------------------------- |
 | `DJANGO_SIRENE_LOCAL_PATH`         | `/tmp`  | define where files will be downloaded                   |
-| `DJANGO_SIRENE_DAYS_TO_KEEP_FILES` | `30`    | define how many days you want to keep downloaded files  |
 
 Make the migration
 ```
@@ -38,34 +37,34 @@ manage.py populate_sirene_database
 ```
 It will import the last 'stock' file then all next 'daily' files published.
 
-You can populate database at a past date with `at` parameter.
+You can see further option in the command help.
 ```
-manage.py populate_sirene_database --at '2017-11-30'
+manage.py populate_sirene_database --help'
 ```
 
 ## Contributing
 
-### Build, start and attach to docker container
+### Build, start docker container
 
 ```
-docker-compose up -d
-docker exec -ti CONTAINER_ID bash
+cp .env.sample .env
+docker-compose build
 ```
 
 ### Test django admin
 
 Create superuser
 ```
-example/manage.py createsuperuser
+docker-compose exec sirene example/manage.py createsuperuser
 ```
 
  Run django server
 ```
-example/manage.py runserver 0:8000
+docker-compose exec sirene example/manage.py runserver 0:8000
 ```
 
 ### Run tests
 
 ```
-make tests
+docker-compose run --rm sirene make tests
 ```

django_sirene/admin.py

@@ -5,6 +5,8 @@
 class InstitutionAdmin(admin.ModelAdmin):
     search_fields = (
         'siret',
+        "name",
+        "commercial_name"
     )
     list_select_related = (
         'legal_status',
@@ -22,7 +24,6 @@ class InstitutionAdmin(admin.ModelAdmin):
         'is_expired',
         'updated',
         'created',
-        'updated_from_filename',
     )
 
 

django_sirene/base_documents.py

@@ -23,7 +23,7 @@ class InstitutionDocumentMixin:
     )
 
     legal_status = fields.ObjectField(properties=_properties_code_name)
-    activity = fields.ObjectField(properties=_properties_code_name)
+    municipality = fields.ObjectField(properties=_properties_code_name)
     activity = fields.ObjectField(properties=_properties_code_name)
 
     class Meta:

django_sirene/db_utils.py

@@ -0,0 +1,8 @@
+from django.db import connection
+
+
+def toggle_postgres_vacuum(autovacuum_enabled):
+    with connection.cursor() as cursor:
+        cursor.execute(
+            f"ALTER TABLE django_sirene_institution SET (autovacuum_enabled={autovacuum_enabled})"
+        )