diff --git a/.gitignore b/.gitignore index 549e00a2..823c8753 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,6 @@ build/ ### VS Code ### .vscode/ + +/db/java-shareit.mv.db +/db/java-shareit.trace.db diff --git a/docker/_docker/app/Dockerfile b/docker/_docker/app/Dockerfile new file mode 100644 index 00000000..b350a881 --- /dev/null +++ b/docker/_docker/app/Dockerfile @@ -0,0 +1,38 @@ +FROM php:8.2-fpm + +# Install system dependencies +RUN apt-get update && apt-get install -y \ + build-essential libicu-dev libzip-dev libxml2-dev libpng-dev \ + libjpeg62-turbo-dev libfreetype6-dev libonig-dev locales zip \ + unzip jpegoptim optipng pngquant gifsicle vim git curl \ + wget libicu-dev g++ libpq-dev libssl-dev gettext + +RUN docker-php-ext-configure zip && docker-php-ext-install zip +RUN docker-php-ext-install soap +RUN docker-php-ext-install sockets + +# Clear cache +RUN apt-get clean && rm -rf /var/lib/apt/lists/* + +# Install PHP extensions +RUN docker-php-ext-install pdo mbstring exif pcntl bcmath gd opcache + +# pgsql +RUN docker-php-ext-install pdo_pgsql pgsql +RUN docker-php-ext-install pdo_mysql mysqli + +#Redis +RUN pecl install -o -f redis && docker-php-ext-enable redis + +# Get latest Composer +COPY --from=composer:latest /usr/bin/composer /usr/bin/composer + +# Create system user to run Composer and Artisan Commands +RUN useradd -G www-data,root -u 1000 -d /home/shareit shareit +RUN mkdir -p /home/shareit/.composer && \ + chown -R shareit:shareit /home/shareit + +# Set working directory +WORKDIR /var/www + +USER shareit diff --git a/docker/_docker/app/php.ini b/docker/_docker/app/php.ini new file mode 100644 index 00000000..6a0f8987 --- /dev/null +++ b/docker/_docker/app/php.ini @@ -0,0 +1,1927 @@ +[PHP] + +;;;;;;;;;;;;;;;;;;; +; About php.ini ; +;;;;;;;;;;;;;;;;;;; +; PHP's initialization file, generally called php.ini, is responsible for +; configuring many of the aspects of PHP's behavior. + +; PHP attempts to find and load this configuration from a number of locations. +; The following is a summary of its search order: +; 1. SAPI module specific location. +; 2. The PHPRC environment variable. (As of PHP 5.2.0) +; 3. A number of predefined registry keys on Windows (As of PHP 5.2.0) +; 4. Current working directory (except CLI) +; 5. The web server's directory (for SAPI modules), or directory of PHP +; (otherwise in Windows) +; 6. The directory from the --with-config-file-path compile time option, or the +; Windows directory (C:\windows or C:\winnt) +; See the PHP docs for more specific information. +; http://php.net/configuration.file + +; The syntax of the file is extremely simple. Whitespace and lines +; beginning with a semicolon are silently ignored (as you probably guessed). +; Section headers (e.g. [Foo]) are also silently ignored, even though +; they might mean something in the future. + +; Directives following the section heading [PATH=/www/mysite] only +; apply to PHP files in the /www/mysite directory. Directives +; following the section heading [HOST=www.example.com] only apply to +; PHP files served from www.example.com. Directives set in these +; special sections cannot be overridden by user-defined INI files or +; at runtime. Currently, [PATH=] and [HOST=] sections only work under +; CGI/FastCGI. +; http://php.net/ini.sections + +; Directives are specified using the following syntax: +; directive = value +; Directive names are *case sensitive* - foo=bar is different from FOO=bar. +; Directives are variables used to configure PHP or PHP extensions. +; There is no name validation. If PHP can't find an expected +; directive because it is not set or is mistyped, a default value will be used. + +; The value can be a string, a number, a PHP constant (e.g. E_ALL or M_PI), one +; of the INI constants (On, Off, True, False, Yes, No and None) or an expression +; (e.g. E_ALL & ~E_NOTICE), a quoted string ("bar"), or a reference to a +; previously set variable or directive (e.g. ${foo}) + +; Expressions in the INI file are limited to bitwise operators and parentheses: +; | bitwise OR +; ^ bitwise XOR +; & bitwise AND +; ~ bitwise NOT +; ! boolean NOT + +; Boolean flags can be turned on using the values 1, On, True or Yes. +; They can be turned off using the values 0, Off, False or No. + +; An empty string can be denoted by simply not writing anything after the equal +; sign, or by using the None keyword: + +; foo = ; sets foo to an empty string +; foo = None ; sets foo to an empty string +; foo = "None" ; sets foo to the string 'None' + +; If you use constants in your value, and these constants belong to a +; dynamically loaded extension (either a PHP extension or a Zend extension), +; you may only use these constants *after* the line that loads the extension. + +;;;;;;;;;;;;;;;;;;; +; About this file ; +;;;;;;;;;;;;;;;;;;; +; PHP comes packaged with two INI files. One that is recommended to be used +; in production environments and one that is recommended to be used in +; development environments. + +; php.ini-production contains settings which hold security, performance and +; best practices at its core. But please be aware, these settings may break +; compatibility with older or less security conscience applications. We +; recommending using the production ini in production and testing environments. + +; php.ini-development is very similar to its production variant, except it is +; much more verbose when it comes to errors. We recommend using the +; development version only in development environments, as errors shown to +; application users can inadvertently leak otherwise secure information. + +; This is php.ini-production INI file. + +;;;;;;;;;;;;;;;;;;; +; Quick Reference ; +;;;;;;;;;;;;;;;;;;; +; The following are all the settings which are different in either the production +; or development versions of the INIs with respect to PHP's default behavior. +; Please see the actual settings later in the document for more details as to why +; we recommend these changes in PHP's behavior. + +; display_errors +; Default Value: On +; Development Value: On +; Production Value: Off + +; display_startup_errors +; Default Value: Off +; Development Value: On +; Production Value: Off + +; error_reporting +; Default Value: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED +; Development Value: E_ALL +; Production Value: E_ALL & ~E_DEPRECATED & ~E_STRICT + +; html_errors +; Default Value: On +; Development Value: On +; Production value: On + +; log_errors +; Default Value: Off +; Development Value: On +; Production Value: On + +; max_input_time +; Default Value: -1 (Unlimited) +; Development Value: 60 (60 seconds) +; Production Value: 60 (60 seconds) + +; output_buffering +; Default Value: Off +; Development Value: 4096 +; Production Value: 4096 + +; register_argc_argv +; Default Value: On +; Development Value: Off +; Production Value: Off + +; request_order +; Default Value: None +; Development Value: "GP" +; Production Value: "GP" + +; session.gc_divisor +; Default Value: 100 +; Development Value: 1000 +; Production Value: 1000 + +; session.sid_bits_per_character +; Default Value: 4 +; Development Value: 5 +; Production Value: 5 + +; short_open_tag +; Default Value: On +; Development Value: Off +; Production Value: Off + +; track_errors +; Default Value: Off +; Development Value: On +; Production Value: Off + +; variables_order +; Default Value: "EGPCS" +; Development Value: "GPCS" +; Production Value: "GPCS" + +;;;;;;;;;;;;;;;;;;;; +; php.ini Options ; +;;;;;;;;;;;;;;;;;;;; +; Name for user-defined php.ini (.htaccess) files. Default is ".user.ini" +;user_ini.filename = ".user.ini" + +; To disable this feature set this option to empty value +;user_ini.filename = + +; TTL for user-defined php.ini files (time-to-live) in seconds. Default is 300 seconds (5 minutes) +;user_ini.cache_ttl = 300 + +;;;;;;;;;;;;;;;;;;;; +; Language Options ; +;;;;;;;;;;;;;;;;;;;; + +; Enable the PHP scripting language engine under Apache. +; http://php.net/engine +engine = On + +; This directive determines whether or not PHP will recognize code between +; tags as PHP source which should be processed as such. It is +; generally recommended that should be used and that this feature +; should be disabled, as enabling it may result in issues when generating XML +; documents, however this remains supported for backward compatibility reasons. +; Note that this directive does not control the would work. +; http://php.net/syntax-highlighting +;highlight.string = #DD0000 +;highlight.comment = #FF9900 +;highlight.keyword = #007700 +;highlight.default = #0000BB +;highlight.html = #000000 + +; If enabled, the request will be allowed to complete even if the user aborts +; the request. Consider enabling it if executing long requests, which may end up +; being interrupted by the user or a browser timing out. PHP's default behavior +; is to disable this feature. +; http://php.net/ignore-user-abort +;ignore_user_abort = On + +; Determines the size of the realpath cache to be used by PHP. This value should +; be increased on systems where PHP opens many files to reflect the quantity of +; the file operations performed. +; http://php.net/realpath-cache-size +;realpath_cache_size = 4096k + +; Duration of time, in seconds for which to cache realpath information for a given +; file or directory. For systems with rarely changing files, consider increasing this +; value. +; http://php.net/realpath-cache-ttl +;realpath_cache_ttl = 120 + +; Enables or disables the circular reference collector. +; http://php.net/zend.enable-gc +zend.enable_gc = On + +; If enabled, scripts may be written in encodings that are incompatible with +; the scanner. CP936, Big5, CP949 and Shift_JIS are the examples of such +; encodings. To use this feature, mbstring extension must be enabled. +; Default: Off +;zend.multibyte = Off + +; Allows to set the default encoding for the scripts. This value will be used +; unless "declare(encoding=...)" directive appears at the top of the script. +; Only affects if zend.multibyte is set. +; Default: "" +;zend.script_encoding = + +;;;;;;;;;;;;;;;;; +; Miscellaneous ; +;;;;;;;;;;;;;;;;; + +; Decides whether PHP may expose the fact that it is installed on the server +; (e.g. by adding its signature to the Web server header). It is no security +; threat in any way, but it makes it possible to determine whether you use PHP +; on your server or not. +; http://php.net/expose-php +expose_php = On + +;;;;;;;;;;;;;;;;;;; +; Resource Limits ; +;;;;;;;;;;;;;;;;;;; + +; Maximum execution time of each script, in seconds +; http://php.net/max-execution-time +; Note: This directive is hardcoded to 0 for the CLI SAPI +max_execution_time = 600 + +; Maximum amount of time each script may spend parsing request data. It's a good +; idea to limit this time on productions servers in order to eliminate unexpectedly +; long running scripts. +; Note: This directive is hardcoded to -1 for the CLI SAPI +; Default Value: -1 (Unlimited) +; Development Value: 60 (60 seconds) +; Production Value: 60 (60 seconds) +; http://php.net/max-input-time +max_input_time = 600 + +; Maximum input variable nesting level +; http://php.net/max-input-nesting-level +;max_input_nesting_level = 64 + +; How many GET/POST/COOKIE input variables may be accepted +; max_input_vars = 1000 + +; Maximum amount of memory a script may consume (128MB) +; http://php.net/memory-limit +memory_limit = -1 + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; Error handling and logging ; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +; This directive informs PHP of which errors, warnings and notices you would like +; it to take action for. The recommended way of setting values for this +; directive is through the use of the error level constants and bitwise +; operators. The error level constants are below here for convenience as well as +; some common settings and their meanings. +; By default, PHP is set to take action on all errors, notices and warnings EXCEPT +; those related to E_NOTICE and E_STRICT, which together cover best practices and +; recommended coding standards in PHP. For performance reasons, this is the +; recommend error reporting setting. Your production server shouldn't be wasting +; resources complaining about best practices and coding standards. That's what +; development servers and development settings are for. +; Note: The php.ini-development file has this setting as E_ALL. This +; means it pretty much reports everything which is exactly what you want during +; development and early testing. +; +; Error Level Constants: +; E_ALL - All errors and warnings (includes E_STRICT as of PHP 5.4.0) +; E_ERROR - fatal run-time errors +; E_RECOVERABLE_ERROR - almost fatal run-time errors +; E_WARNING - run-time warnings (non-fatal errors) +; E_PARSE - compile-time parse errors +; E_NOTICE - run-time notices (these are warnings which often result +; from a bug in your code, but it's possible that it was +; intentional (e.g., using an uninitialized variable and +; relying on the fact it is automatically initialized to an +; empty string) +; E_STRICT - run-time notices, enable to have PHP suggest changes +; to your code which will ensure the best interoperability +; and forward compatibility of your code +; E_CORE_ERROR - fatal errors that occur during PHP's initial startup +; E_CORE_WARNING - warnings (non-fatal errors) that occur during PHP's +; initial startup +; E_COMPILE_ERROR - fatal compile-time errors +; E_COMPILE_WARNING - compile-time warnings (non-fatal errors) +; E_USER_ERROR - user-generated error message +; E_USER_WARNING - user-generated warning message +; E_USER_NOTICE - user-generated notice message +; E_DEPRECATED - warn about code that will not work in future versions +; of PHP +; E_USER_DEPRECATED - user-generated deprecation warnings +; +; Common Values: +; E_ALL (Show all errors, warnings and notices including coding standards.) +; E_ALL & ~E_NOTICE (Show all errors, except for notices) +; E_ALL & ~E_NOTICE & ~E_STRICT (Show all errors, except for notices and coding standards warnings.) +; E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR (Show only errors) +; Default Value: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED +; Development Value: E_ALL +; Production Value: E_ALL & ~E_DEPRECATED & ~E_STRICT +; http://php.net/error-reporting +error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT + +; This directive controls whether or not and where PHP will output errors, +; notices and warnings too. Error output is very useful during development, but +; it could be very dangerous in production environments. Depending on the code +; which is triggering the error, sensitive information could potentially leak +; out of your application such as database usernames and passwords or worse. +; For production environments, we recommend logging errors rather than +; sending them to STDOUT. +; Possible Values: +; Off = Do not display any errors +; stderr = Display errors to STDERR (affects only CGI/CLI binaries!) +; On or stdout = Display errors to STDOUT +; Default Value: On +; Development Value: On +; Production Value: Off +; http://php.net/display-errors +display_errors = Off + +; The display of errors which occur during PHP's startup sequence are handled +; separately from display_errors. PHP's default behavior is to suppress those +; errors from clients. Turning the display of startup errors on can be useful in +; debugging configuration problems. We strongly recommend you +; set this to 'off' for production servers. +; Default Value: Off +; Development Value: On +; Production Value: Off +; http://php.net/display-startup-errors +display_startup_errors = Off + +; Besides displaying errors, PHP can also log errors to locations such as a +; server-specific log, STDERR, or a location specified by the error_log +; directive found below. While errors should not be displayed on productions +; servers they should still be monitored and logging is a great way to do that. +; Default Value: Off +; Development Value: On +; Production Value: On +; http://php.net/log-errors +log_errors = On + +; Set maximum length of log_errors. In error_log information about the source is +; added. The default is 1024 and 0 allows to not apply any maximum length at all. +; http://php.net/log-errors-max-len +log_errors_max_len = 1024 + +; Do not log repeated messages. Repeated errors must occur in same file on same +; line unless ignore_repeated_source is set true. +; http://php.net/ignore-repeated-errors +ignore_repeated_errors = Off + +; Ignore source of message when ignoring repeated messages. When this setting +; is On you will not log errors with repeated messages from different files or +; source lines. +; http://php.net/ignore-repeated-source +ignore_repeated_source = Off + +; If this parameter is set to Off, then memory leaks will not be shown (on +; stdout or in the log). This has only effect in a debug compile, and if +; error reporting includes E_WARNING in the allowed list +; http://php.net/report-memleaks +report_memleaks = On + +; This setting is on by default. +;report_zend_debug = 0 + +; Store the last error/warning message in $php_errormsg (boolean). Setting this value +; to On can assist in debugging and is appropriate for development servers. It should +; however be disabled on production servers. +; This directive is DEPRECATED. +; Default Value: Off +; Development Value: Off +; Production Value: Off +; http://php.net/track-errors +;track_errors = Off + +; Turn off normal error reporting and emit XML-RPC error XML +; http://php.net/xmlrpc-errors +;xmlrpc_errors = 0 + +; An XML-RPC faultCode +;xmlrpc_error_number = 0 + +; When PHP displays or logs an error, it has the capability of formatting the +; error message as HTML for easier reading. This directive controls whether +; the error message is formatted as HTML or not. +; Note: This directive is hardcoded to Off for the CLI SAPI +; Default Value: On +; Development Value: On +; Production value: On +; http://php.net/html-errors +html_errors = On + +; If html_errors is set to On *and* docref_root is not empty, then PHP +; produces clickable error messages that direct to a page describing the error +; or function causing the error in detail. +; You can download a copy of the PHP manual from http://php.net/docs +; and change docref_root to the base URL of your local copy including the +; leading '/'. You must also specify the file extension being used including +; the dot. PHP's default behavior is to leave these settings empty, in which +; case no links to documentation are generated. +; Note: Never use this feature for production boxes. +; http://php.net/docref-root +; Examples +;docref_root = "/phpmanual/" + +; http://php.net/docref-ext +;docref_ext = .html + +; String to output before an error message. PHP's default behavior is to leave +; this setting blank. +; http://php.net/error-prepend-string +; Example: +;error_prepend_string = "" + +; String to output after an error message. PHP's default behavior is to leave +; this setting blank. +; http://php.net/error-append-string +; Example: +;error_append_string = "" + +; Log errors to specified file. PHP's default behavior is to leave this value +; empty. +; http://php.net/error-log +; Example: +;error_log = php_errors.log +; Log errors to syslog (Event Log on Windows). +;error_log = syslog + +;windows.show_crt_warning +; Default value: 0 +; Development value: 0 +; Production value: 0 + +;;;;;;;;;;;;;;;;; +; Data Handling ; +;;;;;;;;;;;;;;;;; + +; The separator used in PHP generated URLs to separate arguments. +; PHP's default setting is "&". +; http://php.net/arg-separator.output +; Example: +;arg_separator.output = "&" + +; List of separator(s) used by PHP to parse input URLs into variables. +; PHP's default setting is "&". +; NOTE: Every character in this directive is considered as separator! +; http://php.net/arg-separator.input +; Example: +;arg_separator.input = ";&" + +; This directive determines which super global arrays are registered when PHP +; starts up. G,P,C,E & S are abbreviations for the following respective super +; globals: GET, POST, COOKIE, ENV and SERVER. There is a performance penalty +; paid for the registration of these arrays and because ENV is not as commonly +; used as the others, ENV is not recommended on productions servers. You +; can still get access to the environment variables through getenv() should you +; need to. +; Default Value: "EGPCS" +; Development Value: "GPCS" +; Production Value: "GPCS"; +; http://php.net/variables-order +variables_order = "GPCS" + +; This directive determines which super global data (G,P & C) should be +; registered into the super global array REQUEST. If so, it also determines +; the order in which that data is registered. The values for this directive +; are specified in the same manner as the variables_order directive, +; EXCEPT one. Leaving this value empty will cause PHP to use the value set +; in the variables_order directive. It does not mean it will leave the super +; globals array REQUEST empty. +; Default Value: None +; Development Value: "GP" +; Production Value: "GP" +; http://php.net/request-order +request_order = "GP" + +; This directive determines whether PHP registers $argv & $argc each time it +; runs. $argv contains an array of all the arguments passed to PHP when a script +; is invoked. $argc contains an integer representing the number of arguments +; that were passed when the script was invoked. These arrays are extremely +; useful when running scripts from the command line. When this directive is +; enabled, registering these variables consumes CPU cycles and memory each time +; a script is executed. For performance reasons, this feature should be disabled +; on production servers. +; Note: This directive is hardcoded to On for the CLI SAPI +; Default Value: On +; Development Value: Off +; Production Value: Off +; http://php.net/register-argc-argv +register_argc_argv = Off + +; When enabled, the ENV, REQUEST and SERVER variables are created when they're +; first used (Just In Time) instead of when the script starts. If these +; variables are not used within a script, having this directive on will result +; in a performance gain. The PHP directive register_argc_argv must be disabled +; for this directive to have any affect. +; http://php.net/auto-globals-jit +auto_globals_jit = On + +; Whether PHP will read the POST data. +; This option is enabled by default. +; Most likely, you won't want to disable this option globally. It causes $_POST +; and $_FILES to always be empty; the only way you will be able to read the +; POST data will be through the php://input stream wrapper. This can be useful +; to proxy requests or to process the POST data in a memory efficient fashion. +; http://php.net/enable-post-data-reading +;enable_post_data_reading = Off + +; Maximum size of POST data that PHP will accept. +; Its value may be 0 to disable the limit. It is ignored if POST data reading +; is disabled through enable_post_data_reading. +; http://php.net/post-max-size +post_max_size = 200M + +; Automatically add files before PHP document. +; http://php.net/auto-prepend-file +auto_prepend_file = + +; Automatically add files after PHP document. +; http://php.net/auto-append-file +auto_append_file = + +; By default, PHP will output a media type using the Content-Type header. To +; disable this, simply set it to be empty. +; +; PHP's built-in default media type is set to text/html. +; http://php.net/default-mimetype +default_mimetype = "text/html" + +; PHP's default character set is set to UTF-8. +; http://php.net/default-charset +default_charset = "UTF-8" + +; PHP internal character encoding is set to empty. +; If empty, default_charset is used. +; http://php.net/internal-encoding +;internal_encoding = + +; PHP input character encoding is set to empty. +; If empty, default_charset is used. +; http://php.net/input-encoding +;input_encoding = + +; PHP output character encoding is set to empty. +; If empty, default_charset is used. +; See also output_buffer. +; http://php.net/output-encoding +;output_encoding = + +;;;;;;;;;;;;;;;;;;;;;;;;; +; Paths and Directories ; +;;;;;;;;;;;;;;;;;;;;;;;;; + +; UNIX: "/path1:/path2" +;include_path = ".:/usr/share/php" +; +; Windows: "\path1;\path2" +;include_path = ".;c:\php\includes" +; +; PHP's default setting for include_path is ".;/path/to/php/pear" +; http://php.net/include-path + +; The root of the PHP pages, used only if nonempty. +; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root +; if you are running php as a CGI under any web server (other than IIS) +; see documentation for security issues. The alternate is to use the +; cgi.force_redirect configuration below +; http://php.net/doc-root +doc_root = + +; The directory under which PHP opens the script using /~username used only +; if nonempty. +; http://php.net/user-dir +user_dir = + +; Directory in which the loadable extensions (modules) reside. +; http://php.net/extension-dir +; extension_dir = "./" +; On windows: +; extension_dir = "ext" + +; Directory where the temporary files should be placed. +; Defaults to the system default (see sys_get_temp_dir) +; sys_temp_dir = "/tmp" + +; Whether or not to enable the dl() function. The dl() function does NOT work +; properly in multithreaded servers, such as IIS or Zeus, and is automatically +; disabled on them. +; http://php.net/enable-dl +enable_dl = Off + +; cgi.force_redirect is necessary to provide security running PHP as a CGI under +; most web servers. Left undefined, PHP turns this on by default. You can +; turn it off here AT YOUR OWN RISK +; **You CAN safely turn this off for IIS, in fact, you MUST.** +; http://php.net/cgi.force-redirect +;cgi.force_redirect = 1 + +; if cgi.nph is enabled it will force cgi to always sent Status: 200 with +; every request. PHP's default behavior is to disable this feature. +;cgi.nph = 1 + +; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape +; (iPlanet) web servers, you MAY need to set an environment variable name that PHP +; will look for to know it is OK to continue execution. Setting this variable MAY +; cause security issues, KNOW WHAT YOU ARE DOING FIRST. +; http://php.net/cgi.redirect-status-env +;cgi.redirect_status_env = + +; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI. PHP's +; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok +; what PATH_INFO is. For more information on PATH_INFO, see the cgi specs. Setting +; this to 1 will cause PHP CGI to fix its paths to conform to the spec. A setting +; of zero causes PHP to behave as before. Default is 1. You should fix your scripts +; to use SCRIPT_FILENAME rather than PATH_TRANSLATED. +; http://php.net/cgi.fix-pathinfo +;cgi.fix_pathinfo=1 + +; if cgi.discard_path is enabled, the PHP CGI binary can safely be placed outside +; of the web tree and people will not be able to circumvent .htaccess security. +; http://php.net/cgi.dicard-path +;cgi.discard_path=1 + +; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate +; security tokens of the calling client. This allows IIS to define the +; security context that the request runs under. mod_fastcgi under Apache +; does not currently support this feature (03/17/2002) +; Set to 1 if running under IIS. Default is zero. +; http://php.net/fastcgi.impersonate +;fastcgi.impersonate = 1 + +; Disable logging through FastCGI connection. PHP's default behavior is to enable +; this feature. +;fastcgi.logging = 0 + +; cgi.rfc2616_headers configuration option tells PHP what type of headers to +; use when sending HTTP response code. If set to 0, PHP sends Status: header that +; is supported by Apache. When this option is set to 1, PHP will send +; RFC2616 compliant header. +; Default is zero. +; http://php.net/cgi.rfc2616-headers +;cgi.rfc2616_headers = 0 + +; cgi.check_shebang_line controls whether CGI PHP checks for line starting with #! +; (shebang) at the top of the running script. This line might be needed if the +; script support running both as stand-alone script and via PHP CGI<. PHP in CGI +; mode skips this line and ignores its content if this directive is turned on. +; http://php.net/cgi.check-shebang-line +;cgi.check_shebang_line=1 + +;;;;;;;;;;;;;;;; +; File Uploads ; +;;;;;;;;;;;;;;;; + +; Whether to allow HTTP file uploads. +; http://php.net/file-uploads +file_uploads = On + +; Temporary directory for HTTP uploaded files (will use system default if not +; specified). +; http://php.net/upload-tmp-dir +;upload_tmp_dir = + +; Maximum allowed size for uploaded files. +; http://php.net/upload-max-filesize +upload_max_filesize = 200M + +; Maximum number of files that can be uploaded via a single request +max_file_uploads = 20 + +;;;;;;;;;;;;;;;;;; +; Fopen wrappers ; +;;;;;;;;;;;;;;;;;; + +; Whether to allow the treatment of URLs (like http:// or ftp://) as files. +; http://php.net/allow-url-fopen +allow_url_fopen = On + +; Whether to allow include/require to open URLs (like http:// or ftp://) as files. +; http://php.net/allow-url-include +allow_url_include = Off + +; Define the anonymous ftp password (your email address). PHP's default setting +; for this is empty. +; http://php.net/from +;from="john@doe.com" + +; Define the User-Agent string. PHP's default setting for this is empty. +; http://php.net/user-agent +;user_agent="PHP" + +; Default timeout for socket based streams (seconds) +; http://php.net/default-socket-timeout +default_socket_timeout = 600 + +; If your scripts have to deal with files from Macintosh systems, +; or you are running on a Mac and need to deal with files from +; unix or win32 systems, setting this flag will cause PHP to +; automatically detect the EOL character in those files so that +; fgets() and file() will work regardless of the source of the file. +; http://php.net/auto-detect-line-endings +;auto_detect_line_endings = Off + +;;;;;;;;;;;;;;;;;;;;;; +; Dynamic Extensions ; +;;;;;;;;;;;;;;;;;;;;;; + +; If you wish to have an extension loaded automatically, use the following +; syntax: +; +; extension=modulename +; +; For example: +; +; extension=mysqli +; +; When the extension library to load is not located in the default extension +; directory, You may specify an absolute path to the library file: +; +; extension=/path/to/extension/mysqli.so +; +; Note : The syntax used in previous PHP versions ('extension=.so' and +; 'extension='php_.dll') is supported for legacy reasons and may be +; deprecated in a future PHP major version. So, when it is possible, please +; move to the new ('extension=) syntax. +; +; Notes for Windows environments : +; +; - Many DLL files are located in the extensions/ (PHP 4) or ext/ (PHP 5+) +; extension folders as well as the separate PECL DLL download (PHP 5+). +; Be sure to appropriately set the extension_dir directive. +; +;extension=bz2 +;extension=curl +;extension=fileinfo +;extension=gd2 +;extension=gettext +;extension=gmp +;extension=intl +;extension=imap +;extension=interbase +;extension=ldap +;extension=mbstring +;extension=exif ; Must be after mbstring as it depends on it +;extension=mysqli +;extension=oci8_12c ; Use with Oracle Database 12c Instant Client +;extension=odbc +;extension=openssl +;extension=pdo_firebird +;extension=pdo_mysql +;extension=pdo_oci +;extension=pdo_odbc +;extension=pdo_pgsql +;extension=pdo_sqlite +;extension=pgsql +;extension=mongodb.so +;extension=shmop +;extension=morpher + +; The MIBS data available in the PHP distribution must be installed. +; See http://www.php.net/manual/en/snmp.installation.php +;extension=snmp + +;extension=soap +;extension=sockets +;extension=sqlite3 +;extension=tidy +;extension=xmlrpc +;extension=xsl + +;;;;;;;;;;;;;;;;;;; +; Module Settings ; +;;;;;;;;;;;;;;;;;;; + +[CLI Server] +; Whether the CLI web server uses ANSI color coding in its terminal output. +cli_server.color = On + +[Date] +; Defines the default timezone used by the date functions +; http://php.net/date.timezone +date.timezone ="Europe/Moscow" + +; http://php.net/date.default-latitude +;date.default_latitude = 31.7667 + +; http://php.net/date.default-longitude +;date.default_longitude = 35.2333 + +; http://php.net/date.sunrise-zenith +;date.sunrise_zenith = 90.583333 + +; http://php.net/date.sunset-zenith +;date.sunset_zenith = 90.583333 + +[filter] +; http://php.net/filter.default +;filter.default = unsafe_raw + +; http://php.net/filter.default-flags +;filter.default_flags = + +[iconv] +; Use of this INI entry is deprecated, use global input_encoding instead. +; If empty, default_charset or input_encoding or iconv.input_encoding is used. +; The precedence is: default_charset < intput_encoding < iconv.input_encoding +;iconv.input_encoding = + +; Use of this INI entry is deprecated, use global internal_encoding instead. +; If empty, default_charset or internal_encoding or iconv.internal_encoding is used. +; The precedence is: default_charset < internal_encoding < iconv.internal_encoding +;iconv.internal_encoding = + +; Use of this INI entry is deprecated, use global output_encoding instead. +; If empty, default_charset or output_encoding or iconv.output_encoding is used. +; The precedence is: default_charset < output_encoding < iconv.output_encoding +; To use an output encoding conversion, iconv's output handler must be set +; otherwise output encoding conversion cannot be performed. +;iconv.output_encoding = + +[intl] +;intl.default_locale = +; This directive allows you to produce PHP errors when some error +; happens within intl functions. The value is the level of the error produced. +; Default is 0, which does not produce any errors. +;intl.error_level = E_WARNING +;intl.use_exceptions = 0 + +[sqlite3] +;sqlite3.extension_dir = + +[Pcre] +;PCRE library backtracking limit. +; http://php.net/pcre.backtrack-limit +;pcre.backtrack_limit=100000 + +;PCRE library recursion limit. +;Please note that if you set this value to a high number you may consume all +;the available process stack and eventually crash PHP (due to reaching the +;stack size limit imposed by the Operating System). +; http://php.net/pcre.recursion-limit +;pcre.recursion_limit=100000 + +;Enables or disables JIT compilation of patterns. This requires the PCRE +;library to be compiled with JIT support. +;pcre.jit=1 + +[Pdo] +; Whether to pool ODBC connections. Can be one of "strict", "relaxed" or "off" +; http://php.net/pdo-odbc.connection-pooling +;pdo_odbc.connection_pooling=strict + +;pdo_odbc.db2_instance_name + +[Pdo_mysql] +; If mysqlnd is used: Number of cache slots for the internal result set cache +; http://php.net/pdo_mysql.cache_size +pdo_mysql.cache_size = 2000 + +; Default socket name for local MySQL connects. If empty, uses the built-in +; MySQL defaults. +; http://php.net/pdo_mysql.default-socket +pdo_mysql.default_socket= + +[Phar] +; http://php.net/phar.readonly +;phar.readonly = On + +; http://php.net/phar.require-hash +;phar.require_hash = On + +;phar.cache_list = + +[mail function] +; For Win32 only. +; http://php.net/smtp +SMTP = localhost +; http://php.net/smtp-port +smtp_port = 25 + +; For Win32 only. +; http://php.net/sendmail-from +;sendmail_from = me@example.com + +; For Unix only. You may supply arguments as well (default: "sendmail -t -i"). +; http://php.net/sendmail-path +;sendmail_path = + +; Force the addition of the specified parameters to be passed as extra parameters +; to the sendmail binary. These parameters will always replace the value of +; the 5th parameter to mail(). +;mail.force_extra_parameters = + +; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename +mail.add_x_header = Off + +; The path to a log file that will log all mail() calls. Log entries include +; the full path of the script, line number, To address and headers. +;mail.log = +; Log mail to syslog (Event Log on Windows). +;mail.log = syslog + +[ODBC] +; http://php.net/odbc.default-db +;odbc.default_db = Not yet implemented + +; http://php.net/odbc.default-user +;odbc.default_user = Not yet implemented + +; http://php.net/odbc.default-pw +;odbc.default_pw = Not yet implemented + +; Controls the ODBC cursor model. +; Default: SQL_CURSOR_STATIC (default). +;odbc.default_cursortype + +; Allow or prevent persistent links. +; http://php.net/odbc.allow-persistent +odbc.allow_persistent = On + +; Check that a connection is still valid before reuse. +; http://php.net/odbc.check-persistent +odbc.check_persistent = On + +; Maximum number of persistent links. -1 means no limit. +; http://php.net/odbc.max-persistent +odbc.max_persistent = -1 + +; Maximum number of links (persistent + non-persistent). -1 means no limit. +; http://php.net/odbc.max-links +odbc.max_links = -1 + +; Handling of LONG fields. Returns number of bytes to variables. 0 means +; passthru. +; http://php.net/odbc.defaultlrl +odbc.defaultlrl = 4096 + +; Handling of binary data. 0 means passthru, 1 return as is, 2 convert to char. +; See the documentation on odbc_binmode and odbc_longreadlen for an explanation +; of odbc.defaultlrl and odbc.defaultbinmode +; http://php.net/odbc.defaultbinmode +odbc.defaultbinmode = 1 + +;birdstep.max_links = -1 + +[Interbase] +; Allow or prevent persistent links. +ibase.allow_persistent = 1 + +; Maximum number of persistent links. -1 means no limit. +ibase.max_persistent = -1 + +; Maximum number of links (persistent + non-persistent). -1 means no limit. +ibase.max_links = -1 + +; Default database name for ibase_connect(). +;ibase.default_db = + +; Default username for ibase_connect(). +;ibase.default_user = + +; Default password for ibase_connect(). +;ibase.default_password = + +; Default charset for ibase_connect(). +;ibase.default_charset = + +; Default timestamp format. +ibase.timestampformat = "%Y-%m-%d %H:%M:%S" + +; Default date format. +ibase.dateformat = "%Y-%m-%d" + +; Default time format. +ibase.timeformat = "%H:%M:%S" + +[MySQLi] + +; Maximum number of persistent links. -1 means no limit. +; http://php.net/mysqli.max-persistent +mysqli.max_persistent = -1 + +; Allow accessing, from PHP's perspective, local files with LOAD DATA statements +; http://php.net/mysqli.allow_local_infile +;mysqli.allow_local_infile = On + +; Allow or prevent persistent links. +; http://php.net/mysqli.allow-persistent +mysqli.allow_persistent = On + +; Maximum number of links. -1 means no limit. +; http://php.net/mysqli.max-links +mysqli.max_links = -1 + +; If mysqlnd is used: Number of cache slots for the internal result set cache +; http://php.net/mysqli.cache_size +mysqli.cache_size = 2000 + +; Default port number for mysqli_connect(). If unset, mysqli_connect() will use +; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the +; compile-time value defined MYSQL_PORT (in that order). Win32 will only look +; at MYSQL_PORT. +; http://php.net/mysqli.default-port +mysqli.default_port = 3306 + +; Default socket name for local MySQL connects. If empty, uses the built-in +; MySQL defaults. +; http://php.net/mysqli.default-socket +mysqli.default_socket = + +; Default host for mysql_connect() (doesn't apply in safe mode). +; http://php.net/mysqli.default-host +mysqli.default_host = + +; Default user for mysql_connect() (doesn't apply in safe mode). +; http://php.net/mysqli.default-user +mysqli.default_user = + +; Default password for mysqli_connect() (doesn't apply in safe mode). +; Note that this is generally a *bad* idea to store passwords in this file. +; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_pw") +; and reveal this password! And of course, any users with read access to this +; file will be able to reveal the password as well. +; http://php.net/mysqli.default-pw +mysqli.default_pw = + +; Allow or prevent reconnect +mysqli.reconnect = Off + +[mysqlnd] +; Enable / Disable collection of general statistics by mysqlnd which can be +; used to tune and monitor MySQL operations. +; http://php.net/mysqlnd.collect_statistics +mysqlnd.collect_statistics = On + +; Enable / Disable collection of memory usage statistics by mysqlnd which can be +; used to tune and monitor MySQL operations. +; http://php.net/mysqlnd.collect_memory_statistics +mysqlnd.collect_memory_statistics = Off + +; Records communication from all extensions using mysqlnd to the specified log +; file. +; http://php.net/mysqlnd.debug +;mysqlnd.debug = + +; Defines which queries will be logged. +; http://php.net/mysqlnd.log_mask +;mysqlnd.log_mask = 0 + +; Default size of the mysqlnd memory pool, which is used by result sets. +; http://php.net/mysqlnd.mempool_default_size +;mysqlnd.mempool_default_size = 16000 + +; Size of a pre-allocated buffer used when sending commands to MySQL in bytes. +; http://php.net/mysqlnd.net_cmd_buffer_size +;mysqlnd.net_cmd_buffer_size = 2048 + +; Size of a pre-allocated buffer used for reading data sent by the server in +; bytes. +; http://php.net/mysqlnd.net_read_buffer_size +;mysqlnd.net_read_buffer_size = 32768 + +; Timeout for network requests in seconds. +; http://php.net/mysqlnd.net_read_timeout +;mysqlnd.net_read_timeout = 31536000 + +; SHA-256 Authentication Plugin related. File with the MySQL server public RSA +; key. +; http://php.net/mysqlnd.sha256_server_public_key +;mysqlnd.sha256_server_public_key = + +[OCI8] + +; Connection: Enables privileged connections using external +; credentials (OCI_SYSOPER, OCI_SYSDBA) +; http://php.net/oci8.privileged-connect +;oci8.privileged_connect = Off + +; Connection: The maximum number of persistent OCI8 connections per +; process. Using -1 means no limit. +; http://php.net/oci8.max-persistent +;oci8.max_persistent = -1 + +; Connection: The maximum number of seconds a process is allowed to +; maintain an idle persistent connection. Using -1 means idle +; persistent connections will be maintained forever. +; http://php.net/oci8.persistent-timeout +;oci8.persistent_timeout = -1 + +; Connection: The number of seconds that must pass before issuing a +; ping during oci_pconnect() to check the connection validity. When +; set to 0, each oci_pconnect() will cause a ping. Using -1 disables +; pings completely. +; http://php.net/oci8.ping-interval +;oci8.ping_interval = 60 + +; Connection: Set this to a user chosen connection class to be used +; for all pooled server requests with Oracle 11g Database Resident +; Connection Pooling (DRCP). To use DRCP, this value should be set to +; the same string for all web servers running the same application, +; the database pool must be configured, and the connection string must +; specify to use a pooled server. +;oci8.connection_class = + +; High Availability: Using On lets PHP receive Fast Application +; Notification (FAN) events generated when a database node fails. The +; database must also be configured to post FAN events. +;oci8.events = Off + +; Tuning: This option enables statement caching, and specifies how +; many statements to cache. Using 0 disables statement caching. +; http://php.net/oci8.statement-cache-size +;oci8.statement_cache_size = 20 + +; Tuning: Enables statement prefetching and sets the default number of +; rows that will be fetched automatically after statement execution. +; http://php.net/oci8.default-prefetch +;oci8.default_prefetch = 100 + +; Compatibility. Using On means oci_close() will not close +; oci_connect() and oci_new_connect() connections. +; http://php.net/oci8.old-oci-close-semantics +;oci8.old_oci_close_semantics = Off + +[PostgreSQL] +; Allow or prevent persistent links. +; http://php.net/pgsql.allow-persistent +pgsql.allow_persistent = On + +; Detect broken persistent links always with pg_pconnect(). +; Auto reset feature requires a little overheads. +; http://php.net/pgsql.auto-reset-persistent +pgsql.auto_reset_persistent = Off + +; Maximum number of persistent links. -1 means no limit. +; http://php.net/pgsql.max-persistent +pgsql.max_persistent = -1 + +; Maximum number of links (persistent+non persistent). -1 means no limit. +; http://php.net/pgsql.max-links +pgsql.max_links = -1 + +; Ignore PostgreSQL backends Notice message or not. +; Notice message logging require a little overheads. +; http://php.net/pgsql.ignore-notice +pgsql.ignore_notice = 0 + +; Log PostgreSQL backends Notice message or not. +; Unless pgsql.ignore_notice=0, module cannot log notice message. +; http://php.net/pgsql.log-notice +pgsql.log_notice = 0 + +[bcmath] +; Number of decimal digits for all bcmath functions. +; http://php.net/bcmath.scale +bcmath.scale = 0 + +[browscap] +; http://php.net/browscap +;browscap = extra/browscap.ini + +[Session] +; Handler used to store/retrieve data. +; http://php.net/session.save-handler +session.save_handler = files + +; Argument passed to save_handler. In the case of files, this is the path +; where data files are stored. Note: Windows users have to change this +; variable in order to use PHP's session functions. +; +; The path can be defined as: +; +; session.save_path = "N;/path" +; +; where N is an integer. Instead of storing all the session files in +; /path, what this will do is use subdirectories N-levels deep, and +; store the session data in those directories. This is useful if +; your OS has problems with many files in one directory, and is +; a more efficient layout for servers that handle many sessions. +; +; NOTE 1: PHP will not create this directory structure automatically. +; You can use the script in the ext/session dir for that purpose. +; NOTE 2: See the section on garbage collection below if you choose to +; use subdirectories for session storage +; +; The file storage module creates files using mode 600 by default. +; You can change that by using +; +; session.save_path = "N;MODE;/path" +; +; where MODE is the octal representation of the mode. Note that this +; does not overwrite the process's umask. +; http://php.net/session.save-path +;session.save_path = "/var/lib/php/sessions" + +; Whether to use strict session mode. +; Strict session mode does not accept uninitialized session ID and regenerate +; session ID if browser sends uninitialized session ID. Strict mode protects +; applications from session fixation via session adoption vulnerability. It is +; disabled by default for maximum compatibility, but enabling it is encouraged. +; https://wiki.php.net/rfc/strict_sessions +session.use_strict_mode = 0 + +; Whether to use cookies. +; http://php.net/session.use-cookies +session.use_cookies = 1 + +; http://php.net/session.cookie-secure +;session.cookie_secure = + +; This option forces PHP to fetch and use a cookie for storing and maintaining +; the session id. We encourage this operation as it's very helpful in combating +; session hijacking when not specifying and managing your own session id. It is +; not the be-all and end-all of session hijacking defense, but it's a good start. +; http://php.net/session.use-only-cookies +session.use_only_cookies = 1 + +; Name of the session (used as cookie name). +; http://php.net/session.name +session.name = PHPSESSID + +; Initialize session on request startup. +; http://php.net/session.auto-start +session.auto_start = 0 + +; Lifetime in seconds of cookie or, if 0, until browser is restarted. +; http://php.net/session.cookie-lifetime +session.cookie_lifetime = 0 + +; The path for which the cookie is valid. +; http://php.net/session.cookie-path +session.cookie_path = / + +; The domain for which the cookie is valid. +; http://php.net/session.cookie-domain +session.cookie_domain = + +; Whether or not to add the httpOnly flag to the cookie, which makes it inaccessible to browser scripting languages such as JavaScript. +; http://php.net/session.cookie-httponly +session.cookie_httponly = + +; Handler used to serialize data. php is the standard serializer of PHP. +; http://php.net/session.serialize-handler +session.serialize_handler = php + +; Defines the probability that the 'garbage collection' process is started +; on every session initialization. The probability is calculated by using +; gc_probability/gc_divisor. Where session.gc_probability is the numerator +; and gc_divisor is the denominator in the equation. Setting this value to 1 +; when the session.gc_divisor value is 100 will give you approximately a 1% chance +; the gc will run on any give request. +; Default Value: 1 +; Development Value: 1 +; Production Value: 1 +; http://php.net/session.gc-probability +session.gc_probability = 0 + +; Defines the probability that the 'garbage collection' process is started on every +; session initialization. The probability is calculated by using the following equation: +; gc_probability/gc_divisor. Where session.gc_probability is the numerator and +; session.gc_divisor is the denominator in the equation. Setting this value to 1 +; when the session.gc_divisor value is 100 will give you approximately a 1% chance +; the gc will run on any give request. Increasing this value to 1000 will give you +; a 0.1% chance the gc will run on any give request. For high volume production servers, +; this is a more efficient approach. +; Default Value: 100 +; Development Value: 1000 +; Production Value: 1000 +; http://php.net/session.gc-divisor +session.gc_divisor = 1000 + +; After this number of seconds, stored data will be seen as 'garbage' and +; cleaned up by the garbage collection process. +; http://php.net/session.gc-maxlifetime +session.gc_maxlifetime = 1440 + +; NOTE: If you are using the subdirectory option for storing session files +; (see session.save_path above), then garbage collection does *not* +; happen automatically. You will need to do your own garbage +; collection through a shell script, cron entry, or some other method. +; For example, the following script would is the equivalent of +; setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes): +; find /path/to/sessions -cmin +24 -type f | xargs rm + +; Check HTTP Referer to invalidate externally stored URLs containing ids. +; HTTP_REFERER has to contain this substring for the session to be +; considered as valid. +; http://php.net/session.referer-check +session.referer_check = + +; Set to {nocache,private,public,} to determine HTTP caching aspects +; or leave this empty to avoid sending anti-caching headers. +; http://php.net/session.cache-limiter +session.cache_limiter = nocache + +; Document expires after n minutes. +; http://php.net/session.cache-expire +session.cache_expire = 180 + +; trans sid support is disabled by default. +; Use of trans sid may risk your users' security. +; Use this option with caution. +; - User may send URL contains active session ID +; to other person via. email/irc/etc. +; - URL that contains active session ID may be stored +; in publicly accessible computer. +; - User may access your site with the same session ID +; always using URL stored in browser's history or bookmarks. +; http://php.net/session.use-trans-sid +session.use_trans_sid = 0 + +; Set session ID character length. This value could be between 22 to 256. +; Shorter length than default is supported only for compatibility reason. +; Users should use 32 or more chars. +; http://php.net/session.sid-length +; Default Value: 32 +; Development Value: 26 +; Production Value: 26 +session.sid_length = 26 + +; The URL rewriter will look for URLs in a defined set of HTML tags. +;
is special; if you include them here, the rewriter will +; add a hidden field with the info which is otherwise appended +; to URLs. tag's action attribute URL will not be modified +; unless it is specified. +; Note that all valid entries require a "=", even if no value follows. +; Default Value: "a=href,area=href,frame=src,form=" +; Development Value: "a=href,area=href,frame=src,form=" +; Production Value: "a=href,area=href,frame=src,form=" +; http://php.net/url-rewriter.tags +session.trans_sid_tags = "a=href,area=href,frame=src,form=" + +; URL rewriter does not rewrite absolute URLs by default. +; To enable rewrites for absolute pathes, target hosts must be specified +; at RUNTIME. i.e. use ini_set() +; tags is special. PHP will check action attribute's URL regardless +; of session.trans_sid_tags setting. +; If no host is defined, HTTP_HOST will be used for allowed host. +; Example value: php.net,www.php.net,wiki.php.net +; Use "," for multiple hosts. No spaces are allowed. +; Default Value: "" +; Development Value: "" +; Production Value: "" +;session.trans_sid_hosts="" + +; Define how many bits are stored in each character when converting +; the binary hash data to something readable. +; Possible values: +; 4 (4 bits: 0-9, a-f) +; 5 (5 bits: 0-9, a-v) +; 6 (6 bits: 0-9, a-z, A-Z, "-", ",") +; Default Value: 4 +; Development Value: 5 +; Production Value: 5 +; http://php.net/session.hash-bits-per-character +session.sid_bits_per_character = 5 + +; Enable upload progress tracking in $_SESSION +; Default Value: On +; Development Value: On +; Production Value: On +; http://php.net/session.upload-progress.enabled +;session.upload_progress.enabled = On + +; Cleanup the progress information as soon as all POST data has been read +; (i.e. upload completed). +; Default Value: On +; Development Value: On +; Production Value: On +; http://php.net/session.upload-progress.cleanup +;session.upload_progress.cleanup = On + +; A prefix used for the upload progress key in $_SESSION +; Default Value: "upload_progress_" +; Development Value: "upload_progress_" +; Production Value: "upload_progress_" +; http://php.net/session.upload-progress.prefix +;session.upload_progress.prefix = "upload_progress_" + +; The index name (concatenated with the prefix) in $_SESSION +; containing the upload progress information +; Default Value: "PHP_SESSION_UPLOAD_PROGRESS" +; Development Value: "PHP_SESSION_UPLOAD_PROGRESS" +; Production Value: "PHP_SESSION_UPLOAD_PROGRESS" +; http://php.net/session.upload-progress.name +;session.upload_progress.name = "PHP_SESSION_UPLOAD_PROGRESS" + +; How frequently the upload progress should be updated. +; Given either in percentages (per-file), or in bytes +; Default Value: "1%" +; Development Value: "1%" +; Production Value: "1%" +; http://php.net/session.upload-progress.freq +;session.upload_progress.freq = "1%" + +; The minimum delay between updates, in seconds +; Default Value: 1 +; Development Value: 1 +; Production Value: 1 +; http://php.net/session.upload-progress.min-freq +;session.upload_progress.min_freq = "1" + +; Only write session data when session data is changed. Enabled by default. +; http://php.net/session.lazy-write +;session.lazy_write = On + +[Assertion] +; Switch whether to compile assertions at all (to have no overhead at run-time) +; -1: Do not compile at all +; 0: Jump over assertion at run-time +; 1: Execute assertions +; Changing from or to a negative value is only possible in php.ini! (For turning assertions on and off at run-time, see assert.active, when zend.assertions = 1) +; Default Value: 1 +; Development Value: 1 +; Production Value: -1 +; http://php.net/zend.assertions +zend.assertions = -1 + +; Assert(expr); active by default. +; http://php.net/assert.active +;assert.active = On + +; Throw an AssertationException on failed assertions +; http://php.net/assert.exception +;assert.exception = On + +; Issue a PHP warning for each failed assertion. (Overridden by assert.exception if active) +; http://php.net/assert.warning +;assert.warning = On + +; Don't bail out by default. +; http://php.net/assert.bail +;assert.bail = Off + +; User-function to be called if an assertion fails. +; http://php.net/assert.callback +;assert.callback = 0 + +; Eval the expression with current error_reporting(). Set to true if you want +; error_reporting(0) around the eval(). +; http://php.net/assert.quiet-eval +;assert.quiet_eval = 0 + +[COM] +; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs +; http://php.net/com.typelib-file +;com.typelib_file = + +; allow Distributed-COM calls +; http://php.net/com.allow-dcom +;com.allow_dcom = true + +; autoregister constants of a components typlib on com_load() +; http://php.net/com.autoregister-typelib +;com.autoregister_typelib = true + +; register constants casesensitive +; http://php.net/com.autoregister-casesensitive +;com.autoregister_casesensitive = false + +; show warnings on duplicate constant registrations +; http://php.net/com.autoregister-verbose +;com.autoregister_verbose = true + +; The default character set code-page to use when passing strings to and from COM objects. +; Default: system ANSI code page +;com.code_page= + +[mbstring] +; language for internal character representation. +; This affects mb_send_mail() and mbstring.detect_order. +; http://php.net/mbstring.language +;mbstring.language = Japanese + +; Use of this INI entry is deprecated, use global internal_encoding instead. +; internal/script encoding. +; Some encoding cannot work as internal encoding. (e.g. SJIS, BIG5, ISO-2022-*) +; If empty, default_charset or internal_encoding or iconv.internal_encoding is used. +; The precedence is: default_charset < internal_encoding < iconv.internal_encoding +;mbstring.internal_encoding = + +; Use of this INI entry is deprecated, use global input_encoding instead. +; http input encoding. +; mbstring.encoding_traslation = On is needed to use this setting. +; If empty, default_charset or input_encoding or mbstring.input is used. +; The precedence is: default_charset < intput_encoding < mbsting.http_input +; http://php.net/mbstring.http-input +;mbstring.http_input = + +; Use of this INI entry is deprecated, use global output_encoding instead. +; http output encoding. +; mb_output_handler must be registered as output buffer to function. +; If empty, default_charset or output_encoding or mbstring.http_output is used. +; The precedence is: default_charset < output_encoding < mbstring.http_output +; To use an output encoding conversion, mbstring's output handler must be set +; otherwise output encoding conversion cannot be performed. +; http://php.net/mbstring.http-output +;mbstring.http_output = + +; enable automatic encoding translation according to +; mbstring.internal_encoding setting. Input chars are +; converted to internal encoding by setting this to On. +; Note: Do _not_ use automatic encoding translation for +; portable libs/applications. +; http://php.net/mbstring.encoding-translation +;mbstring.encoding_translation = Off + +; automatic encoding detection order. +; "auto" detect order is changed according to mbstring.language +; http://php.net/mbstring.detect-order +;mbstring.detect_order = auto + +; substitute_character used when character cannot be converted +; one from another +; http://php.net/mbstring.substitute-character +;mbstring.substitute_character = none + +; overload(replace) single byte functions by mbstring functions. +; mail(), ereg(), etc are overloaded by mb_send_mail(), mb_ereg(), +; etc. Possible values are 0,1,2,4 or combination of them. +; For example, 7 for overload everything. +; 0: No overload +; 1: Overload mail() function +; 2: Overload str*() functions +; 4: Overload ereg*() functions +; http://php.net/mbstring.func-overload +;mbstring.func_overload = 0 + +; enable strict encoding detection. +; Default: Off +;mbstring.strict_detection = On + +; This directive specifies the regex pattern of content types for which mb_output_handler() +; is activated. +; Default: mbstring.http_output_conv_mimetype=^(text/|application/xhtml\+xml) +;mbstring.http_output_conv_mimetype= + +[gd] +; Tell the jpeg decode to ignore warnings and try to create +; a gd image. The warning will then be displayed as notices +; disabled by default +; http://php.net/gd.jpeg-ignore-warning +;gd.jpeg_ignore_warning = 1 + +[exif] +; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS. +; With mbstring support this will automatically be converted into the encoding +; given by corresponding encode setting. When empty mbstring.internal_encoding +; is used. For the decode settings you can distinguish between motorola and +; intel byte order. A decode setting cannot be empty. +; http://php.net/exif.encode-unicode +;exif.encode_unicode = ISO-8859-15 + +; http://php.net/exif.decode-unicode-motorola +;exif.decode_unicode_motorola = UCS-2BE + +; http://php.net/exif.decode-unicode-intel +;exif.decode_unicode_intel = UCS-2LE + +; http://php.net/exif.encode-jis +;exif.encode_jis = + +; http://php.net/exif.decode-jis-motorola +;exif.decode_jis_motorola = JIS + +; http://php.net/exif.decode-jis-intel +;exif.decode_jis_intel = JIS + +[Tidy] +; The path to a default tidy configuration file to use when using tidy +; http://php.net/tidy.default-config +;tidy.default_config = /usr/local/lib/php/default.tcfg + +; Should tidy clean and repair output automatically? +; WARNING: Do not use this option if you are generating non-html content +; such as dynamic images +; http://php.net/tidy.clean-output +tidy.clean_output = Off + +[soap] +; Enables or disables WSDL caching feature. +; http://php.net/soap.wsdl-cache-enabled +soap.wsdl_cache_enabled=1 + +; Sets the directory name where SOAP extension will put cache files. +; http://php.net/soap.wsdl-cache-dir +soap.wsdl_cache_dir="/tmp" + +; (time to live) Sets the number of second while cached file will be used +; instead of original one. +; http://php.net/soap.wsdl-cache-ttl +soap.wsdl_cache_ttl=86400 + +; Sets the size of the cache limit. (Max. number of WSDL files to cache) +soap.wsdl_cache_limit = 5 + +[sysvshm] +; A default size of the shared memory segment +;sysvshm.init_mem = 10000 + +[ldap] +; Sets the maximum number of open links or -1 for unlimited. +ldap.max_links = -1 + +[dba] +;dba.default_handler= + +[opcache] +; Determines if Zend OPCache is enabled +;opcache.enable=1 + +; Determines if Zend OPCache is enabled for the CLI version of PHP +;opcache.enable_cli=0 + +; The OPcache shared memory storage size. +;opcache.memory_consumption=128 + +; The amount of memory for interned strings in Mbytes. +;opcache.interned_strings_buffer=8 + +; The maximum number of keys (scripts) in the OPcache hash table. +; Only numbers between 200 and 1000000 are allowed. +;opcache.max_accelerated_files=10000 + +; The maximum percentage of "wasted" memory until a restart is scheduled. +;opcache.max_wasted_percentage=5 + +; When this directive is enabled, the OPcache appends the current working +; directory to the script key, thus eliminating possible collisions between +; files with the same name (basename). Disabling the directive improves +; performance, but may break existing applications. +;opcache.use_cwd=1 + +; When disabled, you must reset the OPcache manually or restart the +; webserver for changes to the filesystem to take effect. +;opcache.validate_timestamps=1 + +; How often (in seconds) to check file timestamps for changes to the shared +; memory storage allocation. ("1" means validate once per second, but only +; once per request. "0" means always validate) +;opcache.revalidate_freq=2 + +; Enables or disables file search in include_path optimization +;opcache.revalidate_path=0 + +; If disabled, all PHPDoc comments are dropped from the code to reduce the +; size of the optimized code. +;opcache.save_comments=1 + +; Allow file existence override (file_exists, etc.) performance feature. +;opcache.enable_file_override=0 + +; A bitmask, where each bit enables or disables the appropriate OPcache +; passes +;opcache.optimization_level=0xffffffff + +;opcache.inherited_hack=1 +;opcache.dups_fix=0 + +; The location of the OPcache blacklist file (wildcards allowed). +; Each OPcache blacklist file is a text file that holds the names of files +; that should not be accelerated. The file format is to add each filename +; to a new line. The filename may be a full path or just a file prefix +; (i.e., /var/www/x blacklists all the files and directories in /var/www +; that start with 'x'). Line starting with a ; are ignored (comments). +;opcache.blacklist_filename= + +; Allows exclusion of large files from being cached. By default all files +; are cached. +;opcache.max_file_size=0 + +; Check the cache checksum each N requests. +; The default value of "0" means that the checks are disabled. +;opcache.consistency_checks=0 + +; How long to wait (in seconds) for a scheduled restart to begin if the cache +; is not being accessed. +;opcache.force_restart_timeout=180 + +; OPcache error_log file name. Empty string assumes "stderr". +;opcache.error_log= + +; All OPcache errors go to the Web server log. +; By default, only fatal errors (level 0) or errors (level 1) are logged. +; You can also enable warnings (level 2), info messages (level 3) or +; debug messages (level 4). +;opcache.log_verbosity_level=1 + +; Preferred Shared Memory back-end. Leave empty and let the system decide. +;opcache.preferred_memory_model= + +; Protect the shared memory from unexpected writing during script execution. +; Useful for internal debugging only. +;opcache.protect_memory=0 + +; Allows calling OPcache API functions only from PHP scripts which path is +; started from specified string. The default "" means no restriction +;opcache.restrict_api= + +; Mapping base of shared memory segments (for Windows only). All the PHP +; processes have to map shared memory into the same address space. This +; directive allows to manually fix the "Unable to reattach to base address" +; errors. +;opcache.mmap_base= + +; Enables and sets the second level cache directory. +; It should improve performance when SHM memory is full, at server restart or +; SHM reset. The default "" disables file based caching. +;opcache.file_cache= + +; Enables or disables opcode caching in shared memory. +;opcache.file_cache_only=0 + +; Enables or disables checksum validation when script loaded from file cache. +;opcache.file_cache_consistency_checks=1 + +; Implies opcache.file_cache_only=1 for a certain process that failed to +; reattach to the shared memory (for Windows only). Explicitly enabled file +; cache is required. +;opcache.file_cache_fallback=1 + +; Enables or disables copying of PHP code (text segment) into HUGE PAGES. +; This should improve performance, but requires appropriate OS configuration. +;opcache.huge_code_pages=1 + +; Validate cached file permissions. +;opcache.validate_permission=0 + +; Prevent name collisions in chroot'ed environment. +;opcache.validate_root=0 + +; If specified, it produces opcode dumps for debugging different stages of +; optimizations. +;opcache.opt_debug_level=0 + +[curl] +; A default value for the CURLOPT_CAINFO option. This is required to be an +; absolute path. +;curl.cainfo = + +[openssl] +; The location of a Certificate Authority (CA) file on the local filesystem +; to use when verifying the identity of SSL/TLS peers. Most users should +; not specify a value for this directive as PHP will attempt to use the +; OS-managed cert stores in its absence. If specified, this value may still +; be overridden on a per-stream basis via the "cafile" SSL stream context +; option. +;openssl.cafile= + +; If openssl.cafile is not specified or if the CA file is not found, the +; directory pointed to by openssl.capath is searched for a suitable +; certificate. This value must be a correctly hashed certificate directory. +; Most users should not specify a value for this directive as PHP will +; attempt to use the OS-managed cert stores in its absence. If specified, +; this value may still be overridden on a per-stream basis via the "capath" +; SSL stream context option. +;openssl.capath= + +; Local Variables: +; tab-width: 4 +; End: + +max_execution_time=1000 +max_input_time=1000 +xdebug.mode=coverage,debug +xdebug.log="/var/www/xdebug.log" +xdebug.remote_enable=1s +xdebug.start_with_request=yes diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml new file mode 100644 index 00000000..a693895b --- /dev/null +++ b/docker/docker-compose.yml @@ -0,0 +1,40 @@ +version: "3.8" +networks: + shareit: + driver: bridge +services: + app: + build: + context: ./ + dockerfile: ./_docker/app/Dockerfile + image: shareit-app + tty: true + container_name: shareit-app + restart: unless-stopped + working_dir: /var/www/ + volumes: + - ./_docker/app/php.ini:/usr/local/etc/php/php.ini + - ./:/var/www + networks: + - shareit + db: + image: postgres:13 + container_name: shareit-db + restart: unless-stopped + environment: + PGDATA: /var/lib/postgresql/data + POSTGRES_USER: postgres + POSTGRES_PASSWORD: postgres + POSTGRES_DB: java-shareit + POSTGRES_HOST_AUTH_METHOD: trust + ports: + - 5433:5432 + volumes: + - 'shareit-pgdata:/var/lib/postgresql/data' + - './temp:/temp' + networks: + - shareit +volumes: + shareit-pgdata: + external: true + diff --git a/pom.xml b/pom.xml index 2db888c5..4d055db3 100644 --- a/pom.xml +++ b/pom.xml @@ -33,24 +33,11 @@ spring-boot-configuration-processor true - - - org.postgresql - postgresql - runtime - - org.projectlombok lombok true - - - com.h2database - h2 - test - org.springframework.boot spring-boot-starter-test @@ -60,6 +47,18 @@ org.springframework.boot spring-boot-starter-validation + + org.springframework.boot + spring-boot-starter-jdbc + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.postgresql + postgresql + diff --git a/src/main/java/ru/practicum/shareit/ShareItApp.java b/src/main/java/ru/practicum/shareit/ShareItApp.java index a00ad567..a10a87da 100644 --- a/src/main/java/ru/practicum/shareit/ShareItApp.java +++ b/src/main/java/ru/practicum/shareit/ShareItApp.java @@ -6,8 +6,8 @@ @SpringBootApplication public class ShareItApp { - public static void main(String[] args) { - SpringApplication.run(ShareItApp.class, args); - } + public static void main(String[] args) { + SpringApplication.run(ShareItApp.class, args); + } } diff --git a/src/main/java/ru/practicum/shareit/base/BaseRepository.java b/src/main/java/ru/practicum/shareit/base/BaseRepository.java new file mode 100644 index 00000000..fc2fae32 --- /dev/null +++ b/src/main/java/ru/practicum/shareit/base/BaseRepository.java @@ -0,0 +1,101 @@ +package ru.practicum.shareit.base; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.dao.EmptyResultDataAccessException; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.core.RowMapper; +import org.springframework.jdbc.support.GeneratedKeyHolder; +import org.springframework.jdbc.support.KeyHolder; +import ru.practicum.shareit.base.exception.InternalServerException; + +import java.sql.PreparedStatement; +import java.sql.Statement; +import java.util.Collection; +import java.util.Objects; +import java.util.Optional; + +@RequiredArgsConstructor +@Slf4j +public class BaseRepository { + protected final JdbcTemplate jdbc; + protected final RowMapper mapper; + + /** + * Возвращает коллекцию результатов + * + * @param query Запрос + * @param params Параметры запроса + * @return Список + */ + protected Collection get(String query, Object... params) { + return jdbc.query(query, mapper, params); + } + + /** + * Возвращает один результат + * + * @param query Запрос + * @param params Параметры запроса + * @return Строка + */ + protected Optional find(String query, Object... params) { + try { + Collection results = jdbc.query(query, mapper, params); + if (results.isEmpty()) { + return Optional.empty(); + } + return results.stream().findFirst(); + } catch (EmptyResultDataAccessException ignored) { + log.error("При вызове метода [find] произошла ошибка: EmptyResultDataAccessException"); + return Optional.empty(); + } + } + + /** + * Возвращает количество + * + * @param query Запрос + * @param params Параметры запроса + * @return Строка + */ + protected Integer count(String query, Object... params) { + try { + return jdbc.queryForObject(query, Integer.class, params); + } catch (EmptyResultDataAccessException ignored) { + log.error("При вызове метода [count] произошла ошибка: EmptyResultDataAccessException"); + return 0; + } + } + + protected Long create(String query, Object... params) { + KeyHolder keyHolder = new GeneratedKeyHolder(); + jdbc.update(connection -> { + PreparedStatement ps = connection.prepareStatement(query, Statement.RETURN_GENERATED_KEYS); + for (int i = 0; i < params.length; i++) { + ps.setObject(i + 1, params[i]); + } + return ps; + }, keyHolder); + try { + return (Long) Objects.requireNonNull(keyHolder.getKeys()).get("ID"); + } catch (NullPointerException exception) { + log.error("При вызове метода [create] произошла ошибка: " + exception.getMessage()); + return null; + } + } + + protected void update(String query, Object... params) { + int rows = jdbc.update(query, params); + if (rows == 0) { + throw new InternalServerException("Не удалось обновить данные"); + } + } + + protected void delete(String query, Object... params) { + int rows = jdbc.update(query, params); + if (rows == 0) { + throw new InternalServerException("Не удалось удалить данные"); + } + } +} diff --git a/src/main/java/ru/practicum/shareit/base/ErrorHandler.java b/src/main/java/ru/practicum/shareit/base/ErrorHandler.java new file mode 100644 index 00000000..038537d9 --- /dev/null +++ b/src/main/java/ru/practicum/shareit/base/ErrorHandler.java @@ -0,0 +1,34 @@ +package ru.practicum.shareit.base; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestControllerAdvice; +import ru.practicum.shareit.base.exception.NotFoundException; +import ru.practicum.shareit.base.exception.ValidationException; + +@Slf4j +@RestControllerAdvice +public class ErrorHandler { + @ExceptionHandler + @ResponseStatus(HttpStatus.NOT_FOUND) + public ErrorResponse handleNotFound(final NotFoundException e) { + log.error("NotFoundException: " + e.getMessage()); + return new ErrorResponse("Данные не найдены", e.getMessage()); + } + + @ExceptionHandler + @ResponseStatus(HttpStatus.BAD_REQUEST) + public ErrorResponse handleValidation(final ValidationException e) { + log.error("ValidationException: " + e.getMessage() + "\n" + e.getErrors().toString()); + return new ErrorResponse("Неверные параметры запроса", e.getMessage(), e.getErrors()); + } + + @ExceptionHandler + @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR) + public ErrorResponse handle(final Throwable e) { + log.error("Throwable: " + e.getMessage()); + return new ErrorResponse("Ошибка", e.getMessage()); + } +} diff --git a/src/main/java/ru/practicum/shareit/base/ErrorResponse.java b/src/main/java/ru/practicum/shareit/base/ErrorResponse.java new file mode 100644 index 00000000..adb9a839 --- /dev/null +++ b/src/main/java/ru/practicum/shareit/base/ErrorResponse.java @@ -0,0 +1,24 @@ +package ru.practicum.shareit.base; + +import lombok.Getter; + +import java.util.ArrayList; + +@Getter +public class ErrorResponse { + private final String error; + private final String description; + private final ArrayList messages; + + public ErrorResponse(String error, String description) { + this.error = error; + this.description = description; + messages = new ArrayList<>(); + } + + public ErrorResponse(String error, String description, ArrayList messages) { + this.error = error; + this.description = description; + this.messages = messages; + } +} diff --git a/src/main/java/ru/practicum/shareit/base/Helper.java b/src/main/java/ru/practicum/shareit/base/Helper.java new file mode 100644 index 00000000..e2a28628 --- /dev/null +++ b/src/main/java/ru/practicum/shareit/base/Helper.java @@ -0,0 +1,17 @@ +package ru.practicum.shareit.base; + +import java.util.HashMap; + +public final class Helper { + private Helper() { + } + + public static Long nextId(HashMap items) { + long currentMaxId = items.keySet() + .stream() + .mapToLong(id -> id) + .max() + .orElse(0); + return ++currentMaxId; + } +} diff --git a/src/main/java/ru/practicum/shareit/base/exception/InternalServerException.java b/src/main/java/ru/practicum/shareit/base/exception/InternalServerException.java new file mode 100644 index 00000000..ab4f177e --- /dev/null +++ b/src/main/java/ru/practicum/shareit/base/exception/InternalServerException.java @@ -0,0 +1,7 @@ +package ru.practicum.shareit.base.exception; + +public class InternalServerException extends RuntimeException { + public InternalServerException(String message) { + super(message); + } +} diff --git a/src/main/java/ru/practicum/shareit/base/exception/NotFoundException.java b/src/main/java/ru/practicum/shareit/base/exception/NotFoundException.java new file mode 100644 index 00000000..050eaedb --- /dev/null +++ b/src/main/java/ru/practicum/shareit/base/exception/NotFoundException.java @@ -0,0 +1,7 @@ +package ru.practicum.shareit.base.exception; + +public class NotFoundException extends RuntimeException { + public NotFoundException(String message) { + super(message); + } +} diff --git a/src/main/java/ru/practicum/shareit/base/exception/ValidationException.java b/src/main/java/ru/practicum/shareit/base/exception/ValidationException.java new file mode 100644 index 00000000..d6815a46 --- /dev/null +++ b/src/main/java/ru/practicum/shareit/base/exception/ValidationException.java @@ -0,0 +1,20 @@ +package ru.practicum.shareit.base.exception; + +import lombok.Getter; + +import java.util.ArrayList; + +@Getter +public class ValidationException extends RuntimeException { + private final ArrayList errors; + + public ValidationException(String message) { + super(message); + this.errors = new ArrayList<>(); + } + + public ValidationException(String message, ArrayList errors) { + super(message); + this.errors = errors; + } +} \ No newline at end of file diff --git a/src/main/java/ru/practicum/shareit/base/helpers/DateTimeHelper.java b/src/main/java/ru/practicum/shareit/base/helpers/DateTimeHelper.java new file mode 100644 index 00000000..cd388099 --- /dev/null +++ b/src/main/java/ru/practicum/shareit/base/helpers/DateTimeHelper.java @@ -0,0 +1,39 @@ +package ru.practicum.shareit.base.helpers; + +import java.sql.Timestamp; +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; +import java.util.Locale; + +public class DateTimeHelper { + public static Instant toInstant(String input) { + if (input == null) { + return null; + } + String pattern = "yyyy-MM-dd'T'HH:mm:ss"; + DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(pattern, Locale.US); + LocalDateTime localDateTime = LocalDateTime.parse(input, dateTimeFormatter); + ZonedDateTime zonedDateTime = localDateTime.atZone(ZoneId.systemDefault()); + return zonedDateTime.toInstant(); + } + + public static Instant toInstant(Timestamp timestamp) { + if (timestamp == null) { + return null; + } + return timestamp.toInstant(); + } + + public static String toString(Instant instant) { + if (instant == null) { + return null; + } + return DateTimeFormatter + .ofPattern("yyyy-MM-dd'T'HH:mm:ss") + .withZone(ZoneId.systemDefault()) + .format(instant); + } +} diff --git a/src/main/java/ru/practicum/shareit/booking/Booking.java b/src/main/java/ru/practicum/shareit/booking/Booking.java index 2d9c6668..98fc3e0d 100644 --- a/src/main/java/ru/practicum/shareit/booking/Booking.java +++ b/src/main/java/ru/practicum/shareit/booking/Booking.java @@ -1,7 +1,36 @@ package ru.practicum.shareit.booking; -/** - * TODO Sprint add-bookings. - */ +import jakarta.persistence.*; +import lombok.Data; +import ru.practicum.shareit.booking.enums.BookingStatus; +import ru.practicum.shareit.item.model.Item; +import ru.practicum.shareit.user.User; + +import java.time.Instant; + +@Data +@Entity +@Table(name = "bookings") public class Booking { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "date_start", nullable = false) + private Instant start; + + @Column(name = "date_end", nullable = false) + private Instant end; + + @Column(nullable = false) + @Enumerated(EnumType.STRING) + private BookingStatus status = BookingStatus.WAITING; + + private String review; + + @ManyToOne(fetch = FetchType.LAZY) + private User user; + + @ManyToOne(fetch = FetchType.LAZY) + private Item item; } diff --git a/src/main/java/ru/practicum/shareit/booking/BookingController.java b/src/main/java/ru/practicum/shareit/booking/BookingController.java index b94493d4..f3aa2fa4 100644 --- a/src/main/java/ru/practicum/shareit/booking/BookingController.java +++ b/src/main/java/ru/practicum/shareit/booking/BookingController.java @@ -1,7 +1,12 @@ package ru.practicum.shareit.booking; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import ru.practicum.shareit.booking.dto.BookingDto; +import ru.practicum.shareit.booking.dto.RequestBookingDto; +import ru.practicum.shareit.booking.enums.BookingFilterState; + +import java.util.Collection; /** * TODO Sprint add-bookings. @@ -9,4 +14,42 @@ @RestController @RequestMapping(path = "/bookings") public class BookingController { + private final BookingService bookingService; + + @Autowired + BookingController(BookingService bookingService) { + this.bookingService = bookingService; + } + + @GetMapping + public Collection getAllBookings(@RequestHeader("X-Sharer-User-Id") Long userId, + @RequestParam(required = false) BookingFilterState state) { + return bookingService.getAllBookings(userId, state != null ? state : BookingFilterState.ALL); + } + + @GetMapping("/owner") + public Collection getAllBookingsByOwner(@RequestHeader("X-Sharer-User-Id") Long ownerId, + @RequestParam(required = false) BookingFilterState state) { + return bookingService.getAllBookingsByOwner(ownerId, state != null ? state : BookingFilterState.ALL); + } + + + @GetMapping("/{bookingId}") + public BookingDto find(@RequestHeader("X-Sharer-User-Id") Long userId, + @PathVariable long bookingId) { + return bookingService.find(bookingId, userId); + } + + @PostMapping + public BookingDto create(@RequestHeader("X-Sharer-User-Id") Long userId, + @RequestBody RequestBookingDto request) { + return bookingService.create(userId, request); + } + + @PatchMapping("/{bookingId}") + public BookingDto changeStatus(@RequestHeader("X-Sharer-User-Id") Long ownerId, + @PathVariable long bookingId, + @RequestParam boolean approved) { + return bookingService.changeStatus(ownerId, bookingId, approved); + } } diff --git a/src/main/java/ru/practicum/shareit/booking/BookingMapper.java b/src/main/java/ru/practicum/shareit/booking/BookingMapper.java new file mode 100644 index 00000000..46536961 --- /dev/null +++ b/src/main/java/ru/practicum/shareit/booking/BookingMapper.java @@ -0,0 +1,46 @@ +package ru.practicum.shareit.booking; + +import ru.practicum.shareit.base.helpers.DateTimeHelper; +import ru.practicum.shareit.booking.dto.BookingDto; +import ru.practicum.shareit.booking.dto.RequestBookingDto; +import ru.practicum.shareit.booking.enums.BookingStatus; +import ru.practicum.shareit.item.mapper.ItemMapper; +import ru.practicum.shareit.user.UserMapper; + +public class BookingMapper { + public static BookingDto toDto(Booking booking) { + return new BookingDto( + booking.getId(), + DateTimeHelper.toString(booking.getStart()), + DateTimeHelper.toString(booking.getEnd()), + booking.getStatus(), + booking.getReview(), + UserMapper.toDto(booking.getUser()), + ItemMapper.toDto(booking.getItem()) + ); + } + + public static Booking requestToModel(RequestBookingDto dto) { + Booking model = new Booking(); + model.setId(dto.getId()); + model.setStart(DateTimeHelper.toInstant(dto.getStart())); + model.setEnd(DateTimeHelper.toInstant(dto.getEnd())); + model.setStatus(dto.getStatus()); + model.setReview(dto.getReview()); + model.setStatus(dto.getStatus() == null ? BookingStatus.WAITING : dto.getStatus()); + return model; + } + + public static Booking toModel(BookingDto dto) { + Booking model = new Booking(); + model.setId(dto.getId()); + model.setUser(UserMapper.toModel(dto.getBooker())); + model.setItem(ItemMapper.toModel(dto.getItem())); + model.setStart(DateTimeHelper.toInstant(dto.getStart())); + model.setEnd(DateTimeHelper.toInstant(dto.getEnd())); + model.setStatus(dto.getStatus()); + model.setReview(dto.getReview()); + model.setStatus(dto.getStatus() == null ? BookingStatus.WAITING : dto.getStatus()); + return model; + } +} diff --git a/src/main/java/ru/practicum/shareit/booking/BookingRepository.java b/src/main/java/ru/practicum/shareit/booking/BookingRepository.java new file mode 100644 index 00000000..c7823dce --- /dev/null +++ b/src/main/java/ru/practicum/shareit/booking/BookingRepository.java @@ -0,0 +1,21 @@ +package ru.practicum.shareit.booking; + +import org.springframework.data.jpa.repository.JpaRepository; +import ru.practicum.shareit.booking.enums.BookingStatus; + +import java.time.Instant; +import java.util.Collection; + +public interface BookingRepository extends JpaRepository { + Collection findByUserId(Long userId); + + Collection findByUserIdAndStatus(Long userId, BookingStatus bookingState); + + Collection findByItemIdAndUserIdAndStatusAndEndLessThan(Long itemId, Long userId, BookingStatus bookingState, Instant now); + + Collection findByUserIdAndStartLessThanEqualAndEndGreaterThan(Long userId, Instant now, Instant now1); + + Collection findByUserIdAndEndLessThan(Long userId, Instant now); + + Collection findByUserIdAndStartGreaterThan(Long userId, Instant now); +} diff --git a/src/main/java/ru/practicum/shareit/booking/BookingService.java b/src/main/java/ru/practicum/shareit/booking/BookingService.java new file mode 100644 index 00000000..75751dcc --- /dev/null +++ b/src/main/java/ru/practicum/shareit/booking/BookingService.java @@ -0,0 +1,70 @@ +package ru.practicum.shareit.booking; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Service; +import ru.practicum.shareit.booking.dto.BookingDto; +import ru.practicum.shareit.booking.dto.RequestBookingDto; +import ru.practicum.shareit.booking.enums.BookingFilterState; +import ru.practicum.shareit.booking.storage.BookingStorage; + +import java.util.Collection; +import java.util.stream.Collectors; + +@Service +@Slf4j +public class BookingService { + @Qualifier("dbBookingStorage") + private final BookingStorage storage; + + private final BookingValidator bookingValidator; + + @Autowired + BookingService(@Qualifier("dbBookingStorage") BookingStorage storage, + BookingValidator bookingValidator) { + this.storage = storage; + this.bookingValidator = bookingValidator; + } + + public Collection getAllBookings(Long userId, BookingFilterState state) { + return storage + .getAllBookings(userId, state) + .stream() + .map(BookingMapper::toDto) + .collect(Collectors.toList()); + } + + public Collection getAllBookingsByOwner(Long ownerId, BookingFilterState state) { + bookingValidator.checkAndGetUser(ownerId); + return storage + .getAllBookingsByOwner(ownerId, state) + .stream() + .map(BookingMapper::toDto) + .collect(Collectors.toList()); + } + + public BookingDto find(Long bookingId, Long userId) { + Booking booking = bookingValidator.checkByUserOrOwner(userId, bookingId); + return BookingMapper.toDto(booking); + } + + public BookingDto create(Long userId, RequestBookingDto request) { + Booking booking = bookingValidator.checkByUser(userId, request); + booking = storage.create(booking); + log.info("Бронирование запрошено (ID={})", booking.getId()); + return BookingMapper.toDto(booking); + } + + public BookingDto changeStatus(Long ownerId, Long bookingId, boolean approved) { + Booking booking = bookingValidator.checkByOwner(ownerId, bookingId); + if (approved) { + booking = storage.approved(booking); + log.info("Бронь подтверждена владельцем (ID={})", bookingId); + return BookingMapper.toDto(booking); + } + booking = storage.rejected(booking); + log.info("Бронь Отклонена владельцем (ID={})", bookingId); + return BookingMapper.toDto(booking); + } +} diff --git a/src/main/java/ru/practicum/shareit/booking/BookingValidator.java b/src/main/java/ru/practicum/shareit/booking/BookingValidator.java new file mode 100644 index 00000000..2850418e --- /dev/null +++ b/src/main/java/ru/practicum/shareit/booking/BookingValidator.java @@ -0,0 +1,134 @@ +package ru.practicum.shareit.booking; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Service; +import ru.practicum.shareit.base.exception.NotFoundException; +import ru.practicum.shareit.base.exception.ValidationException; +import ru.practicum.shareit.base.helpers.DateTimeHelper; +import ru.practicum.shareit.booking.dto.RequestBookingDto; +import ru.practicum.shareit.booking.storage.BookingStorage; +import ru.practicum.shareit.item.model.Item; +import ru.practicum.shareit.item.storage.ItemStorage; +import ru.practicum.shareit.user.User; +import ru.practicum.shareit.user.storage.UserStorage; + +import java.time.Instant; +import java.util.Optional; + +@Service +@Slf4j +public class BookingValidator { + @Qualifier("dbItemStorage") + private final ItemStorage itemStorage; + @Qualifier("dbUserStorage") + private final UserStorage userStorage; + @Qualifier("dbBookingStorage") + private final BookingStorage bookingStorage; + + @Autowired + BookingValidator(@Qualifier("dbItemStorage") ItemStorage itemStorage, + @Qualifier("dbUserStorage") UserStorage userStorage, + @Qualifier("dbBookingStorage") BookingStorage bookingStorage) { + this.itemStorage = itemStorage; + this.userStorage = userStorage; + this.bookingStorage = bookingStorage; + } + + public Booking checkByUser(Long userId, RequestBookingDto request) { + User user = checkAndGetUser(userId); + checkDate(request); + Item item = checkAndGetItem(request.getItemId()); + checkItemAvailable(item); + Booking booking = BookingMapper.requestToModel(request); + booking.setUser(user); + booking.setItem(item); + return booking; + } + + public Booking checkByOwner(Long ownerId, Long bookingId) { + Booking booking = checkAndGetBooking(bookingId); + checkItemsOwner(booking.getItem(), ownerId); + return booking; + } + + public Booking checkByUserOrOwner(Long userId, Long bookingId) { + Booking booking = checkAndGetBooking(bookingId); + checkItemsOwnerOrUser(booking, userId); + return booking; + } + + public Booking checkAndGetBooking(Long bookingId) { + Optional booking = bookingStorage.find(bookingId); + if (booking.isEmpty()) { + log.error("Бронь не найдена (ID={})", bookingId); + throw new NotFoundException("Бронь не найдена"); + } + return booking.get(); + } + + public User checkAndGetUser(Long userId) { + Optional user = userStorage.find(userId); + if (user.isEmpty()) { + log.error("Пользователь не найден (ID={})", userId); + throw new NotFoundException("Пользователь не найден"); + } + return user.get(); + } + + public Item checkAndGetItem(Long itemId) { + Optional item = itemStorage.find(itemId); + if (item.isEmpty()) { + log.error("Вещь не найдена (ID={})", itemId); + throw new NotFoundException("Вещь не найдена"); + } + return item.get(); + } + + private void checkItemAvailable(Item item) { + if (!item.isAvailable()) { + log.error("Вещь находиться в аренде (ID={})", item.getId()); + throw new ValidationException("Вещь находиться в аренде"); + } + } + + private void checkDate(RequestBookingDto bookingDto) { + if (bookingDto.getStart() == null) { + log.error("Необходимо указать дату начала аренды"); + throw new ValidationException("Необходимо указать дату начала аренды"); + } + Instant start = DateTimeHelper.toInstant(bookingDto.getStart()); + if (start.isBefore(Instant.now())) { + log.error("Дата начала аренды не может быть раньше текущей даты"); + throw new ValidationException("Дата начала аренды не может быть раньше текущей даты"); + } + if (bookingDto.getEnd() == null) { + log.error("Необходимо указать дату окончания аренды"); + throw new ValidationException("Необходимо указать дату окончания аренды"); + } + Instant end = DateTimeHelper.toInstant(bookingDto.getEnd()); + if (end.isBefore(Instant.now())) { + log.error("Дата окончания аренды не может быть раньше текущей даты"); + throw new ValidationException("Дата окончания аренды не может быть раньше текущей даты"); + } + if (end.isBefore(start)) { + log.error("Дата окончания аренды не может быть раньше даты начала аренды"); + throw new ValidationException("Дата окончания аренды не может быть раньше даты начала аренды"); + } + } + + private void checkItemsOwner(Item item, Long ownerId) { + if (!item.getOwnerId().equals(ownerId)) { + log.error("Вещь вам не принадлежит (ID={})", item.getId()); + throw new ValidationException("Вещь вам не принадлежит"); + } + } + + private void checkItemsOwnerOrUser(Booking booking, Long userId) { + if (!booking.getItem().getOwnerId().equals(userId) && !booking.getUser().getId().equals(userId)) { + log.error("Нет доступа к бронированию (ID={})", booking.getId()); + throw new ValidationException("Нет доступа к бронированию"); + } + } +} diff --git a/src/main/java/ru/practicum/shareit/booking/dto/BookingDto.java b/src/main/java/ru/practicum/shareit/booking/dto/BookingDto.java index 861de9e0..605ec5a6 100644 --- a/src/main/java/ru/practicum/shareit/booking/dto/BookingDto.java +++ b/src/main/java/ru/practicum/shareit/booking/dto/BookingDto.java @@ -1,7 +1,19 @@ package ru.practicum.shareit.booking.dto; -/** - * TODO Sprint add-bookings. - */ +import lombok.AllArgsConstructor; +import lombok.Data; +import ru.practicum.shareit.booking.enums.BookingStatus; +import ru.practicum.shareit.item.dto.ItemDto; +import ru.practicum.shareit.user.dto.UserDto; + +@Data +@AllArgsConstructor public class BookingDto { + private Long id; + private String start; + private String end; + private BookingStatus status; + private String review; + private UserDto booker; + private ItemDto item; } diff --git a/src/main/java/ru/practicum/shareit/booking/dto/RequestBookingDto.java b/src/main/java/ru/practicum/shareit/booking/dto/RequestBookingDto.java new file mode 100644 index 00000000..253eade8 --- /dev/null +++ b/src/main/java/ru/practicum/shareit/booking/dto/RequestBookingDto.java @@ -0,0 +1,17 @@ +package ru.practicum.shareit.booking.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import ru.practicum.shareit.booking.enums.BookingStatus; + +@Data +@AllArgsConstructor +public class RequestBookingDto { + private Long id; + private Long itemId; + private Long userId; + private String start; + private String end; + private BookingStatus status; + private String review; +} diff --git a/src/main/java/ru/practicum/shareit/booking/enums/BookingFilterState.java b/src/main/java/ru/practicum/shareit/booking/enums/BookingFilterState.java new file mode 100644 index 00000000..4ae89d56 --- /dev/null +++ b/src/main/java/ru/practicum/shareit/booking/enums/BookingFilterState.java @@ -0,0 +1,5 @@ +package ru.practicum.shareit.booking.enums; + +public enum BookingFilterState { + ALL, CURRENT, PAST, FUTURE, WAITING, REJECTED +} diff --git a/src/main/java/ru/practicum/shareit/booking/enums/BookingStatus.java b/src/main/java/ru/practicum/shareit/booking/enums/BookingStatus.java new file mode 100644 index 00000000..7aa4347c --- /dev/null +++ b/src/main/java/ru/practicum/shareit/booking/enums/BookingStatus.java @@ -0,0 +1,5 @@ +package ru.practicum.shareit.booking.enums; + +public enum BookingStatus { + WAITING, APPROVED, REJECTED +} diff --git a/src/main/java/ru/practicum/shareit/booking/storage/BookingStorage.java b/src/main/java/ru/practicum/shareit/booking/storage/BookingStorage.java new file mode 100644 index 00000000..4c1ee6df --- /dev/null +++ b/src/main/java/ru/practicum/shareit/booking/storage/BookingStorage.java @@ -0,0 +1,23 @@ +package ru.practicum.shareit.booking.storage; + +import ru.practicum.shareit.booking.Booking; +import ru.practicum.shareit.booking.enums.BookingFilterState; + +import java.util.Collection; +import java.util.Optional; + +public interface BookingStorage { + Collection getAllBookings(Long userId, BookingFilterState state); + + Collection getAllBookingsByOwner(Long ownerId, BookingFilterState state); + + Optional find(Long id); + + Booking create(Booking booking); + + Booking approved(Booking booking); + + Booking rejected(Booking booking); + + Collection findApprovedUserItemPastBooking(Long itemId, Long userId); +} diff --git a/src/main/java/ru/practicum/shareit/booking/storage/DbBookingStorage.java b/src/main/java/ru/practicum/shareit/booking/storage/DbBookingStorage.java new file mode 100644 index 00000000..8fac7900 --- /dev/null +++ b/src/main/java/ru/practicum/shareit/booking/storage/DbBookingStorage.java @@ -0,0 +1,82 @@ +package ru.practicum.shareit.booking.storage; + +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Component; +import ru.practicum.shareit.booking.Booking; +import ru.practicum.shareit.booking.BookingRepository; +import ru.practicum.shareit.booking.enums.BookingFilterState; +import ru.practicum.shareit.booking.enums.BookingStatus; + +import java.time.Instant; +import java.util.Collection; +import java.util.Optional; + +@Component +@Qualifier("dbItemStorage") +public class DbBookingStorage implements BookingStorage { + private final BookingRepository bookingRepository; + + public DbBookingStorage(BookingRepository bookingRepository) { + this.bookingRepository = bookingRepository; + } + + public Collection getAllBookings(Long userId, BookingFilterState state) { + if (state.equals(BookingFilterState.CURRENT)) { // текущие + return bookingRepository.findByUserIdAndStartLessThanEqualAndEndGreaterThan(userId, Instant.now(), Instant.now()); + } + if (state.equals(BookingFilterState.PAST)) { // завершённые + return bookingRepository.findByUserIdAndEndLessThan(userId, Instant.now()); + } + if (state.equals(BookingFilterState.FUTURE)) { // будущие + return bookingRepository.findByUserIdAndStartGreaterThan(userId, Instant.now()); + } + if (state.equals(BookingFilterState.WAITING)) { + return bookingRepository.findByUserIdAndStatus(userId, BookingStatus.WAITING); + } + if (state.equals(BookingFilterState.REJECTED)) { + return bookingRepository.findByUserIdAndStatus(userId, BookingStatus.REJECTED); + } + return bookingRepository.findByUserId(userId); + } + + public Collection getAllBookingsByOwner(Long ownerId, BookingFilterState state) { + if (state.equals(BookingFilterState.CURRENT)) { // текущие + return bookingRepository.findByUserIdAndStartLessThanEqualAndEndGreaterThan(ownerId, Instant.now(), Instant.now()); + } + if (state.equals(BookingFilterState.PAST)) { // завершённые + return bookingRepository.findByUserIdAndEndLessThan(ownerId, Instant.now()); + } + if (state.equals(BookingFilterState.FUTURE)) { // будущие + return bookingRepository.findByUserIdAndStartGreaterThan(ownerId, Instant.now()); + } + if (state.equals(BookingFilterState.WAITING)) { + return bookingRepository.findByUserIdAndStatus(ownerId, BookingStatus.WAITING); + } + if (state.equals(BookingFilterState.REJECTED)) { + return bookingRepository.findByUserIdAndStatus(ownerId, BookingStatus.REJECTED); + } + return bookingRepository.findByUserId(ownerId); + } + + public Optional find(Long id) { + return bookingRepository.findById(id); + } + + public Booking create(Booking booking) { + return bookingRepository.save(booking); + } + + public Booking approved(Booking booking) { + booking.setStatus(BookingStatus.APPROVED); + return bookingRepository.save(booking); + } + + public Booking rejected(Booking booking) { + booking.setStatus(BookingStatus.REJECTED); + return bookingRepository.save(booking); + } + + public Collection findApprovedUserItemPastBooking(Long itemId, Long userId) { + return bookingRepository.findByItemIdAndUserIdAndStatusAndEndLessThan(itemId, userId, BookingStatus.APPROVED, Instant.now()); + } +} diff --git a/src/main/java/ru/practicum/shareit/config/AppConfig.java b/src/main/java/ru/practicum/shareit/config/AppConfig.java new file mode 100644 index 00000000..e939c9c2 --- /dev/null +++ b/src/main/java/ru/practicum/shareit/config/AppConfig.java @@ -0,0 +1,9 @@ +package ru.practicum.shareit.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.PropertySource; + +@Configuration +@PropertySource("classpath:/application.yaml") +public class AppConfig { +} \ No newline at end of file diff --git a/src/main/java/ru/practicum/shareit/config/PersistenceConfig.java b/src/main/java/ru/practicum/shareit/config/PersistenceConfig.java new file mode 100644 index 00000000..7c87cadc --- /dev/null +++ b/src/main/java/ru/practicum/shareit/config/PersistenceConfig.java @@ -0,0 +1,7 @@ +package ru.practicum.shareit.config; + +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; + +@EnableJpaRepositories(basePackages = "ru.practicum") +public class PersistenceConfig { +} \ No newline at end of file diff --git a/src/main/java/ru/practicum/shareit/config/WebConfig.java b/src/main/java/ru/practicum/shareit/config/WebConfig.java new file mode 100644 index 00000000..39123aee --- /dev/null +++ b/src/main/java/ru/practicum/shareit/config/WebConfig.java @@ -0,0 +1,9 @@ +package ru.practicum.shareit.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.EnableWebMvc; + +@Configuration // помечает класс как java-config для контекста приложения +@EnableWebMvc // призывает импортировать дополнительную конфигурацию для веб-приложений +public class WebConfig { +} \ No newline at end of file diff --git a/src/main/java/ru/practicum/shareit/item/ItemController.java b/src/main/java/ru/practicum/shareit/item/ItemController.java index bb17668b..81e0470e 100644 --- a/src/main/java/ru/practicum/shareit/item/ItemController.java +++ b/src/main/java/ru/practicum/shareit/item/ItemController.java @@ -1,12 +1,66 @@ package ru.practicum.shareit.item; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import ru.practicum.shareit.item.comment.CommentService; +import ru.practicum.shareit.item.comment.dto.CommentDto; +import ru.practicum.shareit.item.comment.dto.RequestCommentDto; +import ru.practicum.shareit.item.dto.ItemDto; + +import java.util.Collection; -/** - * TODO Sprint add-controllers. - */ @RestController +@Slf4j @RequestMapping("/items") public class ItemController { + private final ItemService itemService; + private final CommentService commentService; + + @Autowired + ItemController(ItemService itemService, CommentService commentService) { + this.itemService = itemService; + this.commentService = commentService; + } + + @GetMapping + public Collection getAllItems(@RequestHeader("X-Sharer-User-Id") Long ownerId) { + return itemService.getAllItems(ownerId); + } + + @GetMapping("/search") + public Collection search(@RequestParam String text) { + return itemService.search(text); + } + + @GetMapping("/{id}") + public ItemDto find(@PathVariable long id) { + return itemService.find(id); + } + + @PostMapping + public ItemDto create(@RequestHeader("X-Sharer-User-Id") Long ownerId, + @RequestBody ItemDto request) { + return itemService.create(ownerId, request); + } + + @PatchMapping("/{id}") + public ItemDto update(@RequestHeader("X-Sharer-User-Id") Long ownerId, + @PathVariable long id, + @RequestBody ItemDto request) { + return itemService.update(ownerId, id, request); + } + + @DeleteMapping("/{id}") + public void delete(@RequestHeader("X-Sharer-User-Id") Long ownerId, + @PathVariable long id) { + itemService.delete(ownerId, id); + } + + @PostMapping("/{id}/comment") + public CommentDto create(@RequestHeader("X-Sharer-User-Id") Long userId, + @PathVariable Long id, + @RequestBody RequestCommentDto request) { + return commentService.create(id, userId, request); + } } diff --git a/src/main/java/ru/practicum/shareit/item/ItemRepository.java b/src/main/java/ru/practicum/shareit/item/ItemRepository.java new file mode 100644 index 00000000..8bb5ffee --- /dev/null +++ b/src/main/java/ru/practicum/shareit/item/ItemRepository.java @@ -0,0 +1,36 @@ +package ru.practicum.shareit.item; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import ru.practicum.shareit.item.model.Item; + +import java.util.Collection; +import java.util.Map; + +public interface ItemRepository extends JpaRepository { + Collection findByOwnerId(Long ownerId); + + Collection findByNameContainingIgnoreCaseAndAvailable(String text, Boolean available); + + @Query(value = "SELECT items.id, " + + "items.owner_id, " + + "items.name, " + + "items.description, " + + "items.available, " + + "last_booking.last_booking_date as last, " + + "nearest_booking.nearest_booking_date as nearest " + + "FROM items " + + "LEFT JOIN ( " + + "SELECT item_id, " + + "max(date_start) as last_booking_date " + + "FROM bookings " + + "GROUP BY item_id) as last_booking ON last_booking.item_id = items.id " + + "LEFT JOIN ( " + + "SELECT item_id, " + + "min(date_start) as nearest_booking_date " + + "FROM bookings " + + "WHERE date_start >= now() " + + "GROUP BY item_id) as nearest_booking ON nearest_booking.item_id = items.id " + + "WHERE owner_id = ?1", nativeQuery = true) + Collection> getItemsBookingDate(Long ownerId); +} diff --git a/src/main/java/ru/practicum/shareit/item/ItemService.java b/src/main/java/ru/practicum/shareit/item/ItemService.java new file mode 100644 index 00000000..645ebc4b --- /dev/null +++ b/src/main/java/ru/practicum/shareit/item/ItemService.java @@ -0,0 +1,77 @@ +package ru.practicum.shareit.item; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Service; +import ru.practicum.shareit.base.exception.NotFoundException; +import ru.practicum.shareit.item.dto.ItemDto; +import ru.practicum.shareit.item.mapper.ItemMapper; +import ru.practicum.shareit.item.model.Item; +import ru.practicum.shareit.item.storage.ItemStorage; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.stream.Collectors; + +@Service +@Slf4j +public class ItemService { + @Qualifier("dbItemStorage") + private final ItemStorage storage; + + private final ItemValidator itemValidator; + + @Autowired + ItemService(@Qualifier("dbItemStorage") ItemStorage storage, ItemValidator itemValidator) { + this.storage = storage; + this.itemValidator = itemValidator; + } + + public Collection getAllItems(Long ownerId) { + return storage + .getAllItems(ownerId) + .stream() + .map(ItemMapper::toDto) + .collect(Collectors.toList()); + } + + public Collection search(String text) { + if (text.isEmpty()) { + return new ArrayList<>(); + } + return storage + .search(text) + .stream() + .map(ItemMapper::toDto) + .collect(Collectors.toList()); + } + + public ItemDto find(Long id) { + return storage + .find(id) + .map(ItemMapper::toDto) + .orElseThrow(() -> new NotFoundException("Вещь не найдена")); + } + + public ItemDto create(Long ownerId, ItemDto request) { + itemValidator.check(ownerId, request); + Item item = ItemMapper.toModel(request); + item.setOwnerId(ownerId); + item = storage.create(item); + log.info("Вещь добавлена (ID={})", item.getId()); + return ItemMapper.toDto(item); + } + + public ItemDto update(Long ownerId, Long id, ItemDto request) { + Item currentItem = itemValidator.check(id, ownerId); + Item item = storage.update(id, ItemMapper.mergeToModel(currentItem, request)); + log.info("Вещь изменена (ID={})", id); + return ItemMapper.toDto(item); + } + + public void delete(Long ownerId, Long id) { + Item currentItem = itemValidator.check(id, ownerId); + storage.delete(currentItem); + } +} diff --git a/src/main/java/ru/practicum/shareit/item/ItemValidator.java b/src/main/java/ru/practicum/shareit/item/ItemValidator.java new file mode 100644 index 00000000..d2205204 --- /dev/null +++ b/src/main/java/ru/practicum/shareit/item/ItemValidator.java @@ -0,0 +1,89 @@ +package ru.practicum.shareit.item; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Service; +import ru.practicum.shareit.base.exception.NotFoundException; +import ru.practicum.shareit.base.exception.ValidationException; +import ru.practicum.shareit.item.dto.ItemDto; +import ru.practicum.shareit.item.model.Item; +import ru.practicum.shareit.item.storage.ItemStorage; +import ru.practicum.shareit.user.User; +import ru.practicum.shareit.user.storage.UserStorage; + +import java.util.Optional; + +@Service +@Slf4j +public class ItemValidator { + @Qualifier("dbItemStorage") + private final ItemStorage itemStorage; + @Qualifier("dbUserStorage") + private final UserStorage userStorage; + + @Autowired + ItemValidator(@Qualifier("dbItemStorage") ItemStorage itemStorage, + @Qualifier("dbUserStorage") UserStorage userStorage) { + this.itemStorage = itemStorage; + this.userStorage = userStorage; + } + + public void check(Long ownerId, ItemDto request) { + checkOwnerExists(ownerId); + checkName(request); + checkDescription(request); + checkAvailable(request); + } + + public Item check(Long itemId, Long ownerId) { + Item item = checkExists(itemId); + checkOwner(item, ownerId); + return item; + } + + private Item checkExists(Long itemId) { + Optional item = itemStorage.find(itemId); + if (item.isEmpty()) { + log.error("Вещь не найдена (ID={})", itemId); + throw new NotFoundException("Вещь не найдена"); + } + return item.get(); + } + + private void checkOwner(Item item, Long ownerId) { + if (!item.getOwnerId().equals(ownerId)) { + log.error("Попытка внести изменения не в свою вещь (UserID={})", ownerId); + throw new NotFoundException("Данные вещь вам не принадлежит"); + } + } + + private void checkOwnerExists(Long ownerId) { + Optional user = userStorage.find(ownerId); + if (user.isEmpty()) { + log.error("Пользователь не найден (ID={})", ownerId); + throw new NotFoundException("Пользователь не найден (ID={})"); + } + } + + private void checkName(ItemDto request) { + if (request.getName() == null || request.getName().isEmpty()) { + log.error("Необходимо указать наименование вещи"); + throw new ValidationException("Необходимо указать наименование вещи"); + } + } + + private void checkDescription(ItemDto request) { + if (request.getDescription() == null || request.getDescription().isEmpty()) { + log.error("Необходимо указать описание вещи"); + throw new ValidationException("Необходимо указать описание вещи"); + } + } + + private void checkAvailable(ItemDto request) { + if (request.getAvailable() == null) { + log.error("Необходимо указать доступность вещи"); + throw new ValidationException("Необходимо указать доступность вещи"); + } + } +} diff --git a/src/main/java/ru/practicum/shareit/item/comment/Comment.java b/src/main/java/ru/practicum/shareit/item/comment/Comment.java new file mode 100644 index 00000000..0d040c02 --- /dev/null +++ b/src/main/java/ru/practicum/shareit/item/comment/Comment.java @@ -0,0 +1,36 @@ +package ru.practicum.shareit.item.comment; + +import jakarta.persistence.*; +import lombok.Data; +import lombok.NoArgsConstructor; +import ru.practicum.shareit.item.model.Item; +import ru.practicum.shareit.user.User; + +import java.time.Instant; + +@Data +@Entity +@NoArgsConstructor +@Table(name = "comments") +public class Comment { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + private User user; + + @ManyToOne(fetch = FetchType.LAZY) + private Item item; + + @Column(nullable = false) + private String text; + + @Column(nullable = false) + private Instant created; + + public Comment(String text) { + this.text = text; + this.created = Instant.now(); + } +} diff --git a/src/main/java/ru/practicum/shareit/item/comment/CommentMapper.java b/src/main/java/ru/practicum/shareit/item/comment/CommentMapper.java new file mode 100644 index 00000000..5b47703d --- /dev/null +++ b/src/main/java/ru/practicum/shareit/item/comment/CommentMapper.java @@ -0,0 +1,15 @@ +package ru.practicum.shareit.item.comment; + +import ru.practicum.shareit.base.helpers.DateTimeHelper; +import ru.practicum.shareit.item.comment.dto.CommentDto; +import ru.practicum.shareit.item.comment.dto.RequestCommentDto; + +public class CommentMapper { + public static Comment requestToModel(RequestCommentDto dto) { + return new Comment(dto.getText()); + } + + public static CommentDto toDto(Comment model) { + return new CommentDto(model.getId(), model.getText(), model.getUser().getName(), DateTimeHelper.toString(model.getCreated())); + } +} diff --git a/src/main/java/ru/practicum/shareit/item/comment/CommentRepository.java b/src/main/java/ru/practicum/shareit/item/comment/CommentRepository.java new file mode 100644 index 00000000..d45611f5 --- /dev/null +++ b/src/main/java/ru/practicum/shareit/item/comment/CommentRepository.java @@ -0,0 +1,6 @@ +package ru.practicum.shareit.item.comment; + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface CommentRepository extends JpaRepository { +} diff --git a/src/main/java/ru/practicum/shareit/item/comment/CommentService.java b/src/main/java/ru/practicum/shareit/item/comment/CommentService.java new file mode 100644 index 00000000..3eca90e6 --- /dev/null +++ b/src/main/java/ru/practicum/shareit/item/comment/CommentService.java @@ -0,0 +1,31 @@ +package ru.practicum.shareit.item.comment; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Service; +import ru.practicum.shareit.item.comment.dto.CommentDto; +import ru.practicum.shareit.item.comment.dto.RequestCommentDto; +import ru.practicum.shareit.item.comment.storage.CommentStorage; + +@Service +@Slf4j +public class CommentService { + @Qualifier("dbCommentStorage") + private final CommentStorage storage; + + private final CommentValidator commentValidator; + + @Autowired + CommentService(@Qualifier("dbCommentStorage") CommentStorage storage, CommentValidator commentValidator) { + this.storage = storage; + this.commentValidator = commentValidator; + } + + public CommentDto create(Long itemId, Long userId, RequestCommentDto request) { + Comment comment = commentValidator.check(itemId, userId, request); + comment = storage.create(comment); + log.info("Оставлен новый комментарий (ID={})", comment.getId()); + return CommentMapper.toDto(comment); + } +} diff --git a/src/main/java/ru/practicum/shareit/item/comment/CommentValidator.java b/src/main/java/ru/practicum/shareit/item/comment/CommentValidator.java new file mode 100644 index 00000000..b9b4f501 --- /dev/null +++ b/src/main/java/ru/practicum/shareit/item/comment/CommentValidator.java @@ -0,0 +1,84 @@ +package ru.practicum.shareit.item.comment; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Service; +import ru.practicum.shareit.base.exception.NotFoundException; +import ru.practicum.shareit.base.exception.ValidationException; +import ru.practicum.shareit.booking.Booking; +import ru.practicum.shareit.booking.storage.BookingStorage; +import ru.practicum.shareit.item.comment.dto.RequestCommentDto; +import ru.practicum.shareit.item.model.Item; +import ru.practicum.shareit.item.storage.ItemStorage; +import ru.practicum.shareit.user.User; +import ru.practicum.shareit.user.storage.UserStorage; + +import java.util.Collection; +import java.util.Optional; + +@Service +@Slf4j +@Qualifier("commentValidator") +public class CommentValidator { + @Qualifier("dbItemStorage") + private final ItemStorage itemStorage; + @Qualifier("dbUserStorage") + private final UserStorage userStorage; + @Qualifier("dbBookingStorage") + private final BookingStorage bookingStorage; + + @Autowired + CommentValidator(@Qualifier("dbItemStorage") ItemStorage itemStorage, + @Qualifier("dbUserStorage") UserStorage userStorage, + @Qualifier("dbBookingStorage") BookingStorage bookingStorage) { + this.itemStorage = itemStorage; + this.userStorage = userStorage; + this.bookingStorage = bookingStorage; + } + + public Comment check(Long itemId, Long userId, RequestCommentDto request) { + Item item = checkExists(itemId); + User user = checkCommentator(item, userId); + checkComment(request); + Comment comment = CommentMapper.requestToModel(request); + comment.setUser(user); + comment.setItem(item); + return comment; + } + + private Item checkExists(Long itemId) { + Optional item = itemStorage.find(itemId); + if (item.isEmpty()) { + log.error("Вещь не найдена (ID={})", itemId); + throw new NotFoundException("Вещь не найдена"); + } + return item.get(); + } + + private User checkCommentator(Item item, Long userId) { + User user = checkUserExists(userId); + Collection bookings = bookingStorage.findApprovedUserItemPastBooking(item.getId(), userId); + if (bookings.isEmpty()) { + log.error("Нельзя оставить отзыв на вещь, которая не была в аренде или срок аренды еще не окончен"); + throw new ValidationException("Нельзя оставить отзыв на вещь, которая не была в аренде или срок аренды еще не окончен"); + } + return user; + } + + private User checkUserExists(Long userId) { + Optional user = userStorage.find(userId); + if (user.isEmpty()) { + log.error("Пользователь не найден (ID={})", userId); + throw new NotFoundException("Пользователь не найден (ID={})"); + } + return user.get(); + } + + private void checkComment(RequestCommentDto request) { + if (request.getText() == null || request.getText().isEmpty()) { + log.error("Текст комментария не может быть пустым"); + throw new ValidationException("Текст комментария не может быть пустым"); + } + } +} diff --git a/src/main/java/ru/practicum/shareit/item/comment/dto/CommentDto.java b/src/main/java/ru/practicum/shareit/item/comment/dto/CommentDto.java new file mode 100644 index 00000000..8fa97aa9 --- /dev/null +++ b/src/main/java/ru/practicum/shareit/item/comment/dto/CommentDto.java @@ -0,0 +1,13 @@ +package ru.practicum.shareit.item.comment.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; + +@Data +@AllArgsConstructor +public class CommentDto { + private Long id; + private String text; + private String authorName; + private String created; +} diff --git a/src/main/java/ru/practicum/shareit/item/comment/dto/RequestCommentDto.java b/src/main/java/ru/practicum/shareit/item/comment/dto/RequestCommentDto.java new file mode 100644 index 00000000..8e1c91f1 --- /dev/null +++ b/src/main/java/ru/practicum/shareit/item/comment/dto/RequestCommentDto.java @@ -0,0 +1,8 @@ +package ru.practicum.shareit.item.comment.dto; + +import lombok.Data; + +@Data +public class RequestCommentDto { + private String text; +} diff --git a/src/main/java/ru/practicum/shareit/item/comment/storage/CommentStorage.java b/src/main/java/ru/practicum/shareit/item/comment/storage/CommentStorage.java new file mode 100644 index 00000000..d2c256d1 --- /dev/null +++ b/src/main/java/ru/practicum/shareit/item/comment/storage/CommentStorage.java @@ -0,0 +1,7 @@ +package ru.practicum.shareit.item.comment.storage; + +import ru.practicum.shareit.item.comment.Comment; + +public interface CommentStorage { + Comment create(Comment comment); +} diff --git a/src/main/java/ru/practicum/shareit/item/comment/storage/DbCommentStorage.java b/src/main/java/ru/practicum/shareit/item/comment/storage/DbCommentStorage.java new file mode 100644 index 00000000..6b7f3415 --- /dev/null +++ b/src/main/java/ru/practicum/shareit/item/comment/storage/DbCommentStorage.java @@ -0,0 +1,20 @@ +package ru.practicum.shareit.item.comment.storage; + +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Component; +import ru.practicum.shareit.item.comment.Comment; +import ru.practicum.shareit.item.comment.CommentRepository; + +@Component +@Qualifier("dbCommentStorage") +public class DbCommentStorage implements CommentStorage { + private final CommentRepository commentRepository; + + public DbCommentStorage(CommentRepository commentRepository) { + this.commentRepository = commentRepository; + } + + public Comment create(Comment comment) { + return commentRepository.save(comment); + } +} diff --git a/src/main/java/ru/practicum/shareit/item/dto/ItemDto.java b/src/main/java/ru/practicum/shareit/item/dto/ItemDto.java index 9319d7d7..0d4df06c 100644 --- a/src/main/java/ru/practicum/shareit/item/dto/ItemDto.java +++ b/src/main/java/ru/practicum/shareit/item/dto/ItemDto.java @@ -1,7 +1,17 @@ package ru.practicum.shareit.item.dto; -/** - * TODO Sprint add-controllers. - */ +import lombok.Data; + +import java.util.Collection; + +@Data public class ItemDto { + private Long id; + private Long ownerId; + private String name; + private String description; + private Boolean available; + private String lastBooking; + private String nextBooking; + private Collection comments; } diff --git a/src/main/java/ru/practicum/shareit/item/mapper/ItemMapper.java b/src/main/java/ru/practicum/shareit/item/mapper/ItemMapper.java new file mode 100644 index 00000000..14d29f71 --- /dev/null +++ b/src/main/java/ru/practicum/shareit/item/mapper/ItemMapper.java @@ -0,0 +1,54 @@ +package ru.practicum.shareit.item.mapper; + +import ru.practicum.shareit.base.helpers.DateTimeHelper; +import ru.practicum.shareit.item.dto.ItemDto; +import ru.practicum.shareit.item.model.Item; +import ru.practicum.shareit.item.model.ItemBookingDate; + +public class ItemMapper { + public static ItemDto toDto(Item item) { + ItemDto dto = new ItemDto(); + dto.setId(item.getId()); + dto.setOwnerId(item.getOwnerId()); + dto.setName(item.getName()); + dto.setDescription(item.getDescription()); + dto.setAvailable(item.isAvailable()); + dto.setComments(item.getComments()); + return dto; + } + + public static ItemDto toDto(ItemBookingDate item) { + ItemDto dto = new ItemDto(); + dto.setId(item.getId()); + dto.setOwnerId(item.getOwnerId()); + dto.setName(item.getName()); + dto.setDescription(item.getDescription()); + dto.setAvailable(item.isAvailable()); + dto.setLastBooking(DateTimeHelper.toString(item.getLast())); + dto.setNextBooking(DateTimeHelper.toString(item.getNearest())); + return dto; + } + + public static Item toModel(ItemDto item) { + Item model = new Item(); + model.setId(item.getId()); + model.setOwnerId(item.getOwnerId()); + model.setName(item.getName()); + model.setDescription(item.getDescription()); + model.setAvailable(Boolean.TRUE.equals(item.getAvailable())); + return model; + } + + public static Item mergeToModel(Item model, ItemDto item) { + if (item.getName() != null) { + model.setName(item.getName()); + } + if (item.getDescription() != null) { + model.setDescription(item.getDescription()); + } + if (item.getAvailable() != null) { + model.setAvailable(Boolean.TRUE.equals(item.getAvailable())); + } + return model; + } +} diff --git a/src/main/java/ru/practicum/shareit/item/model/Item.java b/src/main/java/ru/practicum/shareit/item/model/Item.java index 44eb73dd..22fc78da 100644 --- a/src/main/java/ru/practicum/shareit/item/model/Item.java +++ b/src/main/java/ru/practicum/shareit/item/model/Item.java @@ -1,7 +1,35 @@ package ru.practicum.shareit.item.model; -/** - * TODO Sprint add-controllers. - */ +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.ArrayList; +import java.util.Collection; + +@Data +@Entity +@NoArgsConstructor +@AllArgsConstructor +@Table(name = "items") public class Item { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "owner_id", nullable = false) + private Long ownerId; + + @Column(nullable = false) + private String name; + + private String description; + + private boolean available; + + @ElementCollection + @CollectionTable(name = "comments", joinColumns = @JoinColumn(name = "item_id")) + @Column(name = "text") + private Collection comments = new ArrayList<>(); } diff --git a/src/main/java/ru/practicum/shareit/item/model/ItemBookingDate.java b/src/main/java/ru/practicum/shareit/item/model/ItemBookingDate.java new file mode 100644 index 00000000..90bc5eb3 --- /dev/null +++ b/src/main/java/ru/practicum/shareit/item/model/ItemBookingDate.java @@ -0,0 +1,35 @@ +package ru.practicum.shareit.item.model; + +import lombok.Data; +import ru.practicum.shareit.base.helpers.DateTimeHelper; + +import java.sql.Timestamp; +import java.time.Instant; +import java.util.Map; + +@Data +public class ItemBookingDate { + private Long id; + + private Long ownerId; + + private String name; + + private String description; + + private boolean available; + + private Instant last; + + private Instant nearest; + + public ItemBookingDate(Map item) { + this.id = (Long) item.get("id"); + this.ownerId = (Long) item.get("owner_id"); + this.name = (String) item.get("name"); + this.description = (String) item.get("description"); + this.available = (Boolean) item.get("available"); + this.last = DateTimeHelper.toInstant((Timestamp) item.get("last")); + this.nearest = DateTimeHelper.toInstant((Timestamp) item.get("nearest")); + } +} diff --git a/src/main/java/ru/practicum/shareit/item/storage/DbItemStorage.java b/src/main/java/ru/practicum/shareit/item/storage/DbItemStorage.java new file mode 100644 index 00000000..28b0964c --- /dev/null +++ b/src/main/java/ru/practicum/shareit/item/storage/DbItemStorage.java @@ -0,0 +1,50 @@ +package ru.practicum.shareit.item.storage; + +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Component; +import ru.practicum.shareit.item.ItemRepository; +import ru.practicum.shareit.item.model.Item; +import ru.practicum.shareit.item.model.ItemBookingDate; + +import java.util.Collection; +import java.util.Map; +import java.util.Optional; +import java.util.stream.Collectors; + +@Component +@Qualifier("dbItemStorage") +public class DbItemStorage implements ItemStorage { + private final ItemRepository itemRepository; + + public DbItemStorage(ItemRepository itemRepository) { + this.itemRepository = itemRepository; + } + + public Collection getAllItems(Long ownerId) { + Collection> result = itemRepository.getItemsBookingDate(ownerId); + return result.stream() + .map(ItemBookingDate::new) + .collect(Collectors.toList()); + } + + public Collection search(String text) { + return itemRepository.findByNameContainingIgnoreCaseAndAvailable(text, true); + } + + public Optional find(Long id) { + return itemRepository.findById(id); + } + + public Item create(Item item) { + return itemRepository.save(item); + } + + public Item update(Long id, Item item) { + item.setId(id); + return itemRepository.save(item); + } + + public void delete(Item item) { + itemRepository.delete(item); + } +} diff --git a/src/main/java/ru/practicum/shareit/item/storage/ItemStorage.java b/src/main/java/ru/practicum/shareit/item/storage/ItemStorage.java new file mode 100644 index 00000000..5363ed52 --- /dev/null +++ b/src/main/java/ru/practicum/shareit/item/storage/ItemStorage.java @@ -0,0 +1,21 @@ +package ru.practicum.shareit.item.storage; + +import ru.practicum.shareit.item.model.Item; +import ru.practicum.shareit.item.model.ItemBookingDate; + +import java.util.Collection; +import java.util.Optional; + +public interface ItemStorage { + Collection getAllItems(Long ownerId); + + Collection search(String text); + + Optional find(Long id); + + Item create(Item item); + + Item update(Long id, Item item); + + void delete(Item item); +} diff --git a/src/main/java/ru/practicum/shareit/request/ItemRequest.java b/src/main/java/ru/practicum/shareit/request/ItemRequest.java index 95d6f23c..514363f0 100644 --- a/src/main/java/ru/practicum/shareit/request/ItemRequest.java +++ b/src/main/java/ru/practicum/shareit/request/ItemRequest.java @@ -1,7 +1,19 @@ package ru.practicum.shareit.request; -/** - * TODO Sprint add-item-requests. - */ +import jakarta.persistence.*; + +@Entity +@Table(name = "item_requests") public class ItemRequest { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "user_id", nullable = false) + private Long userId; + + @Column(nullable = false) + private String name; + + private String description; } diff --git a/src/main/java/ru/practicum/shareit/user/User.java b/src/main/java/ru/practicum/shareit/user/User.java index ae6e7f33..6494f9b0 100644 --- a/src/main/java/ru/practicum/shareit/user/User.java +++ b/src/main/java/ru/practicum/shareit/user/User.java @@ -1,7 +1,25 @@ package ru.practicum.shareit.user; -/** - * TODO Sprint add-controllers. - */ +import jakarta.persistence.*; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Entity +@NoArgsConstructor +@Table(name = "users") public class User { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false) + private String email; + + @Column(nullable = false) + private String name; + + public User(Long id) { + this.id = id; + } } diff --git a/src/main/java/ru/practicum/shareit/user/UserController.java b/src/main/java/ru/practicum/shareit/user/UserController.java index 03039b9d..f084f650 100644 --- a/src/main/java/ru/practicum/shareit/user/UserController.java +++ b/src/main/java/ru/practicum/shareit/user/UserController.java @@ -1,12 +1,45 @@ package ru.practicum.shareit.user; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import ru.practicum.shareit.user.dto.UserDto; + +import java.util.Collection; -/** - * TODO Sprint add-controllers. - */ @RestController -@RequestMapping(path = "/users") +@Slf4j +@RequestMapping("/users") public class UserController { + private final UserService userService; + + @Autowired + UserController(UserService userService) { + this.userService = userService; + } + + @GetMapping + public Collection getAllUsers() { + return userService.getAllUsers(); + } + + @GetMapping("/{id}") + public UserDto find(@PathVariable long id) { + return userService.find(id); + } + + @PostMapping + public UserDto create(@RequestBody UserDto request) { + return userService.create(request); + } + + @PatchMapping("/{id}") + public UserDto update(@PathVariable long id, @RequestBody UserDto request) { + return userService.update(id, request); + } + + @DeleteMapping("/{id}") + public void delete(@PathVariable long id) { + userService.delete(id); + } } diff --git a/src/main/java/ru/practicum/shareit/user/UserMapper.java b/src/main/java/ru/practicum/shareit/user/UserMapper.java new file mode 100644 index 00000000..4bac68f4 --- /dev/null +++ b/src/main/java/ru/practicum/shareit/user/UserMapper.java @@ -0,0 +1,31 @@ +package ru.practicum.shareit.user; + +import ru.practicum.shareit.user.dto.UserDto; + +public class UserMapper { + public static UserDto toDto(User user) { + return new UserDto( + user.getId(), + user.getEmail(), + user.getName() + ); + } + + public static User toModel(UserDto user) { + User model = new User(); + model.setId(user.getId()); + model.setEmail(user.getEmail()); + model.setName(user.getName()); + return model; + } + + public static User mergeToModel(User model, UserDto user) { + if (user.getEmail() != null) { + model.setEmail(user.getEmail()); + } + if (user.getName() != null) { + model.setName(user.getName()); + } + return model; + } +} diff --git a/src/main/java/ru/practicum/shareit/user/UserRepository.java b/src/main/java/ru/practicum/shareit/user/UserRepository.java new file mode 100644 index 00000000..7bce1226 --- /dev/null +++ b/src/main/java/ru/practicum/shareit/user/UserRepository.java @@ -0,0 +1,9 @@ +package ru.practicum.shareit.user; + +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; + +public interface UserRepository extends JpaRepository { + Optional findByEmail(String email); +} diff --git a/src/main/java/ru/practicum/shareit/user/UserService.java b/src/main/java/ru/practicum/shareit/user/UserService.java new file mode 100644 index 00000000..1ee2e369 --- /dev/null +++ b/src/main/java/ru/practicum/shareit/user/UserService.java @@ -0,0 +1,90 @@ +package ru.practicum.shareit.user; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Service; +import ru.practicum.shareit.base.exception.InternalServerException; +import ru.practicum.shareit.base.exception.NotFoundException; +import ru.practicum.shareit.base.exception.ValidationException; +import ru.practicum.shareit.user.dto.UserDto; +import ru.practicum.shareit.user.storage.UserStorage; + +import java.util.Collection; +import java.util.Objects; +import java.util.Optional; +import java.util.stream.Collectors; + +@Service +@Slf4j +public class UserService { + @Qualifier("dbUserStorage") + private final UserStorage storage; + + private final UserValidator validator; + + @Autowired + UserService(@Qualifier("dbUserStorage") UserStorage storage, UserValidator validator) { + this.storage = storage; + this.validator = validator; + } + + public Collection getAllUsers() { + return storage + .getAllUsers() + .stream() + .map(UserMapper::toDto) + .collect(Collectors.toList()); + } + + public UserDto find(Long id) { + return storage + .find(id) + .map(UserMapper::toDto) + .orElseThrow(() -> new NotFoundException("Пользователь не найден")); + } + + public UserDto create(UserDto request) { + if (storage.find(request.getEmail()).isPresent()) { + log.error("Не удалось создать пользователя: такой email существует"); + throw new InternalServerException("Не удалось создать пользователя: такой email уже существует"); + } + if (!validator.checkEmail(request.getEmail())) { + log.error("Не удалось создать пользователя: email [" + request.getEmail() + "] недействительный"); + throw new ValidationException("Не удалось создать пользователя: email [" + request.getEmail() + "] недействительный"); + } + User user = UserMapper.toModel(request); + user = storage.create(user); + log.info("Пользователь добавлен (ID={})", user.getId()); + return UserMapper.toDto(user); + } + + public UserDto update(Long id, UserDto request) { + Optional duplicateUser = storage.find(request.getEmail()); + if (duplicateUser.isPresent() && !Objects.equals(duplicateUser.get().getId(), id)) { + log.error("Не удалось изменить пользователя: такой email уже существует"); + throw new InternalServerException("Не удалось изменить пользователя: такой email уже существует"); + } + if (request.getEmail() != null && !validator.checkEmail(request.getEmail())) { + log.error("Не удалось создать пользователя: email [" + request.getEmail() + "] недействительный"); + throw new ValidationException("Не удалось создать пользователя: email [" + request.getEmail() + "] недействительный"); + } + Optional currentUser = storage.find(id); + if (currentUser.isEmpty()) { + log.error("Пользователь не найден (ID={})", id); + throw new NotFoundException("Пользователь не найден"); + } + User user = storage.update(id, UserMapper.mergeToModel(currentUser.get(), request)); + log.info("Пользователь изменен (ID={})", id); + return UserMapper.toDto(user); + } + + public void delete(Long id) { + Optional currentUser = storage.find(id); + if (currentUser.isEmpty()) { + log.error("Пользователь не найден (ID={})", id); + throw new NotFoundException("Пользователь не найден"); + } + storage.delete(currentUser.get()); + } +} diff --git a/src/main/java/ru/practicum/shareit/user/UserValidator.java b/src/main/java/ru/practicum/shareit/user/UserValidator.java new file mode 100644 index 00000000..ffb0bc7d --- /dev/null +++ b/src/main/java/ru/practicum/shareit/user/UserValidator.java @@ -0,0 +1,17 @@ +package ru.practicum.shareit.user; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.regex.Pattern; + +@Service +@Slf4j +public class UserValidator { + + public static final String EMAIL_REGEX = "^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,6}$"; + + public boolean checkEmail(String email) { + return Pattern.matches(EMAIL_REGEX, email); + } +} diff --git a/src/main/java/ru/practicum/shareit/user/dto/UserDto.java b/src/main/java/ru/practicum/shareit/user/dto/UserDto.java new file mode 100644 index 00000000..5c43c16a --- /dev/null +++ b/src/main/java/ru/practicum/shareit/user/dto/UserDto.java @@ -0,0 +1,12 @@ +package ru.practicum.shareit.user.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; + +@Data +@AllArgsConstructor +public class UserDto { + private Long id; + private String email; + private String name; +} diff --git a/src/main/java/ru/practicum/shareit/user/storage/DbUserStorage.java b/src/main/java/ru/practicum/shareit/user/storage/DbUserStorage.java new file mode 100644 index 00000000..8c0cab51 --- /dev/null +++ b/src/main/java/ru/practicum/shareit/user/storage/DbUserStorage.java @@ -0,0 +1,45 @@ +package ru.practicum.shareit.user.storage; + +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Component; +import ru.practicum.shareit.user.User; +import ru.practicum.shareit.user.UserRepository; + +import java.util.Collection; +import java.util.Optional; + +@Component +@Qualifier("dbUserStorage") +public class DbUserStorage implements UserStorage { + private final UserRepository userRepository; + + public DbUserStorage(UserRepository userRepository) { + this.userRepository = userRepository; + } + + public Collection getAllUsers() { + return userRepository.findAll(); + } + + public Optional find(Long id) { + Optional user = userRepository.findById(id); + return userRepository.findById(id); + } + + public Optional find(String email) { + return userRepository.findByEmail(email); + } + + public User create(User user) { + return userRepository.save(user); + } + + public User update(Long id, User user) { + user.setId(id); + return userRepository.save(user); + } + + public void delete(User user) { + userRepository.delete(user); + } +} diff --git a/src/main/java/ru/practicum/shareit/user/storage/MemoryUserStorage.java b/src/main/java/ru/practicum/shareit/user/storage/MemoryUserStorage.java new file mode 100644 index 00000000..e3bb0a6c --- /dev/null +++ b/src/main/java/ru/practicum/shareit/user/storage/MemoryUserStorage.java @@ -0,0 +1,45 @@ +package ru.practicum.shareit.user.storage; + +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Component; +import ru.practicum.shareit.base.Helper; +import ru.practicum.shareit.user.User; + +import java.util.Collection; +import java.util.HashMap; +import java.util.Optional; + +@Component +@Qualifier("memoryUserStorage") +public class MemoryUserStorage implements UserStorage { + private final HashMap users = new HashMap<>(); + + public Collection getAllUsers() { + return users.values(); + } + + public Optional find(Long id) { + return users.containsKey(id) ? Optional.of(users.get(id)) : Optional.empty(); + } + + public Optional find(String email) { + return users.values().stream() + .filter(user -> user.getEmail().equals(email)) + .findFirst(); + } + + public User create(User user) { + user.setId(Helper.nextId(users)); + users.put(user.getId(), user); + return user; + } + + public User update(Long id, User user) { + users.put(id, user); + return user; + } + + public void delete(User user) { + users.remove(user.getId()); + } +} diff --git a/src/main/java/ru/practicum/shareit/user/storage/UserStorage.java b/src/main/java/ru/practicum/shareit/user/storage/UserStorage.java new file mode 100644 index 00000000..0ee3ee24 --- /dev/null +++ b/src/main/java/ru/practicum/shareit/user/storage/UserStorage.java @@ -0,0 +1,20 @@ +package ru.practicum.shareit.user.storage; + +import ru.practicum.shareit.user.User; + +import java.util.Collection; +import java.util.Optional; + +public interface UserStorage { + Collection getAllUsers(); + + Optional find(Long id); + + Optional find(String email); + + User create(User user); + + User update(Long id, User user); + + void delete(User user); +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties deleted file mode 100644 index b9e5d4b2..00000000 --- a/src/main/resources/application.properties +++ /dev/null @@ -1,14 +0,0 @@ -spring.jpa.hibernate.ddl-auto=none -spring.jpa.properties.hibernate.format_sql=true -spring.sql.init.mode=always - -logging.level.org.springframework.orm.jpa=INFO -logging.level.org.springframework.transaction=INFO -logging.level.org.springframework.transaction.interceptor=TRACE -logging.level.org.springframework.orm.jpa.JpaTransactionManager=DEBUG - -# TODO Append connection to DB -#spring.datasource.driverClassName -#spring.datasource.url -#spring.datasource.username -#spring.datasource.password diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml new file mode 100644 index 00000000..6163553f --- /dev/null +++ b/src/main/resources/application.yaml @@ -0,0 +1,29 @@ +server: + port: 8090 +spring: + jpa: + show-sql: true + properties: + hibernate.jdbc.time_zone: UTC + output: + ansi: + enabled: "ALWAYS" + sql: + init: + mode: always + datasource: + username: "postgres" + password: "postgres" + url: "jdbc:postgresql://localhost:5433/java-shareit" + driver-class-name: "org.postgresql.Driver" + +logging.level: + ru.yandex.practicum.java-shareit: TRACE + org: + zalando.logbook: TRACE + springframework: + orm: + jpa: "INFO" + jpa.JpaTransactionManager: "DEBUG" + transaction: "INFO" + transaction.interceptor: "TRACE" \ No newline at end of file diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql new file mode 100644 index 00000000..ed34f76c --- /dev/null +++ b/src/main/resources/schema.sql @@ -0,0 +1,41 @@ +DROP TABLE IF EXISTS users CASCADE; +DROP TABLE IF EXISTS items CASCADE; +DROP TABLE IF EXISTS bookings CASCADE; +DROP TABLE IF EXISTS comments CASCADE; + +CREATE TABLE IF NOT EXISTS users +( + id bigserial not null constraint users_pk primary key, + email varchar not null, + name varchar not null, + CONSTRAINT UQ_USER_EMAIL UNIQUE (email) +); + +CREATE TABLE IF NOT EXISTS items +( + id bigserial not null constraint items_pk primary key, + owner_id bigint not null constraint items_users_id_fk references users, + name varchar not null, + description text, + available boolean default false +); + +CREATE TABLE IF NOT EXISTS bookings +( + id bigserial not null constraint bookings_pk primary key, + item_id bigint not null constraint bookings_items_id_fk references items, + user_id bigint not null constraint bookings_users_id_fk references users, + date_start timestamp not null, + date_end timestamp not null, + status varchar default 'WAITING', + review text +); + +CREATE TABLE IF NOT EXISTS comments +( + id bigserial not null constraint comments_pk primary key, + item_id bigint not null constraint comments_items_id_fk references items, + user_id bigint not null constraint comments_users_id_fk references users, + text text not null, + created timestamp not null +); \ No newline at end of file diff --git a/src/test/java/ru/practicum/shareit/ShareItTests.java b/src/test/java/ru/practicum/shareit/ShareItTests.java index 4d79052f..8502acd1 100644 --- a/src/test/java/ru/practicum/shareit/ShareItTests.java +++ b/src/test/java/ru/practicum/shareit/ShareItTests.java @@ -6,8 +6,8 @@ @SpringBootTest class ShareItTests { - @Test - void contextLoads() { - } + @Test + void contextLoads() { + } }